Handle values from the metadata files

Add a way to skip tests if they don't match the target
Switch to callframe trace for exceptions
2026-04-22 11:27:59 +00:00 · 2025-07-22 09:24:09 +03:00 · 2025-07-22 09:07:01 +03:00 · 2025-07-22 07:22:44 +03:00 · 2025-07-22 06:47:19 +03:00 · 2025-07-22 06:43:48 +03:00
57 changed files with 2441 additions and 4700 deletions
@@ -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
@@ -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",
@@ -2929,12 +2868,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "indoc"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
 [[package]]
 name = "integer-sqrt"
 version = "0.1.5"
@@ -2959,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"
@@ -3534,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"
@@ -3986,7 +3902,9 @@ dependencies = [
 "base64",
 "bytes",
 "encoding_rs",
+ "futures-channel",
 "futures-core",
+ "futures-util",
 "h2",
 "http",
 "http-body",
@@ -4030,32 +3948,17 @@ dependencies = [
 "serde_stacker",
 ]

-[[package]]
-name = "revive-dt-common"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "semver 1.0.26",
- "tokio",
-]
-
 [[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",
 ]

@@ -4077,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",
 ]
@@ -4101,14 +4003,10 @@ dependencies = [
 "alloy-primitives",
 "alloy-sol-types",
 "anyhow",
- "indoc",
- "regex",
- "revive-common",
- "revive-dt-common",
+ "revive-dt-node-interaction",
 "semver 1.0.26",
 "serde",
 "serde_json",
- "tokio",
 "tracing",
 ]

@@ -4118,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",
@@ -4137,6 +4033,10 @@ version = "0.1.0"
 dependencies = [
 "alloy",
 "anyhow",
+ "futures",
+ "once_cell",
+ "tokio",
+ "tracing",
 ]

 [[package]]
@@ -4144,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",
@@ -4159,11 +4059,9 @@ dependencies = [
 "anyhow",
 "hex",
 "reqwest",
- "revive-dt-common",
 "semver 1.0.26",
 "serde",
 "sha2 0.10.9",
- "tokio",
 "tracing",
 ]

@@ -4258,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"
@@ -4720,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"
@@ -4773,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"
@@ -5442,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",
- "slab",
- "socket2 0.6.0",
+ "socket2",
 "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -6333,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"
@@ -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,12 +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"] }
-regex = { version = "1.11.1" }
+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 = [
@@ -43,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"
@@ -56,7 +52,6 @@ tracing-subscriber = { version = "0.3.19", default-features = false, features =
    "env-filter",
 ] }
 indexmap = { version = "2.10.0", default-features = false }
-indoc = { version = "2.0.6", default-features = false }

 # revive compiler
 revive-solc-json-interface = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
@@ -1,14 +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 }
-tokio = { workspace = true, default-features = false, features = ["time"] }
@@ -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(())
-}
@@ -1,3 +0,0 @@
-mod clear_dir;
-
-pub use clear_dir::*;
@@ -1,3 +0,0 @@
-mod poll;
-
-pub use poll::*;
@@ -1,69 +0,0 @@
-use std::ops::ControlFlow;
-use std::time::Duration;
-
-use anyhow::{Result, anyhow};
-
-const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60);
-
-/// A function that polls for a fallible future for some period of time and errors if it fails to
-/// get a result after polling.
-///
-/// Given a future that returns a [`Result<ControlFlow<O, ()>>`], this function calls the future
-/// repeatedly (with some wait period) until the future returns a [`ControlFlow::Break`] or until it
-/// returns an [`Err`] in which case the function stops polling and returns the error.
-///
-/// If the future keeps returning [`ControlFlow::Continue`] and fails to return a [`Break`] within
-/// the permitted polling duration then this function returns an [`Err`]
-///
-/// [`Break`]: ControlFlow::Break
-/// [`Continue`]: ControlFlow::Continue
-pub async fn poll<F, O>(
-    polling_duration: Duration,
-    polling_wait_behavior: PollingWaitBehavior,
-    mut future: impl FnMut() -> F,
-) -> Result<O>
-where
-    F: Future<Output = Result<ControlFlow<O, ()>>>,
-{
-    let mut retries = 0;
-    let mut total_wait_duration = Duration::ZERO;
-    let max_allowed_wait_duration = polling_duration;
-
-    loop {
-        if total_wait_duration >= max_allowed_wait_duration {
-            break Err(anyhow!(
-                "Polling failed after {} retries and a total of {:?} of wait time",
-                retries,
-                total_wait_duration
-            ));
-        }
-
-        match future().await? {
-            ControlFlow::Continue(()) => {
-                let next_wait_duration = match polling_wait_behavior {
-                    PollingWaitBehavior::Constant(duration) => duration,
-                    PollingWaitBehavior::ExponentialBackoff => {
-                        Duration::from_secs(2u64.pow(retries))
-                            .min(EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION)
-                    }
-                };
-                let next_wait_duration =
-                    next_wait_duration.min(max_allowed_wait_duration - total_wait_duration);
-                total_wait_duration += next_wait_duration;
-                retries += 1;
-
-                tokio::time::sleep(next_wait_duration).await;
-            }
-            ControlFlow::Break(output) => {
-                break Ok(output);
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub enum PollingWaitBehavior {
-    Constant(Duration),
-    #[default]
-    ExponentialBackoff,
-}
@@ -1,3 +0,0 @@
-mod files_with_extension_iterator;
-
-pub use files_with_extension_iterator::*;
@@ -1,8 +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 futures;
-pub mod iterators;
-pub mod macros;
-pub mod types;
@@ -1,3 +0,0 @@
-mod define_wrapper_type;
-
-pub use define_wrapper_type::*;
@@ -1,3 +0,0 @@
-mod version_or_requirement;
-
-pub use version_or_requirement::*;
@@ -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)
-    }
-}
@@ -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 }
@@ -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 alloy_primitives::Address;
-use semver::Version;
-use serde::{Deserialize, Serialize};
+use revive_dt_config::Arguments;

 use revive_common::EVMVersion;
-use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
+use revive_solc_json_interface::{
+    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,
-        additional_options: Self::Options,
-    ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
+        input: CompilerInput<Self::Options>,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>>;

    fn new(solc_executable: PathBuf) -> Self;

-    fn get_compiler_executable(
-        config: &Arguments,
-        version: impl Into<VersionOrRequirement>,
-    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
-
-    fn version(&self) -> anyhow::Result<Version>;
+    fn get_compiler_executable(config: &Arguments, version: Version) -> anyhow::Result<PathBuf>;
 }

 /// The generic compilation input configuration.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CompilerInput {
-    pub enable_optimization: Option<bool>,
-    pub via_ir: Option<bool>,
-    pub evm_version: Option<EVMVersion>,
+#[derive(Debug)]
+pub struct CompilerInput<T: PartialEq + Eq + Hash> {
+    pub extra_options: T,
+    pub input: SolcStandardJsonInput,
    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)]
-pub struct CompilerOutput {
-    /// The compiled contracts. The bytecode of the contract is kept as a string incase linking is
-    /// required and the compiled source has placeholders.
-    pub contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+#[derive(Debug)]
+pub struct CompilerOutput<T: PartialEq + Eq + Hash> {
+    /// The solc standard JSON input.
+    pub input: CompilerInput<T>,
+    /// 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,
-    additional_options: T::Options,
+    input: SolcStandardJsonInput,
+    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 {
-                enable_optimization: Default::default(),
-                via_ir: Default::default(),
-                evm_version: Default::default(),
-                allow_paths: Default::default(),
-                base_path: Default::default(),
+            input: SolcStandardJsonInput {
+                language: SolcStandardJsonInputLanguage::Solidity,
                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 {
-        self.input.enable_optimization = value.into();
+    pub fn solc_optimizer(mut self, enabled: bool) -> Self {
+        self.input.settings.optimizer.enabled = enabled;
        self
    }

-    pub fn with_via_ir(mut self, value: impl Into<Option<bool>>) -> 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> {
+    pub fn with_source(mut self, path: &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(
-        mut self,
-        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);
+    pub fn evm_version(mut self, evm_version: EVMVersion) -> Self {
+        self.input.settings.evm_version = Some(evm_version);
        self
    }

-    pub fn with_additional_options(mut self, options: impl Into<T::Options>) -> Self {
-        self.additional_options = options.into();
+    pub fn extra_options(mut self, extra_options: T::Options) -> Self {
+        self.extra_options = extra_options;
        self
    }

-    pub async fn try_build(
-        self,
-        compiler_path: impl AsRef<Path>,
-    ) -> anyhow::Result<CompilerOutput> {
-        T::new(compiler_path.as_ref().to_path_buf())
-            .build(self.input, self.additional_options)
-            .await
+    pub fn allow_path(mut self, path: PathBuf) -> Self {
+        self.allow_paths.push(path);
+        self
    }

-    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()
    }
 }
@@ -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 alloy::json_abi::JsonAbi;
-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.
+use revive_dt_config::Arguments;
+use revive_solc_json_interface::SolcStandardJsonOutput;

 /// 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 {
-            enable_optimization,
-            // Ignored and not honored since this is required for the resolc compilation.
-            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);
+        input: CompilerInput<Self::Options>,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
+        let mut command = Command::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)?;
-        stdin_pipe.write_all(&serialized_input).await?;
+        serde_json::to_writer(stdin_pipe, &input.input)?;

-        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,
-                message = %message,
-                json_input = json_in,
-                "Compilation using resolc failed"
+                "resolc failed exit={} stderr={} JSON-in={} ",
+                output.status,
+                &message,
+                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| {
-            anyhow::anyhow!(
-                "failed to parse resolc JSON output: {e}\nstderr: {}",
-                String::from_utf8_lossy(&stderr)
-            )
-        })?;
+        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
-        // 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,
-                    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)
+        Ok(CompilerOutput {
+            input,
+            output: parsed,
+            error: None,
+        })
    }

    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");
-    }
 }
@@ -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 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};
+use revive_solc_json_interface::SolcStandardJsonOutput;

 #[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 {
-            enable_optimization,
-            via_ir,
-            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);
+        input: CompilerInput<Self::Options>,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
+        let mut command = Command::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,33 +47,31 @@ 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)?;
-        stdin.write_all(&serialized_input).await?;
-        let output = child.wait_with_output().await?;
+        serde_json::to_writer(stdin, &input.input)?;
+        let output = child.wait_with_output()?;

        if !output.status.success() {
-            let json_in = serde_json::to_string_pretty(&input)?;
            let message = String::from_utf8_lossy(&output.stderr);
-            tracing::error!(
-                status = %output.status,
-                message = %message,
-                json_input = json_in,
-                "Compilation using solc failed"
-            );
-            anyhow::bail!("Compilation failed with an error: {message}");
+            tracing::error!("solc failed exit={} stderr={}", output.status, &message);
+            return Ok(CompilerOutput {
+                input,
+                output: Default::default(),
+                error: Some(message.into()),
+            });
        }

-        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout).map_err(|e| {
-            anyhow::anyhow!(
-                "failed to parse resolc JSON output: {e}\nstderr: {}",
-                String::from_utf8_lossy(&output.stdout)
-            )
-        })?;
+        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)
+                )
+            })?;

        // 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() {
-            if error.severity == Severity::Error {
+        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}")
            }
@@ -150,113 +82,22 @@ impl SolidityCompiler for Solc {
            "Compiled successfully"
        );

-        let mut compiler_output = CompilerOutput::default();
-        for (contract_path, contracts) in parsed.contracts {
-            let map = compiler_output
-                .contracts
-                .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)
+        Ok(CompilerOutput {
+            input,
+            output: parsed,
+            error: None,
+        })
    }

    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)
-        )
-    }
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained1() {
-        // Arrange
-        let args = Arguments::default();
-        println!("Getting compiler path");
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 4, 21))
-            .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, 4, 21)
-        )
-    }
 }
@@ -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];
-    }
-}
@@ -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);
-    }
-}
@@ -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"
-    }
-}
@@ -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"));
-}
@@ -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.
@@ -74,12 +73,6 @@ pub struct Arguments {
    )]
    pub account: String,

-    /// 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 = 100_000)]
-    pub private_keys_to_add: usize,
-
    /// The differential testing leader node implementation.
    #[arg(short, long = "leader", default_value = "geth")]
    pub leader: TestingPlatform,
@@ -92,13 +85,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.
-    #[arg(long, default_value = "1")]
-    pub number_of_nodes: usize,
-
-    /// Determines the amount of threads that will will be used.
-    #[arg(long, default_value = "12")]
-    pub number_of_threads: usize,
+    /// Determines the amount of tests that are executed in parallel.
+    #[arg(long = "workers", default_value = "12")]
+    pub workers: usize,

    /// Extract problems back to the test corpus.
    #[arg(short, long = "extract-problems")]
@@ -149,23 +138,14 @@ impl Arguments {

 impl Default for Arguments {
    fn default() -> Self {
-        static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
-
-        let default = Arguments::parse_from(["retester"]);
-
-        Arguments {
-            temp_dir: Some(&TEMP_DIR),
-            ..default
-        }
+        Arguments::parse_from(["retester"])
    }
 }

 /// The Solidity compatible node implementation.
 ///
 /// This describes the solutions to be tested against on a high level.
-#[derive(
-    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, ValueEnum, Serialize, Deserialize,
-)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Serialize, Deserialize)]
 #[clap(rename_all = "lower")]
 pub enum TestingPlatform {
    /// The go-ethereum reference full node EVM implementation.
@@ -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 }
@@ -1,8 +1,4 @@
-use std::{
-    borrow::Cow,
-    collections::HashSet,
-    path::{Path, PathBuf},
-};
+use std::{borrow::Cow, collections::HashSet, path::PathBuf};

 /// An iterator that finds files of a certain extension in the provided directory. You can think of
 /// this a glob pattern similar to: `${path}/**/*.md`
@@ -22,10 +18,10 @@ pub struct FilesWithExtensionIterator {
 }

 impl FilesWithExtensionIterator {
-    pub fn new(root_directory: impl AsRef<Path>) -> Self {
+    pub fn new(root_directory: PathBuf) -> Self {
        Self {
            allowed_extensions: Default::default(),
-            directories_to_search: vec![root_directory.as_ref().to_path_buf()],
+            directories_to_search: vec![root_directory],
            files_matching_allowed_extensions: Default::default(),
        }
    }
@@ -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 {
@@ -1,76 +1,85 @@
 use std::{
-    collections::HashMap,
-    path::Path,
-    sync::{Arc, LazyLock},
-    time::Instant,
+    collections::{HashMap, HashSet},
+    sync::LazyLock,
 };

 use alloy::{
-    json_abi::JsonAbi,
-    network::{Ethereum, TransactionBuilder},
-    primitives::Address,
-    rpc::types::TransactionRequest,
+    network::TxSigner,
+    primitives::FixedBytes,
+    signers::{Signature, local::PrivateKeySigner},
 };
-use anyhow::Context;
 use clap::Parser;
-use futures::StreamExt;
-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 rayon::{ThreadPoolBuilder, prelude::*};

-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,
+    input::default_caller,
+    metadata::{AddressReplacementMap, 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,
-                None => execute_corpus(&args, &tests, span).await?,
+    let mut corpora = collect_corpora(&args)?;
+    let mut replacement_private_keys = HashSet::<FixedBytes<32>>::new();
+    for case in corpora
+        .values_mut()
+        .flat_map(|metadata| metadata.iter_mut())
+        .flat_map(|metadata| metadata.content.cases.iter_mut())
+    {
+        let mut replacement_map = AddressReplacementMap::new();
+        for address in case.inputs.iter().filter_map(|input| {
+            if input.caller != default_caller() {
+                Some(input.caller)
+            } else {
+                None
            }
-            Report::save()?;
+        }) {
+            replacement_map.add(address);
        }
-        Ok(())
-    };
+        case.handle_address_replacement(&mut replacement_map)?;
+        replacement_private_keys.extend(
+            replacement_map
+                .into_inner()
+                .into_values()
+                .map(|(sk, _)| sk)
+                .map(|sk| sk.to_bytes()),
+        );
+    }

-    tokio::runtime::Builder::new_multi_thread()
-        .worker_threads(args.number_of_threads)
-        .enable_all()
-        .build()
-        .expect("Failed building the Runtime")
-        .block_on(body)
+    for (corpus, tests) in corpora {
+        let span = Span::new(corpus, args.clone())?;
+
+        match &args.compile_only {
+            Some(platform) => compile_corpus(&args, &tests, platform, span),
+            None => execute_corpus(
+                &args,
+                &tests,
+                replacement_private_keys
+                    .clone()
+                    .into_iter()
+                    .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail"))
+                    .collect::<Vec<_>>(),
+                span,
+            )?,
+        }
+
+        Report::save()?;
+    }
+
+    Ok(())
 }

 fn init_cli() -> anyhow::Result<Arguments> {
@@ -101,6 +110,10 @@ fn init_cli() -> anyhow::Result<Arguments> {
    }
    tracing::info!("workdir: {}", args.directory().display());

+    ThreadPoolBuilder::new()
+        .num_threads(args.workers)
+        .build_global()?;
+
    Ok(args)
 }

@@ -118,9 +131,14 @@ 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],
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
    span: Span,
 ) -> anyhow::Result<()>
 where
@@ -129,578 +147,73 @@ where
    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    let leader_nodes = NodePool::<L::Blockchain>::new(args)?;
-    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
+    let leader_nodes = NodePool::<L::Blockchain>::new(args, additional_signers.clone())?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_signers)?;

-    let test_cases = tests
-        .iter()
-        .flat_map(
-            |MetadataFile {
-                 path,
-                 content: metadata,
-             }| {
-                metadata
-                    .cases
-                    .iter()
-                    .enumerate()
-                    .flat_map(move |(case_idx, case)| {
-                        metadata
-                            .solc_modes()
-                            .into_iter()
-                            .map(move |solc_mode| (path, metadata, case_idx, case, solc_mode))
-                    })
-            },
-        )
-        .filter(
-            |(metadata_file_path, metadata, _, _, _)| match metadata.ignore {
-                Some(true) => {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        "Ignoring metadata file"
-                    );
-                    false
-                }
-                Some(false) | None => true,
-            },
-        )
-        .filter(
-            |(metadata_file_path, _, case_idx, case, _)| match case.ignore {
-                Some(true) => {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        case_idx,
-                        case_name = ?case.name,
-                        "Ignoring case"
-                    );
-                    false
-                }
-                Some(false) | None => true,
-            },
-        )
-        .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();
-        let start = Instant::now();
-        async move {
-            const GREEN: &str = "\x1B[32m";
-            const RED: &str = "\x1B[31m";
-            const RESET: &str = "\x1B[0m";
-
-            let mut entries_to_delete = Vec::new();
-            let mut number_of_successes = 0;
-            let mut number_of_failures = 0;
-            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
-                        )
-                    };
-
-                    number_of_successes += case_status
-                        .values()
-                        .filter(|value| value.is_some_and(|value| value))
-                        .count();
-                    number_of_failures += case_status
-                        .values()
-                        .filter(|value| value.is_some_and(|value| !value))
-                        .count();
-
-                    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_idx, case_name, case_status) in case_status.into_iter() {
-                        if case_status {
-                            eprintln!(
-                                "  {GREEN}Case Succeeded:{RESET} {} - Case Idx: {case_idx}",
-                                case_name
-                                    .as_ref()
-                                    .map(|string| string.as_str())
-                                    .unwrap_or("Unnamed case")
-                            )
-                        } else {
-                            eprintln!(
-                                "  {RED}Case Failed:{RESET} {} - Case Idx: {case_idx}",
-                                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 elapsed = start.elapsed();
-            eprintln!(
-                "{GREEN}{}{RESET} cases succeeded, {RED}{}{RESET} cases failed in {} seconds",
-                number_of_successes,
-                number_of_failures,
-                elapsed.as_secs()
-            );
-        }
-    };
-
-    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();
+    tests.par_iter().for_each(
+        |MetadataFile {
+             content: metadata,
+             path: metadata_file_path,
+         }| {
+            // Starting a new tracing span for this metadata file. This allows our logs to be clear
+            // about which metadata file the logs belong to. We can add other information into this
+            // as well to be able to associate the logs with the correct metadata file and case
+            // that's being executed.
            let tracing_span = tracing::span!(
                Level::INFO,
                "Running driver",
-                metadata_file_path = %metadata_file_path.display(),
-                case_idx = case_idx,
-                solc_mode = ?solc_mode,
+                metadata_file_path = metadata_file_path.display().to_string(),
            );
-            let metadata_case_status = metadata_case_status.clone();
-            async move {
-                let result = handle_case_driver::<L, F>(
-                    metadata_file_path.as_path(),
-                    metadata,
-                    case_idx.into(),
-                    case,
-                    solc_mode.clone(),
-                    args,
-                    compilation_cache.clone(),
-                    leader_node,
-                    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::error!(%error, "Execution failed")
-                    }
+            let _guard = tracing_span.enter();
+
+            let mut driver = Driver::<L, F>::new(
+                metadata,
+                args,
+                leader_nodes.round_robbin(),
+                follower_nodes.round_robbin(),
+            );
+
+            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;
                }
-                tracing::info!("Execution completed");
            }
-            .instrument(tracing_span)
+            if error_count == 0 {
+                tracing::info!("Execution succeeded");
+            } else {
+                tracing::info!("Execution failed");
+            }
        },
    );

-    tokio::join!(status_reporter_task, driver_task);
-
    Ok(())
 }

-#[allow(clippy::too_many_arguments)]
-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);
-            }
-        };
-
-        tracing::info!(
-            ?library_instance,
-            library_address = ?leader_receipt.contract_address,
-            "Deployed library to leader"
-        );
-        tracing::info!(
-            ?library_instance,
-            library_address = ?follower_receipt.contract_address,
-            "Deployed library to follower"
-        );
-
-        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,
-                        metadata_file_path,
-                        &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,
-            metadata_file_path,
-            &mode,
-            config,
-            deployed_libraries,
-        )
-        .await?,
-    );
-    *compilation_artifact = Some(compiled_contracts.clone());
-    Ok(compiled_contracts.clone())
-}
-
-async fn compile_contracts<P: Platform>(
-    metadata: &Metadata,
-    metadata_file_path: &Path,
-    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()?;
-
-    tracing::info!(
-        %compiler_version,
-        metadata_file_path = %metadata_file_path.display(),
-        mode = ?mode,
-        "Compiling contracts"
-    );
-
-    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(
+fn execute_corpus(
    args: &Arguments,
    tests: &[MetadataFile],
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
    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, additional_signers, span)?
        }
        (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span).await?
+            run_driver::<Geth, Geth>(args, tests, additional_signers, span)?
        }
        _ => unimplemented!(),
    }
@@ -708,43 +221,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| {
-        metadata
-            .solc_modes()
-            .into_iter()
-            .map(move |solc_mode| (metadata, solc_mode))
-    });
-
-    futures::stream::iter(tests)
-        .for_each_concurrent(None, |(metadata, mode)| async move {
+    tests.par_iter().for_each(|metadata| {
+        for mode in &metadata.solc_modes() {
            match platform {
                TestingPlatform::Geth => {
-                    let _ = compile_contracts::<Geth>(
-                        &metadata.content,
-                        &metadata.path,
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
+                    let mut state = State::<Geth>::new(config, span);
+                    let _ = state.build_contracts(mode, metadata);
                }
                TestingPlatform::Kitchensink => {
-                    let _ = compile_contracts::<Geth>(
-                        &metadata.content,
-                        &metadata.path,
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
+                    let mut state = State::<Kitchensink>::new(config, span);
+                    let _ = state.build_contracts(mode, metadata);
                }
-            }
-        })
-        .await;
+            };
+        }
+    });
 }
@@ -9,20 +9,13 @@ 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 }
 alloy-sol-types = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
-regex = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-
-revive-common = { workspace = true }
-
-[dev-dependencies]
-tokio = { workspace = true }
-indoc = { workspace = true }
@@ -1,9 +1,9 @@
 use serde::Deserialize;

-use revive_dt_common::macros::define_wrapper_type;
-
 use crate::{
+    define_wrapper_type,
    input::{Expected, Input},
+    metadata::AddressReplacementMap,
    mode::Mode,
 };

@@ -15,7 +15,6 @@ pub struct Case {
    pub inputs: Vec<Input>,
    pub group: Option<String>,
    pub expected: Option<Expected>,
-    pub ignore: Option<bool>,
 }

 impl Case {
@@ -42,10 +41,23 @@ impl Case {
                }
            })
    }
+
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &mut AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        for input in self.inputs.iter_mut() {
+            input.handle_address_replacement(old_to_new_mapping)?;
+        }
+        if let Some(ref mut expected) = self.expected {
+            expected.handle_address_replacement(old_to_new_mapping)?;
+        }
+        Ok(())
+    }
 }

 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);
 );
@@ -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)?;
-
-        // 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)
+        Ok(serde_json::from_reader(file)?)
    }

    /// Scan the corpus base directory and return all tests found.
@@ -53,47 +35,33 @@ 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,
+    let dir_entry = match std::fs::read_dir(path) {
+        Ok(dir_entry) => dir_entry,
+        Err(error) => {
+            tracing::error!("failed to read dir '{}': {error}", path.display());
+            return;
+        }
+    };
+
+    for entry in dir_entry {
+        let entry = match entry {
+            Ok(entry) => entry,
            Err(error) => {
-                tracing::error!("failed to read dir '{}': {error}", path.display());
-                return;
-            }
-        };
-
-        for entry in dir_entry {
-            let entry = match entry {
-                Ok(entry) => entry,
-                Err(error) => {
-                    tracing::error!("error reading dir entry: {error}");
-                    continue;
-                }
-            };
-
-            let path = entry.path();
-            if path.is_dir() {
-                collect_metadata(&path, tests);
+                tracing::error!("error reading dir entry: {error}");
                continue;
            }
-
-            if path.is_file() {
-                if let Some(metadata) = MetadataFile::try_from_file(&path) {
-                    tests.push(metadata)
-                }
-            }
-        }
-    } 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) {
+
+        let path = entry.path();
+        if path.is_dir() {
+            collect_metadata(&path, tests);
+            continue;
+        }
+
+        if path.is_file() {
+            if let Some(metadata) = MetadataFile::try_from_file(&path) {
                tests.push(metadata)
            }
-        } else {
-            tracing::error!(?extension, "Unsupported file extension");
        }
    }
 }
@@ -3,8 +3,6 @@
 pub mod case;
 pub mod corpus;
 pub mod input;
+pub mod macros;
 pub mod metadata;
 pub mod mode;
-pub mod traits;
-
-mod semantic_tests;
@@ -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
-/// to contain.
+/// In the above code it's hard to understand what the various types refer to or
+/// what to expect them to contain.
 ///
-/// With these wrapper types we're able to create code that's self-documenting in that the types
-/// tell us what the code is referring to. The above code is transformed into
+/// With these wrapper types we're able to create code that's self-documenting
+/// 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;
@@ -1,5 +1,5 @@
 use std::{
-    collections::BTreeMap,
+    collections::{BTreeMap, HashMap},
    fmt::Display,
    fs::{File, read_to_string},
    ops::Deref,
@@ -7,12 +7,15 @@ use std::{
    str::FromStr,
 };

+use alloy::signers::local::PrivateKeySigner;
+use alloy_primitives::Address;
+use revive_dt_node_interaction::EthereumNode;
 use serde::{Deserialize, Serialize};

-use revive_dt_common::{iterators::FilesWithExtensionIterator, macros::define_wrapper_type};
-
 use crate::{
    case::Case,
+    define_wrapper_type,
+    input::resolve_argument,
    mode::{Mode, SolcMode},
 };

@@ -47,9 +50,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 +89,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 +98,7 @@ impl Metadata {

        for (
            alias,
-            ContractPathAndIdent {
+            ContractPathAndIdentifier {
                contract_source_path,
                contract_ident,
            },
@@ -107,7 +110,7 @@ impl Metadata {

            sources.insert(
                alias,
-                ContractPathAndIdent {
+                ContractPathAndIdentifier {
                    contract_source_path: absolute_path,
                    contract_ident,
                },
@@ -193,10 +196,10 @@ impl Metadata {
                metadata.file_path = Some(path.to_path_buf());
                metadata.contracts = Some(
                    [(
-                        ContractInstance::new("Test"),
-                        ContractPathAndIdent {
+                        ContractInstance::new_from("test"),
+                        ContractPathAndIdentifier {
                            contract_source_path: path.to_path_buf(),
-                            contract_ident: ContractIdent::new("Test"),
+                            contract_ident: ContractIdent::new_from("Test"),
                        },
                    )]
                    .into(),
@@ -213,27 +216,15 @@ 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"),
-            ))
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &mut AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        for case in self.cases.iter_mut() {
+            case.handle_address_replacement(old_to_new_mapping)?;
        }
+        tracing::debug!(metadata = ?self, "Performed replacement on metadata");
+        Ok(())
    }
 }

@@ -241,22 +232,18 @@ 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(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
+    #[derive(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(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
+    #[derive(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 +255,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 +263,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,11 +274,11 @@ 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> {
-        let mut splitted_string = s.split(':').peekable();
+        let mut splitted_string = s.split(":").peekable();
        let mut path = None::<String>;
        let mut identifier = None::<String>;
        loop {
@@ -310,26 +297,20 @@ impl FromStr for ContractPathAndIdent {
                identifier = Some(next_item.to_owned())
            }
        }
-        match (path, identifier) {
-            (Some(path), Some(identifier)) => Ok(Self {
-                contract_source_path: PathBuf::from(path),
-                contract_ident: ContractIdent::new(identifier),
-            }),
-            (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"),
-        }
+        let Some(path) = path else {
+            anyhow::bail!("Path is not defined");
+        };
+        let Some(identifier) = identifier else {
+            anyhow::bail!("Contract identifier is not defined")
+        };
+        Ok(Self {
+            contract_source_path: PathBuf::from(path),
+            contract_ident: ContractIdent::new(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,12 +318,135 @@ impl TryFrom<String> for ContractPathAndIdent {
    }
 }

-impl From<ContractPathAndIdent> for String {
-    fn from(value: ContractPathAndIdent) -> Self {
+impl From<ContractPathAndIdentifier> for String {
+    fn from(value: ContractPathAndIdentifier) -> Self {
        value.to_string()
    }
 }

+#[derive(Clone, Debug, Default)]
+pub struct AddressReplacementMap(HashMap<Address, (PrivateKeySigner, Address)>);
+
+impl AddressReplacementMap {
+    pub fn new() -> Self {
+        Self(Default::default())
+    }
+
+    pub fn into_inner(self) -> HashMap<Address, (PrivateKeySigner, Address)> {
+        self.0
+    }
+
+    pub fn contains_key(&self, address: &Address) -> bool {
+        self.0.contains_key(address)
+    }
+
+    pub fn add(&mut self, address: Address) -> Address {
+        self.0
+            .entry(address)
+            .or_insert_with(|| {
+                let private_key = Self::new_random_private_key_signer();
+                let account = private_key.address();
+                tracing::debug!(
+                    old_address = %address,
+                    new_address = %account,
+                    "Added a new address replacement"
+                );
+                (private_key, account)
+            })
+            .1
+    }
+
+    pub fn resolve(&self, value: &str) -> Option<Address> {
+        // We attempt to resolve the given string without any additional context of the deployed
+        // contracts or the node API as we do not need them. If the resolution fails then we know
+        // that this isn't an address and we skip it.
+        let Ok(resolved) = resolve_argument(value, &Default::default(), &UnimplementedEthereumNode)
+        else {
+            return None;
+        };
+        let resolved_bytes = resolved.to_be_bytes_trimmed_vec();
+        let Ok(address) = Address::try_from(resolved_bytes.as_slice()) else {
+            return None;
+        };
+        self.0.get(&address).map(|(_, address)| *address)
+    }
+
+    fn new_random_private_key_signer() -> PrivateKeySigner {
+        // TODO: Use a seedable RNG to allow for deterministic allocation of the private keys so
+        // that we get reproducible runs.
+        PrivateKeySigner::random()
+    }
+}
+
+impl AsRef<HashMap<Address, (PrivateKeySigner, Address)>> for AddressReplacementMap {
+    fn as_ref(&self) -> &HashMap<Address, (PrivateKeySigner, Address)> {
+        &self.0
+    }
+}
+
+struct UnimplementedEthereumNode;
+
+impl EthereumNode for UnimplementedEthereumNode {
+    fn execute_transaction(
+        &self,
+        _: alloy::rpc::types::TransactionRequest,
+    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<Address> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_difficulty(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::U256> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_hash(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::BlockHash> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_timestamp(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn trace_transaction(
+        &self,
+        _: &alloy::rpc::types::TransactionReceipt,
+        _: alloy::rpc::types::trace::geth::GethDebugTracingOptions,
+    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn state_diff(
+        &self,
+        _: &alloy::rpc::types::TransactionReceipt,
+    ) -> anyhow::Result<alloy::rpc::types::trace::geth::DiffMode> {
+        anyhow::bail!("Unimplemented")
+    }
+}
+
 #[cfg(test)]
 mod test {
    use super::*;
@@ -353,7 +457,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");
@@ -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 {
@@ -1,584 +0,0 @@
-use std::io::{Read, Seek};
-
-use anyhow::{Result, anyhow};
-
-use revive_dt_common::define_wrapper_type;
-
-trait ReadExt: Read + Seek {
-    fn read_while(
-        &mut self,
-        buf: &mut Vec<u8>,
-        callback: impl Fn(&u8) -> bool + Clone,
-    ) -> std::io::Result<()> {
-        for byte in self.bytes() {
-            let byte = byte?;
-            let include_byte = callback(&byte);
-            if include_byte {
-                buf.push(byte)
-            } else {
-                self.seek(std::io::SeekFrom::Current(-1))?;
-                break;
-            }
-        }
-        Ok(())
-    }
-
-    fn skip_while(&mut self, callback: impl Fn(&u8) -> bool + Clone) -> std::io::Result<()> {
-        for byte in self.bytes() {
-            let byte = byte?;
-            let skip = callback(&byte);
-            if !skip {
-                self.seek(std::io::SeekFrom::Current(-1))?;
-                break;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<R> ReadExt for R where R: Read + Seek {}
-
-trait Parse: Sized {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self>;
-
-    fn peek(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        let pos = token_stream.stream_position()?;
-        let this = Self::parse(token_stream);
-        token_stream.seek(std::io::SeekFrom::Start(pos))?;
-        this
-    }
-}
-
-macro_rules! impl_parse_for_tuple {
-    ($first_ident: ident $(, $($ident: ident),*)?) => {
-        impl<$first_ident: Parse, $($($ident: Parse),*)?> Parse for ($first_ident, $($($ident),*)?)  {
-            fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-                Ok((
-                    $first_ident::parse(token_stream)?,
-                    $(
-                        $($ident::parse(token_stream)?),*
-                    )?
-                ))
-            }
-        }
-
-        $(impl_parse_for_tuple!( $($ident),* );)?
-    };
-    () => {}
-}
-
-impl_parse_for_tuple!(
-    A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z
-);
-
-impl Parse for String {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        let mut buffer = Vec::new();
-        token_stream.read_while(&mut buffer, |char| {
-            char.is_ascii_alphanumeric() || char.is_ascii_whitespace()
-        })?;
-        let string = String::from_utf8(buffer)?;
-        if string.trim().is_empty() {
-            Err(anyhow!("Parsing string resulted in an empty string"))
-        } else {
-            Ok(string.trim().to_owned())
-        }
-    }
-}
-
-impl Parse for u64 {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        token_stream.skip_while(u8::is_ascii_whitespace)?;
-
-        let mut buffer = Vec::new();
-        token_stream.read_while(&mut buffer, |char| matches!(char, b'0'..=b'9'))?;
-        let string = String::from_utf8(buffer)?;
-        string.parse().map_err(Into::into)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-struct Function {
-    ident: FunctionIdent,
-    arg_types: Parenthesized<FunctionArgumentType, ','>,
-    colon: ColonToken,
-    function_arguments: Vec<FunctionArgument>,
-    arrow_token: ArrowToken,
-    function_returns: Vec<FunctionReturn>,
-    functions_options: Vec<PostFunctionOptions>,
-}
-
-impl Parse for Function {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            ident: Parse::parse(token_stream)?,
-            arg_types: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            function_arguments: {
-                let mut arguments = Vec::default();
-                loop {
-                    if arguments.is_empty() {
-                        if FunctionArgument::peek(token_stream).is_ok() {
-                            arguments.push(FunctionArgument::parse(token_stream)?);
-                        }
-                    } else {
-                        if CommaToken::peek(token_stream).is_ok() {
-                            CommaToken::parse(token_stream)?;
-                            arguments.push(FunctionArgument::parse(token_stream)?);
-                        } else {
-                            break;
-                        }
-                    }
-                }
-                arguments
-            },
-            arrow_token: Parse::parse(token_stream)?,
-            function_returns: {
-                let mut returns = Vec::default();
-
-                loop {
-                    if returns.is_empty() || CommaToken::peek(token_stream).is_ok() {
-                        if !returns.is_empty() {
-                            CommaToken::parse(token_stream)?;
-                        }
-
-                        let mut buf = Vec::new();
-                        token_stream
-                            .read_while(&mut buf, |byte| *byte != b'\n' && *byte != b',')?;
-                        if NewLineToken::peek(token_stream).is_ok() {
-                            NewLineToken::parse(token_stream)?;
-                        } else if CommaToken::peek(token_stream).is_ok() {
-                            CommaToken::peek(token_stream)?;
-                        }
-                        let string = String::from_utf8(buf)?;
-                        let trimmed = string.trim();
-                        if trimmed.chars().all(|char| char.is_whitespace()) {
-                            break;
-                        } else {
-                            returns.push(FunctionReturn(trimmed.to_string()));
-                        }
-                    } else {
-                        break;
-                    }
-                }
-
-                returns
-            },
-            functions_options: {
-                let mut options = Vec::default();
-
-                while PostFunctionOptions::peek(token_stream).is_ok() {
-                    options.push(PostFunctionOptions::parse(token_stream)?)
-                }
-
-                options
-            },
-        })
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-struct Parenthesized<T, const SEP: char>(pub Vec<T>);
-
-impl<T, const SEP: char> Parse for Parenthesized<T, SEP>
-where
-    T: Parse,
-{
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        OpenParenToken::parse(token_stream)?;
-
-        let mut inner = Vec::new();
-        loop {
-            if CloseParenToken::peek(token_stream).is_ok() {
-                break;
-            }
-            inner.push(T::parse(token_stream)?);
-
-            let reached_the_end = CloseParenToken::peek(token_stream).is_ok();
-            if reached_the_end {
-                break;
-            } else {
-                SingleCharToken::<SEP>::parse(token_stream)?;
-            }
-        }
-
-        CloseParenToken::parse(token_stream)?;
-
-        Ok(Self(inner))
-    }
-}
-
-define_wrapper_type!(
-    /// A wrapper type for a function identifier token.
-    #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    struct FunctionIdent(String);
-);
-
-impl Parse for FunctionIdent {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Parse::parse(token_stream).map(Self)
-    }
-}
-
-define_wrapper_type!(
-    /// A wrapper type for a function argument token.
-    #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    struct FunctionArgumentType(String);
-);
-
-impl Parse for FunctionArgumentType {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Parse::parse(token_stream).map(Self)
-    }
-}
-
-define_wrapper_type!(
-    /// A wrapper type for a function argument token.
-    #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    struct FunctionArgument(String);
-);
-
-impl Parse for FunctionArgument {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Parse::parse(token_stream).map(Self)
-    }
-}
-
-define_wrapper_type!(
-    /// A wrapper type for a function return token.
-    #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    struct FunctionReturn(String);
-);
-
-impl Parse for FunctionReturn {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Parse::parse(token_stream).map(Self)
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct SingleCharToken<const CHAR: char>;
-
-impl<const CHAR: char> Parse for SingleCharToken<CHAR> {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        let mut buf = [0; 1];
-        loop {
-            token_stream.read(&mut buf)?;
-            let [byte] = buf;
-            if byte == CHAR as u8 {
-                return Ok(Self);
-            } else if byte.is_ascii_whitespace() {
-                continue;
-            } else {
-                return Err(anyhow!(
-                    "Invalid character encountered {} expected {}",
-                    byte as char,
-                    CHAR
-                ));
-            }
-        }
-    }
-}
-
-// Bit of a hack, but I do this because Rust analyzer doesn't like `SingleCharToken<'>'>` and it
-// messes up with the syntax highlighting.
-const GT_CHAR: char = '>';
-
-type ColonToken = SingleCharToken<':'>;
-type CommaToken = SingleCharToken<','>;
-type OpenParenToken = SingleCharToken<'('>;
-type CloseParenToken = SingleCharToken<')'>;
-type DashToken = SingleCharToken<'-'>;
-type GtToken = SingleCharToken<{ GT_CHAR }>;
-type NewLineToken = SingleCharToken<'\n'>;
-type SpaceToken = SingleCharToken<' '>;
-type ArrowToken = (DashToken, GtToken);
-
-macro_rules! string_literal_token {
-    (
-        $($ty_ident: ident => $str: expr),* $(,)?
-    ) => {
-        $(
-            #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-            pub struct $ty_ident;
-
-            impl Parse for $ty_ident {
-                fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-                    token_stream.skip_while(u8::is_ascii_whitespace)?;
-
-                    let mut buffer = [0; $str.len()];
-                    token_stream.read(&mut buffer)?;
-                    while SpaceToken::peek(token_stream).is_ok() {
-                        SpaceToken::parse(token_stream)?;
-                    }
-                    if $str.as_bytes() == buffer {
-                        Ok(Self)
-                    } else {
-                        Err(anyhow!("Invalid string - expected {} but got {:?}", $str, str::from_utf8(&buffer)))
-                    }
-                }
-            }
-        )*
-    };
-}
-string_literal_token! {
-    GasLiteralStringToken => "gas",
-    IrOptimizedLiteralStringToken => "irOptimized",
-    LegacyLiteralStringToken => "legacy",
-    LegacyOptimizedLiteralStringToken => "legacyOptimized",
-    CodeLiteralStringToken => "code",
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum PostFunctionOptions {
-    IrOptimizedGasOption(IrOptimizedGasOption),
-    IrOptimizedGasCodeOption(IrOptimizedGasCodeOption),
-    LegacyGasOption(LegacyGasOption),
-    LegacyGasCodeOption(LegacyGasCodeOption),
-    LegacyOptimizedGasOption(LegacyOptimizedGasOption),
-    LegacyOptimizedGasCodeOption(LegacyOptimizedGasCodeOption),
-}
-
-impl Parse for PostFunctionOptions {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        if IrOptimizedGasOption::peek(token_stream).is_ok() {
-            IrOptimizedGasOption::parse(token_stream).map(Self::IrOptimizedGasOption)
-        } else if IrOptimizedGasCodeOption::peek(token_stream).is_ok() {
-            IrOptimizedGasCodeOption::parse(token_stream).map(Self::IrOptimizedGasCodeOption)
-        } else if LegacyGasOption::peek(token_stream).is_ok() {
-            LegacyGasOption::parse(token_stream).map(Self::LegacyGasOption)
-        } else if LegacyGasCodeOption::peek(token_stream).is_ok() {
-            LegacyGasCodeOption::parse(token_stream).map(Self::LegacyGasCodeOption)
-        } else if LegacyOptimizedGasOption::peek(token_stream).is_ok() {
-            LegacyOptimizedGasOption::parse(token_stream).map(Self::LegacyOptimizedGasOption)
-        } else if LegacyOptimizedGasCodeOption::peek(token_stream).is_ok() {
-            LegacyOptimizedGasCodeOption::parse(token_stream)
-                .map(Self::LegacyOptimizedGasCodeOption)
-        } else {
-            Err(anyhow!("Failed to parse post function options"))
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct IrOptimizedGasOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: IrOptimizedLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for IrOptimizedGasOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct IrOptimizedGasCodeOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: IrOptimizedLiteralStringToken,
-    pub code: CodeLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for IrOptimizedGasCodeOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            code: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct LegacyGasOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: LegacyLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for LegacyGasOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct LegacyGasCodeOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: LegacyLiteralStringToken,
-    pub code: CodeLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for LegacyGasCodeOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            code: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct LegacyOptimizedGasOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: LegacyOptimizedLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for LegacyOptimizedGasOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-struct LegacyOptimizedGasCodeOption {
-    pub gas_token: GasLiteralStringToken,
-    pub gas_option: LegacyOptimizedLiteralStringToken,
-    pub code: CodeLiteralStringToken,
-    pub colon: ColonToken,
-    pub value: u64,
-}
-
-impl Parse for LegacyOptimizedGasCodeOption {
-    fn parse(token_stream: &mut (impl Read + Seek)) -> Result<Self> {
-        Ok(Self {
-            gas_token: Parse::parse(token_stream)?,
-            gas_option: Parse::parse(token_stream)?,
-            code: Parse::parse(token_stream)?,
-            colon: Parse::parse(token_stream)?,
-            value: Parse::parse(token_stream)?,
-        })
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::io::Cursor;
-
-    use indoc::indoc;
-
-    use super::*;
-
-    #[test]
-    fn complex_function_can_be_parsed() {
-        // Arrange
-        let string = indoc!(
-            r#"
-            myFunction(uint256, uint64,
-            )
-            :
-            1, 2
-            , 3
-            -> 1, 2, 3, 4
-            gas irOptimized: 135499
-            gas legacy: 137095
-            gas legacyOptimized: 135823
-            gas irOptimized code: 135499
-            gas legacy code: 137095
-            gas legacyOptimized code: 135823
-            "#
-        );
-        let mut token_stream = Cursor::new(string);
-
-        // Act
-        let function = Function::parse(&mut token_stream);
-
-        // Assert
-        let function = function.expect("Function parsing failed");
-        assert_eq!(
-            function,
-            Function {
-                ident: FunctionIdent::new("myFunction"),
-                arg_types: Parenthesized(vec![
-                    FunctionArgumentType::new("uint256"),
-                    FunctionArgumentType::new("uint64")
-                ]),
-                colon: ColonToken::default(),
-                function_arguments: vec![
-                    FunctionArgument::new("1"),
-                    FunctionArgument::new("2"),
-                    FunctionArgument::new("3")
-                ],
-                arrow_token: ArrowToken::default(),
-                function_returns: vec![
-                    FunctionReturn::new("1"),
-                    FunctionReturn::new("2"),
-                    FunctionReturn::new("3"),
-                    FunctionReturn::new("4"),
-                ],
-                functions_options: vec![
-                    PostFunctionOptions::IrOptimizedGasOption(IrOptimizedGasOption {
-                        gas_token: Default::default(),
-                        gas_option: Default::default(),
-                        colon: Default::default(),
-                        value: 135499
-                    }),
-                    PostFunctionOptions::LegacyGasOption(LegacyGasOption {
-                        gas_token: Default::default(),
-                        gas_option: Default::default(),
-                        colon: Default::default(),
-                        value: 137095
-                    }),
-                    PostFunctionOptions::LegacyOptimizedGasOption(LegacyOptimizedGasOption {
-                        gas_token: Default::default(),
-                        gas_option: Default::default(),
-                        colon: Default::default(),
-                        value: 135823
-                    }),
-                    PostFunctionOptions::IrOptimizedGasCodeOption(IrOptimizedGasCodeOption {
-                        gas_token: Default::default(),
-                        gas_option: Default::default(),
-                        code: Default::default(),
-                        colon: Default::default(),
-                        value: 135499
-                    }),
-                    PostFunctionOptions::LegacyGasCodeOption(LegacyGasCodeOption {
-                        gas_token: Default::default(),
-                        gas_option: Default::default(),
-                        code: Default::default(),
-                        colon: Default::default(),
-                        value: 137095
-                    }),
-                    PostFunctionOptions::LegacyOptimizedGasCodeOption(
-                        LegacyOptimizedGasCodeOption {
-                            gas_token: Default::default(),
-                            gas_option: Default::default(),
-                            code: Default::default(),
-                            colon: Default::default(),
-                            value: 135823
-                        }
-                    ),
-                ]
-            }
-        );
-    }
-}
@@ -1,12 +0,0 @@
-//! This module contains a parser for the Solidity semantic tests allowing them to be parsed into
-//! regular [`Metadata`] objects that can be executed by the testing framework.
-//!
-//! [`Metadata`]: crate::metadata::Metadata
-
-mod function_parser;
-mod sections;
-mod test_configuration;
-
-pub use function_parser::*;
-pub use sections::*;
-pub use test_configuration::*;
@@ -1,338 +0,0 @@
-use std::{collections::VecDeque, path::PathBuf, sync::LazyLock};
-
-use anyhow::{Context, Result, anyhow};
-use regex::Regex;
-
-use crate::semantic_tests::TestConfiguration;
-
-/// This enum describes the various sections that a semantic test can contain.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum SemanticTestSection {
-    /// A source code section that consists of Solidity code.
-    ///
-    /// Source code sections might have a file name and they might not. Take the following section
-    /// as an example which doesn't contain a filename
-    ///
-    /// ```solidity
-    /// contract C {
-    ///     bytes data;
-    ///     function () pure returns (bytes memory) f;
-    ///     constructor() {
-    ///         data = M.longdata();
-    ///         f = M.longdata;
-    ///     }
-    ///     function test() public view returns (bool) {
-    ///         return keccak256(data) == keccak256(f());
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// The above will translate into this enum variant and without a defined filename for the code.
-    /// However, the following will translate into this variant of the enum with a defined file name
-    ///
-    /// ```solidity
-    /// ==== Source: main.sol ====
-    /// contract C {
-    ///     bytes data;
-    ///     function () pure returns (bytes memory) f;
-    ///     constructor() {
-    ///         data = M.longdata();
-    ///         f = M.longdata;
-    ///     }
-    ///     function test() public view returns (bool) {
-    ///         return keccak256(data) == keccak256(f());
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// This is because of the use of the `Source` directive at the start of the section.
-    ///
-    /// Note the following: All tests will be run on the last declared contract in the semantic test
-    /// and therefore the order of the contracts matters.
-    SourceCode {
-        file_name: Option<PathBuf>,
-        content: String,
-    },
-
-    /// An external source section from the solidity semantic tests.
-    ///
-    /// External source sections from the solidity semantic tests are the simplest sections out of
-    /// them all. They look like the following:
-    ///
-    /// ```solidity
-    /// ==== ExternalSource: _prbmath/PRBMathSD59x18.sol ====
-    /// ```
-    ///
-    /// And they can be thought of as a directive to the compiler to include these contracts when
-    /// compiling the test contract.
-    ExternalSource { path: PathBuf },
-
-    /// A test configuration section
-    ///
-    /// This section contains various configuration and filters that are used for the tests and its
-    /// always the section that comes right before the actual tests. This section looks like the
-    /// following:
-    ///
-    /// ```solidity
-    /// // ====
-    /// // ABIEncoderV1Only: true
-    /// // compileViaYul: false
-    /// // ----
-    /// ```
-    TestConfiguration { configuration: TestConfiguration },
-
-    /// A test inputs section.
-    ///
-    /// This section consists of all of the lines that make up the test inputs or the test steps
-    /// which is the final section found in the semantic test files. This section looks like the
-    /// following:
-    ///
-    /// ```solidity
-    /// // ----
-    /// // f1() -> 0x20, 0x40, 0x20, 0
-    /// // f2(string): 0x20, 0 -> 0x20, 0x40, 0x20, 0
-    /// // f2(string): 0x20, 0, 0 -> 0x20, 0x40, 0x20, 0
-    /// // g1() -> 32, 0
-    /// // g2(string): 0x20, 0 -> 0x20, 0
-    /// // g2(string): 0x20, 0, 0 -> 0x20, 0
-    /// ```
-    TestInputs { lines: Vec<String> },
-}
-
-impl SemanticTestSection {
-    const SOURCE_SECTION_MARKER: &str = "==== Source:";
-    const EXTERNAL_SOURCE_SECTION_MARKER: &str = "==== ExternalSource:";
-    const TEST_CONFIGURATION_SECTION_MARKER: &str = "// ====";
-    const TEST_INPUTS_SECTION_MARKER: &str = "// ----";
-
-    pub fn parse_source_into_sections(source: impl AsRef<str>) -> Result<Vec<Self>> {
-        let mut sections = VecDeque::<Self>::new();
-        sections.push_back(Self::SourceCode {
-            file_name: None,
-            content: Default::default(),
-        });
-
-        for line in source.as_ref().split('\n') {
-            if let Some(new_section) = sections
-                .back_mut()
-                .expect("Impossible case - we have at least one item in the sections")
-                .append_line(line)?
-            {
-                sections.push_back(new_section);
-            }
-        }
-
-        let first_section = sections
-            .front()
-            .expect("Impossible case - there's always at least one section");
-        let remove_first_section = match first_section {
-            SemanticTestSection::SourceCode { file_name, content } => {
-                file_name.is_none() && content.is_empty()
-            }
-            SemanticTestSection::ExternalSource { .. }
-            | SemanticTestSection::TestConfiguration { .. }
-            | SemanticTestSection::TestInputs { .. } => false,
-        };
-        if remove_first_section {
-            sections.pop_front();
-        }
-
-        Ok(sections.into_iter().collect())
-    }
-
-    /// Appends a line to a semantic test section.
-    ///
-    /// This method takes in the current section and a new line and attempts to append it to parse
-    /// it and append it to the current section. If the line is found to be the start of a new
-    /// section then no changes will be made to the current section and instead the line will be
-    /// interpreted according to the rules of new sections.
-    pub fn append_line(&mut self, line: impl AsRef<str>) -> Result<Option<Self>> {
-        static COMMENT_REPLACEMENT_REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new("#.*#$").unwrap());
-
-        let line = line.as_ref();
-        if line.is_empty() {
-            Ok(None)
-        } else if let Some(source_path) = line.strip_prefix(Self::SOURCE_SECTION_MARKER) {
-            let source_code_file_path = source_path
-                .trim()
-                .split(' ')
-                .next()
-                .context("Failed to find the source code file path")?;
-            Ok(Some(Self::SourceCode {
-                file_name: Some(PathBuf::from(source_code_file_path)),
-                content: Default::default(),
-            }))
-        } else if let Some(external_source_path) =
-            line.strip_prefix(Self::EXTERNAL_SOURCE_SECTION_MARKER)
-        {
-            let source_code_file_path = external_source_path
-                .trim()
-                .split(' ')
-                .next()
-                .context("Failed to find the source code file path")?;
-            Ok(Some(Self::ExternalSource {
-                path: PathBuf::from(source_code_file_path),
-            }))
-        } else if line == Self::TEST_CONFIGURATION_SECTION_MARKER {
-            Ok(Some(Self::TestConfiguration {
-                configuration: Default::default(),
-            }))
-        } else if line == Self::TEST_INPUTS_SECTION_MARKER {
-            Ok(Some(Self::TestInputs {
-                lines: Default::default(),
-            }))
-        } else {
-            match self {
-                SemanticTestSection::SourceCode { content, .. } => {
-                    content.push('\n');
-                    content.push_str(line);
-                    Ok(None)
-                }
-                SemanticTestSection::ExternalSource { .. } => Ok(Some(Self::SourceCode {
-                    file_name: None,
-                    content: line.to_owned(),
-                })),
-                SemanticTestSection::TestConfiguration { configuration } => {
-                    let line = line
-                        .strip_prefix("//")
-                        .with_context(|| {
-                            format!("Line doesn't contain test configuration prefix: {line}")
-                        })?
-                        .trim();
-                    let mut splitted = line.split(':');
-                    let key = splitted.next().context("Failed to find the key")?.trim();
-                    let value = splitted.next().context("Failed to find the value")?.trim();
-                    configuration.with_config(key, value)?;
-                    Ok(None)
-                }
-                SemanticTestSection::TestInputs { lines } => {
-                    let line = line
-                        .strip_prefix("//")
-                        .ok_or_else(|| anyhow!("Line doesn't contain test input prefix: {line}"))
-                        .map(str::trim)?;
-                    let line = COMMENT_REPLACEMENT_REGEX.replace_all(line, "");
-                    if !line.starts_with('#') && !line.chars().all(|char| char.is_whitespace()) {
-                        lines.push(line.to_string());
-                    }
-                    Ok(None)
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use super::*;
-
-    #[test]
-    fn parses_a_simple_file_correctly() {
-        // Arrange
-        const SIMPLE_FILE: &str = indoc!(
-            r#"
-            ==== Source: main.sol ====
-            contract C {
-                function f() public pure returns (uint) {
-                    return 1;
-                }
-            }
-            // ====
-            // compileViaYul: true
-            // ----
-            // f() -> 1
-            "#
-        );
-
-        // Act
-        let sections =
-            SemanticTestSection::parse_source_into_sections(SIMPLE_FILE).expect("Failed to parse");
-
-        // Assert
-        assert_eq!(
-            sections,
-            vec![
-                SemanticTestSection::SourceCode {
-                    file_name: Some("main.sol".into()),
-                    content: "\ncontract C {\n    function f() public pure returns (uint) {\n        return 1;\n    }\n}".to_string()
-                },
-                SemanticTestSection::TestConfiguration {
-                    configuration: TestConfiguration { compile_via_yul: Some(true.into()), ..Default::default() },
-                },
-                SemanticTestSection::TestInputs {
-                    lines: vec!["f() -> 1".to_string()]
-                }
-            ]
-        )
-    }
-
-    #[test]
-    fn parses_a_complex_file_correctly() {
-        // Arrange
-        const COMPLEX_FILE: &str = indoc!(
-            r#"
-            ==== Source: main.sol ====
-            import "./lib.sol";
-            contract C {
-                function f() public pure returns (uint) {
-                    return Lib.f();
-                }
-            }
-            ==== Source: lib.sol ====
-            library Lib {
-                function f() internal pure returns (uint) {
-                    return 1;
-                }
-            }
-            // ====
-            // compileViaYul: true
-            // ----
-            // # This is a comment
-            // f() -> 1
-            "#
-        );
-
-        // Act
-        let sections =
-            SemanticTestSection::parse_source_into_sections(COMPLEX_FILE).expect("Failed to parse");
-
-        // Assert
-        assert_eq!(
-            sections,
-            vec![
-                SemanticTestSection::SourceCode {
-                    file_name: Some("main.sol".into()),
-                    content: "\nimport \"./lib.sol\";\ncontract C {\n    function f() public pure returns (uint) {\n        return Lib.f();\n    }\n}".to_string()
-                },
-                SemanticTestSection::SourceCode {
-                    file_name: Some("lib.sol".into()),
-                    content: "\nlibrary Lib {\n    function f() internal pure returns (uint) {\n        return 1;\n    }\n}".to_string()
-                },
-                SemanticTestSection::TestConfiguration {
-                    configuration: TestConfiguration { compile_via_yul: Some(true.into()), ..Default::default() },
-                },
-                SemanticTestSection::TestInputs {
-                    lines: vec!["f() -> 1".to_string()]
-                }
-            ]
-        )
-    }
-
-    #[test]
-    #[ignore = "Ignored and should be removed before making a PR"]
-    fn test() {
-        let files = revive_dt_common::iterators::FilesWithExtensionIterator::new(
-            "/Users/omarabdulla/parity/resolc-compiler-tests/fixtures/solidity/ethereum",
-        )
-        .with_allowed_extension("sol");
-
-        for file in files {
-            let content = std::fs::read_to_string(file).unwrap();
-            let sections = SemanticTestSection::parse_source_into_sections(content).unwrap();
-
-            println!("{sections:#?}");
-        }
-    }
-}
@@ -1,200 +0,0 @@
-use std::str::FromStr;
-
-use revive_common::EVMVersion;
-
-use anyhow::{Error, Result, bail};
-
-/// The configuration parameters provided in the solidity semantic tests.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub struct TestConfiguration {
-    /// Controls if the test case compiles through the Yul IR.
-    pub compile_via_yul: Option<ItemConfig>,
-    /// Controls if the compilation should be done to EWASM.
-    pub compile_to_ewasm: Option<ItemConfig>,
-    /// Controls if ABI encoding should be restricted to the V1 ABI encoder.
-    pub abi_encoder_v1_only: Option<ItemConfig>,
-    /// Controls the EVM Version that the test is compatible with.
-    pub evm_version: Option<EvmVersionRequirement>,
-    /// Controls how the revert strings should be handled.
-    pub revert_strings: Option<RevertString>,
-    /// Controls if non-existent functions should be permitted or not.
-    pub allow_non_existing_functions: Option<bool>,
-    /// The list of bytecode formats that this test should be run against.
-    pub bytecode_format: Option<Vec<BytecodeFormat>>,
-}
-
-impl TestConfiguration {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn with_config(
-        &mut self,
-        key: impl AsRef<str>,
-        value: impl AsRef<str>,
-    ) -> Result<&mut Self> {
-        match key.as_ref() {
-            "compileViaYul" => self.compile_via_yul = Some(value.as_ref().parse()?),
-            "compileToEwasm" => self.compile_to_ewasm = Some(value.as_ref().parse()?),
-            "ABIEncoderV1Only" => self.abi_encoder_v1_only = Some(value.as_ref().parse()?),
-            "EVMVersion" => self.evm_version = Some(value.as_ref().parse()?),
-            "revertStrings" => self.revert_strings = Some(value.as_ref().parse()?),
-            "allowNonExistingFunctions" => {
-                self.allow_non_existing_functions = Some(value.as_ref().parse()?)
-            }
-            "bytecodeFormat" => {
-                self.bytecode_format = Some(
-                    value
-                        .as_ref()
-                        .split(',')
-                        .map(str::trim)
-                        .map(FromStr::from_str)
-                        .collect::<Result<Vec<_>>>()?,
-                )
-            }
-            _ => bail!("Unknown test configuration {}", key.as_ref()),
-        };
-        Ok(self)
-    }
-
-    pub fn new_from_pairs(
-        pairs: impl IntoIterator<Item = (impl AsRef<str>, impl AsRef<str>)>,
-    ) -> Result<Self> {
-        let mut this = Self::default();
-        pairs
-            .into_iter()
-            .try_fold(&mut this, |this, (key, value)| this.with_config(key, value))?;
-        Ok(this)
-    }
-}
-
-/// The configuration of a single item in the test configuration.
-#[derive(Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum ItemConfig {
-    /// The configuration is set to e a boolean that's either `true` or `false`.
-    Boolean(bool),
-    /// The `also`
-    Also,
-}
-
-impl FromStr for ItemConfig {
-    type Err = Error;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "true" => Ok(Self::Boolean(true)),
-            "false" => Ok(Self::Boolean(false)),
-            "also" => Ok(Self::Also),
-            _ => bail!("Invalid ItemConfig {s}"),
-        }
-    }
-}
-
-impl From<bool> for ItemConfig {
-    fn from(value: bool) -> Self {
-        Self::Boolean(value)
-    }
-}
-
-impl TryFrom<String> for ItemConfig {
-    type Error = <ItemConfig as FromStr>::Err;
-
-    fn try_from(value: String) -> std::result::Result<Self, Self::Error> {
-        value.as_str().parse()
-    }
-}
-
-/// The options available for the revert strings.
-#[derive(Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub enum RevertString {
-    #[default]
-    Default,
-    Debug,
-    Strip,
-    VerboseDebug,
-}
-
-impl FromStr for RevertString {
-    type Err = Error;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "default" => Ok(Self::Default),
-            "debug" => Ok(Self::Debug),
-            "strip" => Ok(Self::Strip),
-            "verboseDebug" => Ok(Self::VerboseDebug),
-            _ => bail!("Invalid RevertString {s}"),
-        }
-    }
-}
-
-impl TryFrom<String> for RevertString {
-    type Error = <RevertString as FromStr>::Err;
-
-    fn try_from(value: String) -> std::result::Result<Self, Self::Error> {
-        value.as_str().parse()
-    }
-}
-
-/// The set of available bytecode formats.
-#[derive(Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum BytecodeFormat {
-    Legacy,
-    EofVersionGreaterThanOne,
-}
-
-impl FromStr for BytecodeFormat {
-    type Err = Error;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "legacy" => Ok(Self::Legacy),
-            ">=EOFv1" => Ok(Self::EofVersionGreaterThanOne),
-            _ => bail!("Invalid BytecodeFormat {s}"),
-        }
-    }
-}
-
-impl TryFrom<String> for BytecodeFormat {
-    type Error = <BytecodeFormat as FromStr>::Err;
-
-    fn try_from(value: String) -> std::result::Result<Self, Self::Error> {
-        value.as_str().parse()
-    }
-}
-
-#[derive(Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum EvmVersionRequirement {
-    GreaterThan(EVMVersion),
-    GreaterThanOrEqual(EVMVersion),
-    LessThan(EVMVersion),
-    LessThanOrEqual(EVMVersion),
-    EqualTo(EVMVersion),
-}
-
-impl FromStr for EvmVersionRequirement {
-    type Err = Error;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s.as_bytes() {
-            [b'>', b'=', remaining @ ..] => Ok(Self::GreaterThanOrEqual(
-                str::from_utf8(remaining)?.try_into()?,
-            )),
-            [b'>', remaining @ ..] => Ok(Self::GreaterThan(str::from_utf8(remaining)?.try_into()?)),
-            [b'<', b'=', remaining @ ..] => Ok(Self::LessThanOrEqual(
-                str::from_utf8(remaining)?.try_into()?,
-            )),
-            [b'<', remaining @ ..] => Ok(Self::LessThan(str::from_utf8(remaining)?.try_into()?)),
-            [b'=', remaining @ ..] => Ok(Self::EqualTo(str::from_utf8(remaining)?.try_into()?)),
-            _ => bail!("Invalid EVM version requirement {s}"),
-        }
-    }
-}
-
-impl TryFrom<String> for EvmVersionRequirement {
-    type Error = <EvmVersionRequirement as FromStr>::Err;
-
-    fn try_from(value: String) -> std::result::Result<Self, Self::Error> {
-        value.as_str().parse()
-    }
-}
@@ -1,150 +0,0 @@
-use std::collections::HashMap;
-
-use alloy::eips::BlockNumberOrTag;
-use alloy::json_abi::JsonAbi;
-use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
-use alloy_primitives::TxHash;
-use anyhow::Result;
-
-use crate::metadata::ContractInstance;
-
-/// 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>>;
-
-    /// Returns the gas price for the specified transaction.
-    fn transaction_gas_price(&self, tx_hash: &TxHash) -> impl Future<Output = Result<u128>>;
-
-    // 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 base fee of the specified block.
-    fn block_base_fee(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u64>>;
-
-    /// 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>>;
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-/// Contextual information required by the code that's performing the resolution.
-pub struct ResolutionContext<'a> {
-    /// When provided the contracts provided here will be used for resolutions.
-    deployed_contracts: Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>,
-
-    /// When provided the variables in here will be used for performing resolutions.
-    variables: Option<&'a HashMap<String, U256>>,
-
-    /// When provided this block number will be treated as the tip of the chain.
-    block_number: Option<&'a BlockNumber>,
-
-    /// When provided the resolver will use this transaction hash for all of its resolutions.
-    transaction_hash: Option<&'a TxHash>,
-}
-
-impl<'a> ResolutionContext<'a> {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn new_from_parts(
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
-        block_number: impl Into<Option<&'a BlockNumber>>,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
-    ) -> Self {
-        Self {
-            deployed_contracts: deployed_contracts.into(),
-            variables: variables.into(),
-            block_number: block_number.into(),
-            transaction_hash: transaction_hash.into(),
-        }
-    }
-
-    pub fn with_deployed_contracts(
-        mut self,
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
-    ) -> Self {
-        self.deployed_contracts = deployed_contracts.into();
-        self
-    }
-
-    pub fn with_variables(
-        mut self,
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
-    ) -> Self {
-        self.variables = variables.into();
-        self
-    }
-
-    pub fn with_block_number(mut self, block_number: impl Into<Option<&'a BlockNumber>>) -> Self {
-        self.block_number = block_number.into();
-        self
-    }
-
-    pub fn with_transaction_hash(
-        mut self,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
-    ) -> Self {
-        self.transaction_hash = transaction_hash.into();
-        self
-    }
-
-    pub fn resolve_block_number(&self, number: BlockNumberOrTag) -> BlockNumberOrTag {
-        match self.block_number {
-            Some(block_number) => match number {
-                BlockNumberOrTag::Latest => BlockNumberOrTag::Number(*block_number),
-                n @ (BlockNumberOrTag::Finalized
-                | BlockNumberOrTag::Safe
-                | BlockNumberOrTag::Earliest
-                | BlockNumberOrTag::Pending
-                | BlockNumberOrTag::Number(_)) => n,
-            },
-            None => number,
-        }
-    }
-
-    pub fn deployed_contract(&self, instance: &ContractInstance) -> Option<&(Address, JsonAbi)> {
-        self.deployed_contracts
-            .and_then(|deployed_contracts| deployed_contracts.get(instance))
-    }
-
-    pub fn deployed_contract_address(&self, instance: &ContractInstance) -> Option<&Address> {
-        self.deployed_contract(instance).map(|(a, _)| a)
-    }
-
-    pub fn deployed_contract_abi(&self, instance: &ContractInstance) -> Option<&JsonAbi> {
-        self.deployed_contract(instance).map(|(_, a)| a)
-    }
-
-    pub fn variable(&self, name: impl AsRef<str>) -> Option<&U256> {
-        self.variables
-            .and_then(|variables| variables.get(name.as_ref()))
-    }
-
-    pub fn tip_block_number(&self) -> Option<&'a BlockNumber> {
-        self.block_number
-    }
-
-    pub fn transaction_hash(&self) -> Option<&'a TxHash> {
-        self.transaction_hash
-    }
-}
@@ -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 }
@@ -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)
+    }
+}
@@ -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(
-        &self,
-        transaction: TransactionRequest,
-    ) -> impl Future<Output = Result<TransactionReceipt>>;
+    fn execute_transaction(&self, transaction: TransactionRequest) -> 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>;
 }
@@ -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 }
@@ -1,5 +0,0 @@
-/// 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
-/// some issues with different values of the initial balance on Kitchensink.
-pub const INITIAL_BALANCE: u128 = 10u128.pow(37);
@@ -3,21 +3,17 @@
 use std::{
    fs::{File, OpenOptions, create_dir_all, remove_dir_all},
    io::{BufRead, BufReader, Read, Write},
-    ops::ControlFlow,
    path::PathBuf,
    process::{Child, Command, Stdio},
-    sync::{
-        Arc,
-        atomic::{AtomicU32, Ordering},
-    },
+    sync::atomic::{AtomicU32, Ordering},
    time::{Duration, Instant},
 };

 use alloy::{
    eips::BlockNumberOrTag,
    genesis::{Genesis, GenesisAccount},
-    network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, TxHash, U256},
+    network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner},
+    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256},
    providers::{
        Provider, ProviderBuilder,
        ext::DebugApi,
@@ -27,17 +23,13 @@ use alloy::{
        TransactionReceipt, TransactionRequest,
        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
    },
-    signers::local::PrivateKeySigner,
+    signers::Signature,
 };
-use anyhow::Context;
-use tracing::{Instrument, Level};
-
-use revive_dt_common::{fs::clear_directory, futures::poll};
 use revive_dt_config::Arguments;
-use revive_dt_format::traits::ResolverApi;
-use revive_dt_node_interaction::EthereumNode;
+use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
+use tracing::Level;

-use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
+use crate::{Node, common::FallbackGasFiller};

 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);

@@ -49,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,
@@ -68,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";
@@ -82,18 +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";
-    const TRANSACTION_TRACING_ERROR: &str = "historical state not available in path scheme yet";
-
-    const RECEIPT_POLLING_DURATION: Duration = Duration::from_secs(5 * 60);
-    const TRACE_POLLING_DURATION: Duration = Duration::from_secs(60);
-
    /// 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)?;

@@ -101,19 +84,15 @@ 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)
-                .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
+            genesis.alloc.entry(signer_address).or_insert(
+                GenesisAccount::default()
+                    .with_balance(10000000000000000000000u128.try_into().unwrap()),
+            );
        }
        let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
        serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;

        let mut child = Command::new(&self.geth)
-            .arg("--state.scheme")
-            .arg("hash")
            .arg("init")
            .arg("--datadir")
            .arg(&self.data_directory)
@@ -167,16 +146,6 @@ impl GethNode {
            .arg("--nodiscover")
            .arg("--maxpeers")
            .arg("0")
-            .arg("--txlookuplimit")
-            .arg("0")
-            .arg("--cache.blocklogs")
-            .arg("512")
-            .arg("--state.scheme")
-            .arg("hash")
-            .arg("--syncmode")
-            .arg("full")
-            .arg("--gcmode")
-            .arg("archive")
            .stderr(stderr_logs_file.try_clone()?)
            .stdout(stdout_logs_file.try_clone()?)
            .spawn()?
@@ -265,221 +234,217 @@ impl GethNode {
    }
 }

-impl EthereumNode for GethNode {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    async fn execute_transaction(
+impl EthereumNode for Instance {
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn execute_transaction(
        &self,
        transaction: TransactionRequest,
    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let span = tracing::debug_span!("Submitting transaction", ?transaction);
-        let _guard = span.enter();
+        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 = Arc::new(self.provider().await?);
-        let transaction_hash = *provider.send_transaction(transaction).await?.tx_hash();
+            let provider = provider.await?;

-        // The following is a fix for the "transaction indexing is in progress" error that we
-        // used to get. You can find more information on this in the following GH issue in geth
-        // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on,
-        // before we can get the receipt of the transaction it needs to have been indexed by the
-        // node's indexer. Just because the transaction has been confirmed it doesn't mean that
-        // it has been indexed. When we call alloy's `get_receipt` it checks if the transaction
-        // was confirmed. If it has been, then it will call `eth_getTransactionReceipt` method
-        // which _might_ return the above error if the tx has not yet been indexed yet. So, we
-        // need to implement a retry mechanism for the receipt to keep retrying to get it until
-        // 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
-        // when a lot of transactions are being submitted to the node. Thus, while initially we
-        // 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
-        // with exponential backoff each time we attempt to get the receipt and find that it's
-        // not available.
-        poll(
-            Self::RECEIPT_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                async move {
-                    match provider.get_transaction_receipt(transaction_hash).await {
-                        Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
-                        Ok(None) => Ok(ControlFlow::Continue(())),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
+            let pending_transaction = provider.send_transaction(transaction).await?;
+            let transaction_hash = pending_transaction.tx_hash();
+
+            let span = tracing::info_span!("Awaiting transaction receipt", ?transaction_hash);
+            let _guard = span.enter();
+
+            // The following is a fix for the "transaction indexing is in progress" error that we
+            // used to get. You can find more information on this in the following GH issue in geth
+            // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on,
+            // before we can get the receipt of the transaction it needs to have been indexed by the
+            // node's indexer. Just because the transaction has been confirmed it doesn't mean that
+            // it has been indexed. When we call alloy's `get_receipt` it checks if the transaction
+            // was confirmed. If it has been, then it will call `eth_getTransactionReceipt` method
+            // which _might_ return the above error if the tx has not yet been indexed yet. So, we
+            // need to implement a retry mechanism for the receipt to keep retrying to get it until
+            // 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.
+            //
+            // At the moment we do not allow for the 60 seconds to be modified and we take it as
+            // being an implementation detail that's invisible to anything outside of this module.
+            //
+            // We allow a total of 60 retries for getting the receipt with one second between each
+            // retry and the next which means that we allow for a total of 60 seconds of waiting
+            // before we consider that we're unable to get the transaction receipt.
+            let mut retries = 0;
+            loop {
+                match provider.get_transaction_receipt(*transaction_hash).await {
+                    Ok(Some(receipt)) => {
+                        tracing::info!("Obtained the transaction receipt");
+                        break Ok(receipt);
+                    }
+                    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("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());
                        }
                    }
                }
-            },
-        )
-        .instrument(tracing::info_span!(
-            "Awaiting transaction receipt",
-            ?transaction_hash
-        ))
-        .await
+            }
+        })?
    }

-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    async fn trace_transaction(
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn trace_transaction(
        &self,
        transaction: &TransactionReceipt,
        trace_options: GethDebugTracingOptions,
    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let provider = Arc::new(self.provider().await?);
-        poll(
-            Self::TRACE_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                let trace_options = trace_options.clone();
-                async move {
-                    match provider
-                        .debug_trace_transaction(transaction.transaction_hash, trace_options)
-                        .await
-                    {
-                        Ok(trace) => Ok(ControlFlow::Break(trace)),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_TRACING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
-                            }
-                        }
-                    }
-                }
-            },
-        )
-        .await
+        let tx_hash = transaction.transaction_hash;
+        let provider = self.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)
-            .await?
+            .trace_transaction(transaction, trace_options)?
            .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> {
-        self.provider()
-            .await?
-            .get_chain_id()
-            .await
-            .map_err(Into::into)
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider.await?.get_chain_id().await.map_err(Into::into)
+        })?
    }

    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_transaction_receipt(*tx_hash)
-            .await?
-            .context("Failed to get the transaction receipt")
-            .map(|receipt| receipt.effective_gas_price)
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+        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_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.gas_limit as _)
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+        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_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.beneficiary)
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+        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_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+        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_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .and_then(|block| {
-                block
-                    .header
-                    .base_fee_per_gas
-                    .context("Failed to get the base fee per gas")
-            })
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+        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 block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.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> {
-        self.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> {
-        self.provider()
-            .await?
-            .get_block_number()
-            .await
-            .map_err(Into::into)
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider.await?.get_block_number().await.map_err(Into::into)
+        })?
    }
 }

-impl Node for GethNode {
-    fn new(config: &Arguments) -> Self {
+impl Node for Instance {
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> Self {
        let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
        let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
        let base_directory = geth_directory.join(id.to_string());

        let mut wallet = config.wallet();
-        for signer in (1..=config.private_keys_to_add)
-            .map(|id| U256::from(id))
-            .map(|id| id.to_be_bytes::<32>())
-            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
-        {
+        for signer in additional_signers {
            wallet.register_signer(signer);
        }

@@ -556,7 +521,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")
@@ -567,6 +532,7 @@ impl Drop for GethNode {
 mod tests {
    use revive_dt_config::Arguments;

+    use alloy::signers::local::PrivateKeySigner;
    use temp_dir::TempDir;

    use crate::{GENESIS_JSON, Node};
@@ -581,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, Vec::<PrivateKeySigner>::with_capacity(0));
        node.init(GENESIS_JSON.to_owned())
            .expect("Failed to initialize the node")
            .spawn_process()
@@ -593,110 +559,112 @@ mod tests {

    #[test]
    fn init_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
            .init(GENESIS_JSON.to_string())
            .unwrap();
    }

    #[test]
    fn spawn_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(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, Vec::<PrivateKeySigner>::with_capacity(0))
+            .version()
+            .unwrap();
        assert!(
            version.starts_with("geth version"),
            "expected version string, got: '{version}'"
        );
    }

-    #[tokio::test]
-    async fn can_get_chain_id_from_node() {
+    #[test]
+    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]
-    async fn can_get_gas_limit_from_node() {
+    #[test]
+    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]
-    async fn can_get_coinbase_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_difficulty_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_hash_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_timestamp_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_number_from_node() {
+    #[test]
+    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");
@@ -13,12 +13,9 @@ use alloy::{
    genesis::{Genesis, GenesisAccount},
    network::{
        Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder,
-        TransactionBuilderError, UnbuiltTransactionError,
-    },
-    primitives::{
-        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes,
-        TxHash, U256,
+        TransactionBuilderError, TxSigner, UnbuiltTransactionError,
    },
+    primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256},
    providers::{
        Provider, ProviderBuilder,
        ext::DebugApi,
@@ -29,11 +26,8 @@ use alloy::{
        eth::{Block, Header, Transaction},
        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
    },
-    signers::local::PrivateKeySigner,
+    signers::Signature,
 };
-use anyhow::Context;
-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;
@@ -41,9 +35,9 @@ 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};
+use crate::{Node, common::FallbackGasFiller};

 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);

@@ -88,9 +82,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)?;

@@ -138,12 +129,10 @@ 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)
-                    .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
+                genesis.alloc.entry(signer_address).or_insert(
+                    GenesisAccount::default()
+                        .with_balance(10000000000000000000000u128.try_into().unwrap()),
+                );
            }
            self.extract_balance_from_genesis_file(&genesis)?
        };
@@ -211,7 +200,7 @@ impl KitchensinkNode {
        if let Err(error) = Self::wait_ready(
            self.kitchensink_stderr_log_file_path().as_path(),
            Self::SUBSTRATE_READY_MARKER,
-            Duration::from_secs(60),
+            Duration::from_secs(30),
        ) {
            tracing::error!(
                ?error,
@@ -240,7 +229,7 @@ impl KitchensinkNode {
        if let Err(error) = Self::wait_ready(
            self.proxy_stderr_log_file_path().as_path(),
            Self::ETH_PROXY_READY_MARKER,
-            Duration::from_secs(60),
+            Duration::from_secs(30),
        ) {
            tracing::error!(?error, "Failed to start proxy, shutting down gracefully");
            self.shutdown()?;
@@ -382,162 +371,150 @@ 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
-            .provider()
-            .await?
-            .send_transaction(transaction)
-            .await?
-            .get_receipt()
-            .await?;
+        let provider = self.provider();
+        let receipt = BlockingExecutor::execute(async move {
+            Ok(provider
+                .await?
+                .send_transaction(transaction)
+                .await?
+                .get_receipt()
+                .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
-            .provider()
-            .await?
-            .debug_trace_transaction(tx_hash, trace_options)
-            .await?)
+        let provider = self.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)
-            .await?
+            .trace_transaction(transaction, trace_options)?
            .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(kitchensink_node_id = self.id))]
-    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        self.provider()
-            .await?
-            .get_chain_id()
-            .await
-            .map_err(Into::into)
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider.await?.get_chain_id().await.map_err(Into::into)
+        })?
    }

-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_transaction_receipt(*tx_hash)
-            .await?
-            .context("Failed to get the transaction receipt")
-            .map(|receipt| receipt.effective_gas_price)
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+        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)
+        })?
    }

-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.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))]
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+        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))]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.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))]
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+        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))]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+        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))]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .and_then(|block| {
-                block
-                    .header
-                    .base_fee_per_gas
-                    .context("Failed to get the base fee per gas")
-            })
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+        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))]
-    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.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))]
-    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.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))]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
-            .await?
-            .get_block_number()
-            .await
-            .map_err(Into::into)
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider.await?.get_block_number().await.map_err(Into::into)
+        })?
    }
 }

 impl Node for KitchensinkNode {
-    fn new(config: &Arguments) -> Self {
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> Self {
        let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY);
        let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
        let base_directory = kitchensink_directory.join(id.to_string());
        let logs_directory = base_directory.join(Self::LOGS_DIRECTORY);

        let mut wallet = config.wallet();
-        for signer in (1..=config.private_keys_to_add)
-            .map(|id| U256::from(id))
-            .map(|id| id.to_be_bytes::<32>())
-            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
-        {
+        for signer in additional_signers {
            wallet.register_signer(signer);
        }

@@ -1053,25 +1030,30 @@ impl BlockHeader for KitchenSinkHeader {

 #[cfg(test)]
 mod tests {
-    use alloy::rpc::types::TransactionRequest;
+    use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner};
    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 {
-        Arguments {
-            kitchensink: PathBuf::from("substrate-node"),
-            eth_proxy: PathBuf::from("eth-rpc"),
-            ..Default::default()
-        }
+    fn test_config() -> (Arguments, TempDir) {
+        let mut config = Arguments::default();
+        let temp_dir = TempDir::new().unwrap();
+
+        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
@@ -1090,20 +1072,20 @@ mod tests {
        static NODE_START_MUTEX: Mutex<()> = Mutex::new(());
        let _guard = NODE_START_MUTEX.lock().unwrap();

-        let args = test_config();
-        let mut node = KitchensinkNode::new(&args);
+        let (args, temp_dir) = test_config();
+        let mut node = KitchensinkNode::new(&args, Vec::<PrivateKeySigner>::with_capacity(0));
        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(|| {
-            let (node, args) = new_node();
-            (node, args)
+        static NODE: LazyLock<(KitchensinkNode, TempDir)> = LazyLock::new(|| {
+            let (node, _, temp_dir) = new_node();
+            (node, temp_dir)
        });
        &NODE.0
    }
@@ -1111,7 +1093,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");

@@ -1146,7 +1128,8 @@ mod tests {
        }
        "#;

-        let mut dummy_node = KitchensinkNode::new(&test_config());
+        let mut dummy_node =
+            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));

        // Call `init()`
        dummy_node.init(genesis_content).expect("init failed");
@@ -1190,7 +1173,8 @@ mod tests {
        }
        "#;

-        let node = KitchensinkNode::new(&test_config());
+        let node =
+            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));

        let result = node
            .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
@@ -1261,18 +1245,17 @@ mod tests {

    #[test]
    fn spawn_works() {
-        let config = test_config();
-
-        let mut node = KitchensinkNode::new(&config);
+        let (config, _temp_dir) = test_config();

+        let mut node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
        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 node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
        let version = node.version().unwrap();

        assert!(
@@ -1283,9 +1266,9 @@ mod tests {

    #[test]
    fn eth_rpc_version_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();

-        let node = KitchensinkNode::new(&config);
+        let node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
        let version = node.eth_rpc_version().unwrap();

        assert!(
@@ -1294,86 +1277,86 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn can_get_chain_id_from_node() {
+    #[test]
+    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]
-    async fn can_get_gas_limit_from_node() {
+    #[test]
+    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]
-    async fn can_get_coinbase_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_difficulty_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_hash_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_timestamp_from_node() {
+    #[test]
+    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]
-    async fn can_get_block_number_from_node() {
+    #[test]
+    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");
@@ -1,10 +1,10 @@
 //! This crate implements the testing nodes.

+use alloy::{network::TxSigner, signers::Signature};
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;

 pub mod common;
-pub mod constants;
 pub mod geth;
 pub mod kitchensink;
 pub mod pool;
@@ -15,7 +15,10 @@ pub const GENESIS_JSON: &str = include_str!("../../../genesis.json");
 /// An abstract interface for testing nodes.
 pub trait Node: EthereumNode {
    /// Create a new uninitialized instance.
-    fn new(config: &Arguments) -> Self;
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> Self;

    /// Spawns a node configured according to the genesis json.
    ///
@@ -6,6 +6,7 @@ use std::{
    thread,
 };

+use alloy::{network::TxSigner, signers::Signature};
 use anyhow::Context;
 use revive_dt_config::Arguments;

@@ -23,8 +24,15 @@ where
    T: Node + Send + 'static,
 {
    /// 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;
+    pub fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+        + Clone
+        + Send
+        + Sync
+        + 'static,
+    ) -> anyhow::Result<Self> {
+        let nodes = config.workers;
        let genesis = read_to_string(&config.genesis_file).context(format!(
            "can not read genesis file: {}",
            config.genesis_file.display()
@@ -34,7 +42,10 @@ where
        for _ in 0..nodes {
            let config = config.clone();
            let genesis = genesis.clone();
-            handles.push(thread::spawn(move || spawn_node::<T>(&config, genesis)));
+            let additional_signers = additional_signers.clone();
+            handles.push(thread::spawn(move || {
+                spawn_node::<T>(&config, additional_signers, genesis)
+            }));
        }

        let mut nodes = Vec::with_capacity(nodes);
@@ -60,8 +71,12 @@ where
    }
 }

-fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Result<T> {
-    let mut node = T::new(args);
+fn spawn_node<T: Node + Send>(
+    args: &Arguments,
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    genesis: String,
+) -> anyhow::Result<T> {
+    let mut node = T::new(args, additional_signers);
    tracing::info!("starting node: {}", node.connection_string());
    node.spawn(genesis)?;
    Ok(node)
@@ -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 }
@@ -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
-                // when we overhaul the reporting.
+                let yul_size = contract
+                    .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);
            }
        }
    }
@@ -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;
                }

@@ -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 }
@@ -6,39 +6,37 @@ use std::{
    io::{BufWriter, Write},
    os::unix::fs::PermissionsExt,
    path::{Path, PathBuf},
-    sync::LazyLock,
+    sync::{LazyLock, Mutex},
 };

-use tokio::sync::Mutex;
-
-use crate::download::SolcDownloader;
+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: &SolcDownloader,
+    downloader: &GHDownloader,
 ) -> anyhow::Result<PathBuf> {
    let target_directory = working_directory
        .join(SOLC_CACHE_DIRECTORY)
        .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: &SolcDownloader) -> 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: &SolcDownloader) -> anyhow::R
    }

    let mut file = BufWriter::new(file);
-    file.write_all(&downloader.download().await?)?;
+    file.write_all(&downloader.download()?)?;
    file.flush()?;
    drop(file);

@@ -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());

@@ -38,91 +36,65 @@ impl List {
    }
 }

-/// Download solc binaries from the official SolidityLang site
+/// Download solc binaries from GitHub releases (IPFS links aren't reliable).
 #[derive(Clone, Debug)]
-pub struct SolcDownloader {
+pub struct GHDownloader {
    pub version: Version,
    pub target: &'static str,
    pub list: &'static str,
 }

-impl SolcDownloader {
-    pub const BASE_URL: &str = "https://binaries.soliditylang.org";
+impl GHDownloader {
+    pub const BASE_URL: &str = "https://github.com/ethereum/solidity/releases/download";

-    pub const LINUX_NAME: &str = "linux-amd64";
-    pub const MACOSX_NAME: &str = "macosx-amd64";
-    pub const WINDOWS_NAME: &str = "windows-amd64";
-    pub const WASM_NAME: &str = "wasm";
+    pub const LINUX_NAME: &str = "solc-static-linux";
+    pub const MACOSX_NAME: &str = "solc-macos";
+    pub const WINDOWS_NAME: &str = "solc-windows.exe";
+    pub const WASM_NAME: &str = "soljson.js";

-    async fn new(
-        version: impl Into<VersionOrRequirement>,
-        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,
-                })
-            }
+    fn new(version: Version, target: &'static str, list: &'static str) -> Self {
+        Self {
+            version,
+            target,
+            list,
        }
    }

-    pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
+    pub fn linux(version: Version) -> Self {
+        Self::new(version, Self::LINUX_NAME, List::LINUX_URL)
    }

-    pub async fn macosx(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL).await
+    pub fn macosx(version: Version) -> Self {
+        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL)
    }

-    pub async fn windows(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL).await
+    pub fn windows(version: Version) -> Self {
+        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL)
    }

-    pub async fn wasm(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::WASM_NAME, List::WASM_URL).await
+    pub fn wasm(version: Version) -> Self {
+        Self::new(version, Self::WASM_NAME, List::WASM_URL)
+    }
+
+    /// Returns the download link.
+    pub fn url(&self) -> String {
+        format!("{}/v{}/{}", Self::BASE_URL, &self.version, &self.target)
    }

    /// Download the solc binary.
    ///
    /// 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 builds = List::download(self.list).await?.builds;
-        let build = builds
+        let expected_digest = List::download(self.list)?
+            .builds
            .iter()
            .find(|build| build.version == self.version)
-            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))?;
+            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
+            .map(|b| b.sha256.strip_prefix("0x").unwrap_or(&b.sha256).to_string())?;

-        let path = build.path.clone();
-        let expected_digest = build
-            .sha256
-            .strip_prefix("0x")
-            .unwrap_or(&build.sha256)
-            .to_string();
-        let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
-
-        let file = reqwest::get(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);
@@ -134,58 +106,29 @@ impl SolcDownloader {

 #[cfg(test)]
 mod tests {
-    use crate::{download::SolcDownloader, list::List};
+    use crate::{download::GHDownloader, list::List};

-    #[tokio::test]
-    async fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL)
-            .await
-            .unwrap()
-            .latest_release;
-        SolcDownloader::windows(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
+    #[test]
+    fn try_get_windows() {
+        let version = List::download(List::WINDOWS_URL).unwrap().latest_release;
+        GHDownloader::windows(version).download().unwrap();
    }

-    #[tokio::test]
-    async fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL)
-            .await
-            .unwrap()
-            .latest_release;
-        SolcDownloader::macosx(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
+    #[test]
+    fn try_get_macosx() {
+        let version = List::download(List::MACOSX_URL).unwrap().latest_release;
+        GHDownloader::macosx(version).download().unwrap();
    }

-    #[tokio::test]
-    async fn try_get_linux() {
-        let version = List::download(List::LINUX_URL)
-            .await
-            .unwrap()
-            .latest_release;
-        SolcDownloader::linux(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
+    #[test]
+    fn try_get_linux() {
+        let version = List::download(List::LINUX_URL).unwrap().latest_release;
+        GHDownloader::linux(version).download().unwrap();
    }

-    #[tokio::test]
-    async fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).await.unwrap().latest_release;
-        SolcDownloader::wasm(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
+    #[test]
+    fn try_get_wasm() {
+        let version = List::download(List::WASM_URL).unwrap().latest_release;
+        GHDownloader::wasm(version).download().unwrap();
    }
 }
@@ -6,9 +6,8 @@
 use std::path::{Path, PathBuf};

 use cache::get_or_download;
-use download::SolcDownloader;
-
-use revive_dt_common::types::VersionOrRequirement;
+use download::GHDownloader;
+use semver::Version;

 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 {
-        SolcDownloader::wasm(version).await
+        GHDownloader::wasm(version)
    } else if cfg!(target_os = "linux") {
-        SolcDownloader::linux(version).await
+        GHDownloader::linux(version)
    } else if cfg!(target_os = "macos") {
-        SolcDownloader::macosx(version).await
+        GHDownloader::macosx(version)
    } else if cfg!(target_os = "windows") {
-        SolcDownloader::windows(version).await
+        GHDownloader::windows(version)
    } else {
        unimplemented!()
-    }?;
+    };

-    get_or_download(cache_directory, &downloader).await
+    get_or_download(cache_directory, &downloader)
 }
@@ -33,5 +33,9 @@
    "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
    "timestamp": "0x00",
-    "alloc": {}
+    "alloc": {
+        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": {
+            "balance": "10000000000000000000000"
+        }
+    }
 }
Author	SHA1	Message	Date
Omar Abdulla	e7ebe4fa2f	Handle values from the metadata files	2025-07-22 09:24:09 +03:00
Omar Abdulla	5c957e5ac1	Add a way to skip tests if they don't match the target	2025-07-22 09:07:01 +03:00
Omar Abdulla	a0248b58f3	Switch to callframe trace for exceptions	2025-07-22 07:22:44 +03:00
Omar Abdulla	6a9acea748	Merge remote-tracking branch 'origin/feature/handle-exceptions' into feature/caller-replacement	2025-07-22 06:47:19 +03:00
Omar Abdulla	c31c7d94f9	Merge remote-tracking branch 'origin/main' into feature/handle-exceptions	2025-07-22 06:43:48 +03:00
Omar Abdulla	dcc43d4ea6	Implement caller replacement	2025-07-21 20:32:14 +03:00
Omar Abdulla	cb13c3c2cd	Wire up address replacement with rest of code	2025-07-21 20:10:28 +03:00
Omar Abdulla	7cda3416f0	Cleanup mutability	2025-07-21 19:47:17 +03:00
Omar Abdulla	d7bc4f1fab	Cleanup implementation	2025-07-21 19:42:44 +03:00
Omar Abdulla	b6db597a57	Add support for address replacement	2025-07-21 18:54:09 +03:00
Omar	d7136d9a3d	Merge pull request #55 from paritytech/feature/better-nonce-handling Improvements and fixes to nonce allocation	2025-07-21 13:43:40 +03:00
Omar Abdulla	e5a3f0aee9	Fix tests	2025-07-21 07:31:10 +03:00
Omar Abdulla	3cdf57f7c3	Cached nonce allocator	2025-07-21 07:19:44 +03:00
Omar Abdulla	dab8ffe520	Add support for exceptions	2025-07-18 21:00:44 +03:00
Omar Abdulla	c913a8222f	Merge branch 'bugfix/function-signature' into feature/handle-exceptions	2025-07-18 17:25:17 +03:00
Omar Abdulla	c8cef4834f	Allow for the use of function signatures	2025-07-18 16:37:15 +03:00
Omar Abdulla	ca59a1f6a9	Handle calldata better	2025-07-18 15:52:40 +03:00
Omar Abdulla	adc0c44cde	Merge remote-tracking branch 'origin/main' into refactor/contract-deployment-and-input-handling	2025-07-18 15:18:27 +03:00
Omar Abdulla	811e17136b	Merge remote-tracking branch 'origin/main' into refactor/contract-deployment-and-input-handling	2025-07-18 15:11:40 +03:00
Omar Abdulla	ba32bad6b3	Fix edge-case in deployment order	2025-07-17 22:26:49 +03:00
Omar Abdulla	bb754cba4f	Correct comment	2025-07-17 18:53:24 +03:00
Omar Abdulla	c858bbe66d	Ignore macro doc comment tests	2025-07-17 18:28:23 +03:00
Omar Abdulla	906878f06a	Fix edge-case in input handling	2025-07-17 18:00:49 +03:00
Omar Abdulla	9a71369e8a	Implement the new input handling logic	2025-07-17 17:46:40 +03:00
Omar Abdulla	84ab873b46	Impl new_from for wrapper types	2025-07-17 15:33:28 +03:00
Omar Abdulla	2ef6f7ba63	Make metadata structs more typed	2025-07-17 15:31:18 +03:00
Omar Abdulla	38e6140a7c	Remove unneeded use of two `HashMap`s	2025-07-17 14:41:48 +03:00
Omar Abdulla	ca6c5529e2	Move `FilesWithExtensionIterator` to `core::common`	2025-07-17 14:32:55 +03:00
Omar Abdulla	038a2db53c	Add support for wrapper types	2025-07-17 14:22:18 +03:00