Support compiler-version aware exceptions

2026-04-22 20:47:58 +00:00 · 2025-07-25 17:06:14 +03:00
46 changed files with 1940 additions and 3183 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",
@@ -2953,17 +2892,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "io-uring"
 version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
 dependencies = [
 "bitflags 2.9.1",
 "cfg-if",
 "libc",
 ]
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -3528,12 +3456,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "path-slash"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -3980,7 +3902,9 @@ dependencies = [
 "base64",
 "bytes",
 "encoding_rs",
 "futures-channel",
 "futures-core",
 "futures-util",
 "h2",
 "http",
 "http-body",
@@ -4029,27 +3953,24 @@ name = "revive-dt-common"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "semver 1.0.26",
+ "futures",
 "once_cell",
 "tokio",
 "tracing",
 ]
 [[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",
 ]
@@ -4071,8 +3992,8 @@ dependencies = [
 "alloy",
 "anyhow",
 "clap",
 "futures",
 "indexmap 2.10.0",
 "rayon",
 "revive-dt-common",
 "revive-dt-compiler",
 "revive-dt-config",
@@ -4080,9 +4001,9 @@ dependencies = [
 "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",
 ]
@@ -4099,7 +4020,6 @@ dependencies = [
 "semver 1.0.26",
 "serde",
 "serde_json",
 "tokio",
 "tracing",
 ]
@@ -4135,9 +4055,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",
@@ -4150,11 +4070,9 @@ dependencies = [
 "anyhow",
 "hex",
 "reqwest",
 "revive-dt-common",
 "semver 1.0.26",
 "serde",
 "sha2 0.10.9",
 "tokio",
 "tracing",
 ]
@@ -4249,9 +4167,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"
@@ -4711,15 +4626,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"
@@ -4764,16 +4670,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"
@@ -5433,21 +5329,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 [[package]]
 name = "tokio"
-version = "1.47.0"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
 "backtrace",
 "bytes",
 "io-uring",
 "libc",
 "mio",
 "pin-project-lite",
- "signal-hook-registry",
+ "socket2",
 "slab",
 "socket2 0.6.0",
 "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@@ -6324,12 +6217,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"
@@ -26,11 +26,11 @@ alloy-primitives = "1.2.1"
 alloy-sol-types = "1.2.1"
 anyhow = "1.0"
 clap = { version = "4", features = ["derive"] }
 foundry-compilers-artifacts = { version = "0.18.0" }
 futures = { version = "0.3.31" }
 hex = "0.4.3"
-reqwest = { version = "0.12.15", features = ["json"] }
+reqwest = { version = "0.12.15", features = ["blocking", "json"] }
 once_cell = "1.21"
 rayon = { version = "1.10" }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = [
@@ -42,10 +42,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"
@@ -8,18 +8,6 @@
        {
            "name": "first",
            "inputs": [
                {
                    "address": "0xdeadbeef00000000000000000000000000000042",
                    "expected_balance": "1233"
                },
                {
                    "address": "0xdeadbeef00000000000000000000000000000042",
                    "is_storage_empty": true
                },
                {
                    "address": "0xdeadbeef00000000000000000000000000000042",
                    "is_storage_empty": false
                },
                {
                    "instance": "WBTC_1",
                    "method": "#deployer",
@@ -10,5 +10,7 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
-semver = { workspace = true }
+futures = { workspace = true }
-tokio = { workspace = true, default-features = false, features = ["time"] }
+tracing = { workspace = true }
 once_cell = { workspace = true }
 tokio = { workspace = true }
@@ -0,0 +1,225 @@
 //! 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_common::concepts::*;
 ///
 /// 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:?}")
            }
        };
        let result = match result {
            Ok(result) => result,
            Err(error) => {
                tracing::error!(?error, "An error occurred when running the async task");
                anyhow::bail!("An error occurred when running the async task: {error:?}")
            }
        };
        Ok(*result
            .downcast::<R>()
            .expect("An error occurred when downcasting into R. This is a bug"))
    }
 }
 /// 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!(
                "If this panic causes, well, a panic, then this is an issue. If it's caught then all good!"
            );
            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)
    }
 }
@@ -0,0 +1,3 @@
 mod blocking_executor;
 pub use blocking_executor::*;
@@ -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,8 +1,4 @@
-use std::{
+use std::{borrow::Cow, collections::HashSet, path::PathBuf};
    borrow::Cow,
    collections::HashSet,
    path::{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(),
        }
    }
@@ -1,8 +1,6 @@
 //! This crate provides common concepts, functionality, types, macros, and more that other crates in
 //! the workspace can benefit from.
-pub mod fs;
+pub mod concepts;
 pub mod futures;
 pub mod iterators;
 pub mod macros;
 pub mod types;
@@ -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)
    }
 }
@@ -10,17 +10,12 @@ rust-version.workspace = true
 [dependencies]
 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,21 @@
 //! - 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 revive_dt_config::Arguments;
 use serde::{Deserialize, Serialize};
 use revive_common::EVMVersion;
-use revive_dt_common::types::VersionOrRequirement;
+use revive_solc_json_interface::{
-use revive_dt_config::Arguments;
+    SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
    SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
    SolcStandardJsonOutput,
 };
 use semver::Version;
 pub mod revive_js;
 pub mod revive_resolc;
@@ -31,44 +32,63 @@ pub trait SolidityCompiler {
    /// The low-level compiler interface.
    fn build(
        &self,
-        input: CompilerInput,
+        input: CompilerInput<Self::Options>,
-        additional_options: Self::Options,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>>;
    ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
    fn new(solc_executable: PathBuf) -> Self;
-    fn get_compiler_executable(
+    fn get_compiler_executable(config: &Arguments, version: Version) -> anyhow::Result<PathBuf>;
        config: &Arguments,
        version: impl Into<VersionOrRequirement>,
    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
    fn version(&self) -> anyhow::Result<Version>;
 }
 /// The generic compilation input configuration.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug)]
-pub struct CompilerInput {
+pub struct CompilerInput<T: PartialEq + Eq + Hash> {
-    pub enable_optimization: Option<bool>,
+    pub extra_options: T,
-    pub via_ir: Option<bool>,
+    pub input: SolcStandardJsonInput,
    pub evm_version: Option<EVMVersion>,
    pub allow_paths: Vec<PathBuf>,
    pub base_path: Option<PathBuf>,
    pub sources: HashMap<PathBuf, String>,
    pub libraries: HashMap<PathBuf, HashMap<String, Address>>,
 }
 /// The generic compilation output configuration.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug)]
-pub struct CompilerOutput {
+pub struct CompilerOutput<T: PartialEq + Eq + Hash> {
-    /// The compiled contracts. The bytecode of the contract is kept as a string incase linking is
+    /// The solc standard JSON input.
-    /// required and the compiled source has placeholders.
+    pub input: CompilerInput<T>,
-    pub contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+    /// The produced solc standard JSON output.
    pub output: SolcStandardJsonOutput,
    /// The error message in case the compiler returns abnormally.
    pub error: Option<String>,
 }
-/// A generic builder style interface for configuring the supported compiler options.
+impl<T> PartialEq for CompilerInput<T>
 where
    T: PartialEq + Eq + Hash,
 {
    fn eq(&self, other: &Self) -> bool {
        let self_input = serde_json::to_vec(&self.input).unwrap_or_default();
        let other_input = serde_json::to_vec(&self.input).unwrap_or_default();
        self.extra_options.eq(&other.extra_options) && self_input == other_input
    }
 }
 impl<T> Eq for CompilerInput<T> where T: PartialEq + Eq + Hash {}
 impl<T> Hash for CompilerInput<T>
 where
    T: PartialEq + Eq + Hash,
 {
    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
        self.extra_options.hash(state);
        state.write(&serde_json::to_vec(&self.input).unwrap_or_default());
    }
 }
 /// A generic builder style interface for configuring all compiler options.
 pub struct Compiler<T: SolidityCompiler> {
-    input: CompilerInput,
+    input: SolcStandardJsonInput,
-    additional_options: T::Options,
+    extra_options: T::Options,
    allow_paths: Vec<PathBuf>,
    base_path: Option<PathBuf>,
 }
 impl Default for Compiler<solc::Solc> {
@@ -83,80 +103,93 @@ where
 {
    pub fn new() -> Self {
        Self {
-            input: CompilerInput {
+            input: SolcStandardJsonInput {
-                enable_optimization: Default::default(),
+                language: SolcStandardJsonInputLanguage::Solidity,
                via_ir: Default::default(),
                evm_version: Default::default(),
                allow_paths: Default::default(),
                base_path: Default::default(),
                sources: Default::default(),
-                libraries: Default::default(),
+                settings: SolcStandardJsonInputSettings::new(
                    None,
                    Default::default(),
                    None,
                    SolcStandardJsonInputSettingsSelection::new_required(),
                    SolcStandardJsonInputSettingsOptimizer::new(
                        false,
                        None,
                        &Version::new(0, 0, 0),
                        false,
                    ),
                    None,
                    None,
                ),
            },
-            additional_options: T::Options::default(),
+            extra_options: Default::default(),
            allow_paths: Default::default(),
            base_path: None,
        }
    }
-    pub fn with_optimization(mut self, value: impl Into<Option<bool>>) -> Self {
+    pub fn solc_optimizer(mut self, enabled: bool) -> Self {
-        self.input.enable_optimization = value.into();
+        self.input.settings.optimizer.enabled = enabled;
        self
    }
-    pub fn with_via_ir(mut self, value: impl Into<Option<bool>>) -> Self {
+    pub fn with_source(mut self, path: &Path) -> anyhow::Result<Self> {
        self.input.via_ir = value.into();
        self
    }
    pub fn with_evm_version(mut self, version: impl Into<Option<EVMVersion>>) -> Self {
        self.input.evm_version = version.into();
        self
    }
    pub fn with_allow_path(mut self, path: impl AsRef<Path>) -> Self {
        self.input.allow_paths.push(path.as_ref().into());
        self
    }
    pub fn with_base_path(mut self, path: impl Into<Option<PathBuf>>) -> Self {
        self.input.base_path = path.into();
        self
    }
    pub fn with_source(mut self, path: impl AsRef<Path>) -> anyhow::Result<Self> {
        self.input
            .sources
-            .insert(path.as_ref().to_path_buf(), read_to_string(path.as_ref())?);
+            .insert(path.display().to_string(), read_to_string(path)?.into());
        Ok(self)
    }
    pub fn evm_version(mut self, evm_version: EVMVersion) -> Self {
        self.input.settings.evm_version = Some(evm_version);
        self
    }
    pub fn extra_options(mut self, extra_options: T::Options) -> Self {
        self.extra_options = extra_options;
        self
    }
    pub fn allow_path(mut self, path: PathBuf) -> Self {
        self.allow_paths.push(path);
        self
    }
    pub fn base_path(mut self, base_path: PathBuf) -> Self {
        self.base_path = Some(base_path);
        self
    }
    pub fn with_library(
        mut self,
-        path: impl AsRef<Path>,
+        scope: impl AsRef<Path>,
-        name: impl AsRef<str>,
+        library_ident: impl AsRef<str>,
-        address: Address,
+        library_address: Address,
    ) -> Self {
        self.input
            .settings
            .libraries
-            .entry(path.as_ref().to_path_buf())
+            .get_or_insert_with(Default::default)
            .entry(scope.as_ref().display().to_string())
            .or_default()
-            .insert(name.as_ref().into(), address);
+            .insert(
                library_ident.as_ref().to_owned(),
                library_address.to_string(),
            );
        self
    }
-    pub fn with_additional_options(mut self, options: impl Into<T::Options>) -> Self {
+    pub fn try_build(self, solc_path: PathBuf) -> anyhow::Result<CompilerOutput<T::Options>> {
-        self.additional_options = options.into();
+        T::new(solc_path).build(CompilerInput {
-        self
+            extra_options: self.extra_options,
            input: self.input,
            allow_paths: self.allow_paths,
            base_path: self.base_path,
        })
    }
-    pub async fn try_build(
+    /// Returns the compiler JSON input.
-        self,
+    pub fn input(&self) -> SolcStandardJsonInput {
        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 input(&self) -> CompilerInput {
        self.input.clone()
    }
 }
@@ -6,20 +6,9 @@ use std::{
    process::{Command, Stdio},
 };
 use revive_dt_common::types::VersionOrRequirement;
 use revive_dt_config::Arguments;
 use revive_solc_json_interface::{
    SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
    SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
    SolcStandardJsonOutput,
 };
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
-
+use revive_dt_config::Arguments;
-use alloy::json_abi::JsonAbi;
+use revive_solc_json_interface::SolcStandardJsonOutput;
 use anyhow::Context;
 use semver::Version;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 // TODO: I believe that we need to also pass the solc compiler to resolc so that resolc uses the
 // specified solc compiler. I believe that currently we completely ignore the specified solc binary
@@ -36,71 +25,24 @@ impl SolidityCompiler for Resolc {
    type Options = Vec<String>;
    #[tracing::instrument(level = "debug", ret)]
-    async fn build(
+    fn build(
        &self,
-        CompilerInput {
+        input: CompilerInput<Self::Options>,
-            enable_optimization,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-            // Ignored and not honored since this is required for the resolc compilation.
+        let mut command = Command::new(&self.resolc_path);
            via_ir: _via_ir,
            evm_version,
            allow_paths,
            base_path,
            sources,
            libraries,
        }: CompilerInput,
        additional_options: Self::Options,
    ) -> anyhow::Result<CompilerOutput> {
        let input = SolcStandardJsonInput {
            language: SolcStandardJsonInputLanguage::Solidity,
            sources: sources
                .into_iter()
                .map(|(path, source)| (path.display().to_string(), source.into()))
                .collect(),
            settings: SolcStandardJsonInputSettings {
                evm_version,
                libraries: Some(
                    libraries
                        .into_iter()
                        .map(|(source_code, libraries_map)| {
                            (
                                source_code.display().to_string(),
                                libraries_map
                                    .into_iter()
                                    .map(|(library_ident, library_address)| {
                                        (library_ident, library_address.to_string())
                                    })
                                    .collect(),
                            )
                        })
                        .collect(),
                ),
                remappings: None,
                output_selection: Some(SolcStandardJsonInputSettingsSelection::new_required()),
                via_ir: Some(true),
                optimizer: SolcStandardJsonInputSettingsOptimizer::new(
                    enable_optimization.unwrap_or(false),
                    None,
                    &Version::new(0, 0, 0),
                    false,
                ),
                metadata: None,
                polkavm: None,
            },
        };
        let mut command = AsyncCommand::new(&self.resolc_path);
        command
            .stdin(Stdio::piped())
            .stdout(Stdio::piped())
            .stderr(Stdio::piped())
            .arg("--standard-json");
-        if let Some(ref base_path) = base_path {
+        if let Some(ref base_path) = input.base_path {
            command.arg("--base-path").arg(base_path);
        }
-        if !allow_paths.is_empty() {
+        if !input.allow_paths.is_empty() {
            command.arg("--allow-paths").arg(
-                allow_paths
+                input
                    .allow_paths
                    .iter()
                    .map(|path| path.display().to_string())
                    .collect::<Vec<_>>()
@@ -110,96 +52,102 @@ impl SolidityCompiler for Resolc {
        let mut child = command.spawn()?;
        let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
-        let serialized_input = serde_json::to_vec(&input)?;
+        serde_json::to_writer(stdin_pipe, &input.input)?;
        stdin_pipe.write_all(&serialized_input).await?;
-        let output = child.wait_with_output().await?;
+        let json_in = serde_json::to_string_pretty(&input.input)?;
        let output = child.wait_with_output()?;
        let stdout = output.stdout;
        let stderr = output.stderr;
        if !output.status.success() {
            let json_in = serde_json::to_string_pretty(&input)?;
            let message = String::from_utf8_lossy(&stderr);
            tracing::error!(
-                status = %output.status,
+                "resolc failed exit={} stderr={} JSON-in={} ",
-                message = %message,
+                output.status,
-                json_input = json_in,
+                &message,
-                "Compilation using resolc failed"
+                json_in,
            );
-            anyhow::bail!("Compilation failed with an error: {message}");
+            return Ok(CompilerOutput {
                input,
                output: Default::default(),
                error: Some(message.into()),
            });
        }
-        let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
+        let mut parsed =
            serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
                anyhow::anyhow!(
                    "failed to parse resolc JSON output: {e}\nstderr: {}",
                    String::from_utf8_lossy(&stderr)
                )
            })?;
        // Detecting if the compiler output contained errors and reporting them through logs and
        // errors instead of returning the compiler output that might contain errors.
        for error in parsed.errors.iter().flatten() {
            if error.severity == "error" {
                tracing::error!(?error, ?input, "Encountered an error in the compilation");
                anyhow::bail!("Encountered an error in the compilation: {error}")
            }
        }
        // We need to do some post processing on the output to make it in the same format that solc
        // outputs. More specifically, for each contract, the `.metadata` field should be replaced
        // with the `.metadata.solc_metadata` field which contains the ABI and other information
        // about the compiled contracts. We do this because we do not want any downstream logic to
        // need to differentiate between which compiler is being used when extracting the ABI of the
        // contracts.
        if let Some(ref mut contracts) = parsed.contracts {
            for (contract_path, contracts_map) in contracts.iter_mut() {
                for (contract_name, contract_info) in contracts_map.iter_mut() {
                    let Some(metadata) = contract_info.metadata.take() else {
                        continue;
                    };
                    // Get the `solc_metadata` in the metadata of the contract.
                    let Some(solc_metadata) = metadata
                        .get("solc_metadata")
                        .and_then(|metadata| metadata.as_str())
                    else {
                        tracing::error!(
                            contract_path,
                            contract_name,
                            metadata = serde_json::to_string(&metadata).unwrap(),
                            "Encountered a contract compiled with resolc that has no solc_metadata"
                        );
                        anyhow::bail!(
                            "Contract {} compiled with resolc that has no solc_metadata",
                            contract_name
                        );
                    };
                    // Replace the original metadata with the new solc_metadata.
                    contract_info.metadata =
                        Some(serde_json::Value::String(solc_metadata.to_string()));
                }
            }
        }
        tracing::debug!(
            output = %serde_json::to_string(&parsed).unwrap(),
            "Compiled successfully"
        );
-        // Detecting if the compiler output contained errors and reporting them through logs and
+        Ok(CompilerOutput {
-        // errors instead of returning the compiler output that might contain errors.
+            input,
-        for error in parsed.errors.iter().flatten() {
+            output: parsed,
-            if error.severity == "error" {
+            error: None,
                tracing::error!(
                    ?error,
                    ?input,
                    output = %serde_json::to_string(&parsed).unwrap(),
                    "Encountered an error in the compilation"
                );
                anyhow::bail!("Encountered an error in the compilation: {error}")
            }
        }
        let Some(contracts) = parsed.contracts else {
            anyhow::bail!("Unexpected error - resolc output doesn't have a contracts section");
        };
        let mut compiler_output = CompilerOutput::default();
        for (source_path, contracts) in contracts.into_iter() {
            let source_path = PathBuf::from(source_path).canonicalize()?;
            let map = compiler_output.contracts.entry(source_path).or_default();
            for (contract_name, contract_information) in contracts.into_iter() {
                let bytecode = contract_information
                    .evm
                    .and_then(|evm| evm.bytecode.clone())
                    .context("Unexpected - Contract compiled with resolc has no bytecode")?;
                let abi = contract_information
                    .metadata
                    .as_ref()
                    .and_then(|metadata| metadata.as_object())
                    .and_then(|metadata| metadata.get("solc_metadata"))
                    .and_then(|solc_metadata| solc_metadata.as_str())
                    .and_then(|metadata| serde_json::from_str::<serde_json::Value>(metadata).ok())
                    .and_then(|metadata| {
                        metadata.get("output").and_then(|output| {
                            output
                                .get("abi")
                                .and_then(|abi| serde_json::from_value::<JsonAbi>(abi.clone()).ok())
        })
                    })
                    .context(
                        "Unexpected - Failed to get the ABI for a contract compiled with resolc",
                    )?;
                map.insert(contract_name, (bytecode.object, abi));
            }
        }
        Ok(compiler_output)
    }
    fn new(resolc_path: PathBuf) -> Self {
        Resolc { resolc_path }
    }
-    async fn get_compiler_executable(
+    fn get_compiler_executable(
        config: &Arguments,
-        _version: impl Into<VersionOrRequirement>,
+        _version: semver::Version,
    ) -> anyhow::Result<PathBuf> {
        if !config.resolc.as_os_str().is_empty() {
            return Ok(config.resolc.clone());
@@ -207,47 +155,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 revive_solc_json_interface::SolcStandardJsonOutput;
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
 use anyhow::Context;
 use foundry_compilers_artifacts::{
    output_selection::{
        BytecodeOutputSelection, ContractOutputSelection, EvmOutputSelection, OutputSelection,
    },
    solc::CompilerOutput as SolcOutput,
    solc::*,
 };
 use semver::Version;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 #[derive(Debug)]
 pub struct Solc {
@@ -32,78 +20,24 @@ impl SolidityCompiler for Solc {
    type Options = ();
    #[tracing::instrument(level = "debug", ret)]
-    async fn build(
+    fn build(
        &self,
-        CompilerInput {
+        input: CompilerInput<Self::Options>,
-            enable_optimization,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-            via_ir,
+        let mut command = Command::new(&self.solc_path);
            evm_version,
            allow_paths,
            base_path,
            sources,
            libraries,
        }: CompilerInput,
        _: Self::Options,
    ) -> anyhow::Result<CompilerOutput> {
        let input = SolcInput {
            language: SolcLanguage::Solidity,
            sources: Sources(
                sources
                    .into_iter()
                    .map(|(source_path, source_code)| (source_path, Source::new(source_code)))
                    .collect(),
            ),
            settings: Settings {
                optimizer: Optimizer {
                    enabled: enable_optimization,
                    details: Some(Default::default()),
                    ..Default::default()
                },
                output_selection: OutputSelection::common_output_selection(
                    [
                        ContractOutputSelection::Abi,
                        ContractOutputSelection::Evm(EvmOutputSelection::ByteCode(
                            BytecodeOutputSelection::Object,
                        )),
                    ]
                    .into_iter()
                    .map(|item| item.to_string()),
                ),
                evm_version: evm_version.map(|version| version.to_string().parse().unwrap()),
                via_ir,
                libraries: Libraries {
                    libs: libraries
                        .into_iter()
                        .map(|(file_path, libraries)| {
                            (
                                file_path,
                                libraries
                                    .into_iter()
                                    .map(|(library_name, library_address)| {
                                        (library_name, library_address.to_string())
                                    })
                                    .collect(),
                            )
                        })
                        .collect(),
                },
                ..Default::default()
            },
        };
        let mut command = AsyncCommand::new(&self.solc_path);
        command
            .stdin(Stdio::piped())
            .stdout(Stdio::piped())
            .stderr(Stdio::piped())
            .arg("--standard-json");
-        if let Some(ref base_path) = base_path {
+        if let Some(ref base_path) = input.base_path {
            command.arg("--base-path").arg(base_path);
        }
-        if !allow_paths.is_empty() {
+        if !input.allow_paths.is_empty() {
            command.arg("--allow-paths").arg(
-                allow_paths
+                input
                    .allow_paths
                    .iter()
                    .map(|path| path.display().to_string())
                    .collect::<Vec<_>>()
@@ -113,23 +47,21 @@ impl SolidityCompiler for Solc {
        let mut child = command.spawn()?;
        let stdin = child.stdin.as_mut().expect("should be piped");
-        let serialized_input = serde_json::to_vec(&input)?;
+        serde_json::to_writer(stdin, &input.input)?;
-        stdin.write_all(&serialized_input).await?;
+        let output = child.wait_with_output()?;
        let output = child.wait_with_output().await?;
        if !output.status.success() {
            let json_in = serde_json::to_string_pretty(&input)?;
            let message = String::from_utf8_lossy(&output.stderr);
-            tracing::error!(
+            tracing::error!("solc failed exit={} stderr={}", output.status, &message);
-                status = %output.status,
+            return Ok(CompilerOutput {
-                message = %message,
+                input,
-                json_input = json_in,
+                output: Default::default(),
-                "Compilation using solc failed"
+                error: Some(message.into()),
-            );
+            });
            anyhow::bail!("Compilation failed with an error: {message}");
        }
-        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout).map_err(|e| {
+        let parsed =
            serde_json::from_slice::<SolcStandardJsonOutput>(&output.stdout).map_err(|e| {
                anyhow::anyhow!(
                    "failed to parse resolc JSON output: {e}\nstderr: {}",
                    String::from_utf8_lossy(&output.stdout)
@@ -138,8 +70,8 @@ impl SolidityCompiler for Solc {
        // Detecting if the compiler output contained errors and reporting them through logs and
        // errors instead of returning the compiler output that might contain errors.
-        for error in parsed.errors.iter() {
+        for error in parsed.errors.iter().flatten() {
-            if error.severity == Severity::Error {
+            if error.severity == "error" {
                tracing::error!(?error, ?input, "Encountered an error in the compilation");
                anyhow::bail!("Encountered an error in the compilation: {error}")
            }
@@ -150,113 +82,22 @@ impl SolidityCompiler for Solc {
            "Compiled successfully"
        );
-        let mut compiler_output = CompilerOutput::default();
+        Ok(CompilerOutput {
-        for (contract_path, contracts) in parsed.contracts {
+            input,
-            let map = compiler_output
+            output: parsed,
-                .contracts
+            error: None,
                .entry(contract_path.canonicalize()?)
                .or_default();
            for (contract_name, contract_info) in contracts.into_iter() {
                let source_code = contract_info
                    .evm
                    .and_then(|evm| evm.bytecode)
                    .map(|bytecode| match bytecode.object {
                        BytecodeObject::Bytecode(bytecode) => bytecode.to_string(),
                        BytecodeObject::Unlinked(unlinked) => unlinked,
        })
                    .context("Unexpected - contract compiled with solc has no source code")?;
                let abi = contract_info
                    .abi
                    .context("Unexpected - contract compiled with solc as no ABI")?;
                map.insert(contract_name, (source_code, abi));
            }
        }
        Ok(compiler_output)
    }
    fn new(solc_path: PathBuf) -> Self {
        Self { solc_path }
    }
-    async fn get_compiler_executable(
+    fn get_compiler_executable(
        config: &Arguments,
-        version: impl Into<VersionOrRequirement>,
+        version: semver::Version,
    ) -> anyhow::Result<PathBuf> {
-        let path = download_solc(config.directory(), version, config.wasm).await?;
+        let path = download_solc(config.directory(), version, config.wasm)?;
        Ok(path)
    }
    fn version(&self) -> anyhow::Result<semver::Version> {
        // The following is the parsing code for the version from the solc version strings which
        // look like the following:
        // ```
        // solc, the solidity compiler commandline interface
        // Version: 0.8.30+commit.73712a01.Darwin.appleclang
        // ```
        let child = Command::new(self.solc_path.as_path())
            .arg("--version")
            .stdout(Stdio::piped())
            .spawn()?;
        let output = child.wait_with_output()?;
        let output = String::from_utf8_lossy(&output.stdout);
        let version_line = output
            .split("Version: ")
            .nth(1)
            .context("Version parsing failed")?;
        let version_string = version_line
            .split("+")
            .next()
            .context("Version parsing failed")?;
        Version::parse(version_string).map_err(Into::into)
    }
 }
 #[cfg(test)]
 mod test {
    use super::*;
    #[tokio::test]
    async fn compiler_version_can_be_obtained() {
        // Arrange
        let args = Arguments::default();
        println!("Getting compiler path");
        let path = Solc::get_compiler_executable(&args, Version::new(0, 7, 6))
            .await
            .unwrap();
        println!("Got compiler path");
        let compiler = Solc::new(path);
        // Act
        let version = compiler.version();
        // Assert
        assert_eq!(
            version.expect("Failed to get version"),
            Version::new(0, 7, 6)
        )
    }
    #[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.
@@ -77,7 +76,7 @@ pub struct Arguments {
    /// This argument controls which private keys the nodes should have access to and be added to
    /// its wallet signers. With a value of N, private keys (0, N] will be added to the signer set
    /// of the node.
-    #[arg(long = "private-keys-count", default_value_t = 100_000)]
+    #[arg(long = "private-keys-count", default_value_t = 30)]
    pub private_keys_to_add: usize,
    /// The differential testing leader node implementation.
@@ -92,13 +91,9 @@ pub struct Arguments {
    #[arg(long = "compile-only")]
    pub compile_only: Option<TestingPlatform>,
-    /// Determines the amount of nodes that will be spawned for each chain.
+    /// Determines the amount of tests that are executed in parallel.
-    #[arg(long, default_value = "1")]
+    #[arg(long = "workers", default_value = "12")]
-    pub number_of_nodes: usize,
+    pub workers: usize,
    /// Determines the amount of threads that will will be used.
    #[arg(long, default_value = "12")]
    pub number_of_threads: usize,
    /// Extract problems back to the test corpus.
    #[arg(short, long = "extract-problems")]
@@ -149,23 +144,14 @@ impl Arguments {
 impl Default for Arguments {
    fn default() -> Self {
-        static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
+        Arguments::parse_from(["retester"])
        let default = Arguments::parse_from(["retester"]);
        Arguments {
            temp_dir: Some(&TEMP_DIR),
            ..default
        }
    }
 }
 /// The Solidity compatible node implementation.
 ///
 /// This describes the solutions to be tested against on a high level.
-#[derive(
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Serialize, Deserialize)]
    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, ValueEnum, Serialize, Deserialize,
 )]
 #[clap(rename_all = "lower")]
 pub enum TestingPlatform {
    /// The go-ethereum reference full node EVM implementation.
@@ -24,10 +24,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 }
@@ -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,37 @@
-use std::{
+use std::{collections::HashMap, sync::LazyLock};
    collections::HashMap,
    path::Path,
    sync::{Arc, LazyLock},
    time::Instant,
 };
 use alloy::{
    json_abi::JsonAbi,
    network::{Ethereum, TransactionBuilder},
    primitives::Address,
    rpc::types::TransactionRequest,
 };
 use anyhow::Context;
 use clap::Parser;
-use futures::StreamExt;
+use rayon::{ThreadPoolBuilder, prelude::*};
 use revive_dt_common::iterators::FilesWithExtensionIterator;
 use revive_dt_node_interaction::EthereumNode;
 use semver::Version;
 use temp_dir::TempDir;
 use tokio::sync::{Mutex, RwLock};
 use tracing::{Instrument, Level};
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 use revive_dt_compiler::SolidityCompiler;
 use revive_dt_compiler::{Compiler, CompilerOutput};
 use revive_dt_config::*;
 use revive_dt_core::{
    Geth, Kitchensink, Platform,
-    driver::{CaseDriver, CaseState},
+    driver::{Driver, State},
 };
 use revive_dt_format::{
    case::{Case, CaseIdx},
    corpus::Corpus,
    input::{Input, Step},
    metadata::{ContractInstance, ContractPathAndIdent, Metadata, MetadataFile},
    mode::SolcMode,
 };
 use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
 use tracing::Level;
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 type CompilationCache<'a> = Arc<
    RwLock<
        HashMap<
            (&'a Path, SolcMode, TestingPlatform),
            Arc<Mutex<Option<Arc<(Version, CompilerOutput)>>>>,
        >,
    >,
 >;
 fn main() -> anyhow::Result<()> {
    let args = init_cli()?;
    let body = async {
    for (corpus, tests) in collect_corpora(&args)? {
        let span = Span::new(corpus, args.clone())?;
        match &args.compile_only {
-                Some(platform) => compile_corpus(&args, &tests, platform, span).await,
+            Some(platform) => compile_corpus(&args, &tests, platform, span),
-                None => execute_corpus(&args, &tests, span).await?,
+            None => execute_corpus(&args, &tests, span)?,
        }
        Report::save()?;
    }
        Ok(())
    };
-    tokio::runtime::Builder::new_multi_thread()
+    Ok(())
        .worker_threads(args.number_of_threads)
        .enable_all()
        .build()
        .expect("Failed building the Runtime")
        .block_on(body)
 }
 fn init_cli() -> anyhow::Result<Arguments> {
@@ -101,6 +62,10 @@ fn init_cli() -> anyhow::Result<Arguments> {
    }
    tracing::info!("workdir: {}", args.directory().display());
    ThreadPoolBuilder::new()
        .num_threads(args.workers)
        .build_global()?;
    Ok(args)
 }
@@ -118,11 +83,7 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metad
    Ok(corpora)
 }
-async fn run_driver<L, F>(
+fn run_driver<L, F>(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()>
    args: &Arguments,
    tests: &[MetadataFile],
    span: Span,
 ) -> anyhow::Result<()>
 where
    L: Platform,
    F: Platform,
@@ -132,579 +93,61 @@ where
    let leader_nodes = NodePool::<L::Blockchain>::new(args)?;
    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
-    let test_cases = tests
+    tests.par_iter().for_each(
        .iter()
        .flat_map(
        |MetadataFile {
                 path,
             content: metadata,
             path: metadata_file_path,
         }| {
-                metadata
+            // Starting a new tracing span for this metadata file. This allows our logs to be clear
-                    .cases
+            // about which metadata file the logs belong to. We can add other information into this
-                    .iter()
+            // as well to be able to associate the logs with the correct metadata file and case
-                    .enumerate()
+            // that's being executed.
                    .flat_map(move |(case_idx, case)| {
                        metadata
                            .solc_modes()
                            .into_iter()
                            .map(move |solc_mode| (path, metadata, case_idx, case, solc_mode))
                    })
            },
        )
        .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();
            let tracing_span = tracing::span!(
                Level::INFO,
                "Running driver",
-                metadata_file_path = %metadata_file_path.display(),
+                metadata_file_path = metadata_file_path.display().to_string(),
                case_idx = case_idx,
                solc_mode = ?solc_mode,
            );
-            let metadata_case_status = metadata_case_status.clone();
+            let _guard = tracing_span.enter();
-            async move {
+
-                let result = handle_case_driver::<L, F>(
+            let mut driver = Driver::<L, F>::new(
                    metadata_file_path.as_path(),
                metadata,
                    case_idx.into(),
                    case,
                    solc_mode.clone(),
                args,
-                    compilation_cache.clone(),
+                leader_nodes.round_robbin(),
-                    leader_node,
+                follower_nodes.round_robbin(),
                    follower_node,
                    span,
                )
                .await;
                let mut metadata_case_status = metadata_case_status.write().await;
                match result {
                    Ok(inputs_executed) => {
                        tracing::info!(inputs_executed, "Execution succeeded");
                        metadata_case_status
                            .entry((metadata_file_path.clone(), solc_mode))
                            .or_default()
                            .insert((CaseIdx::new(case_idx), case.name.clone()), Some(true));
                    }
                    Err(error) => {
                        metadata_case_status
                            .entry((metadata_file_path.clone(), solc_mode))
                            .or_default()
                            .insert((CaseIdx::new(case_idx), case.name.clone()), Some(false));
                        tracing::error!(%error, "Execution failed")
                    }
                }
                tracing::info!("Execution completed");
            }
            .instrument(tracing_span)
        },
            );
-    tokio::join!(status_reporter_task, driver_task);
+            let execution_result = driver.execute(span);
            tracing::info!(
                case_success_count = execution_result.successful_cases_count,
                case_failure_count = execution_result.failed_cases_count,
                "Execution completed"
            );
            let mut error_count = 0;
            for result in execution_result.results.iter() {
                if !result.is_success() {
                    tracing::error!(execution_error = ?result, "Encountered an error");
                    error_count += 1;
                }
            }
            if error_count == 0 {
                tracing::info!("Execution succeeded");
            } else {
                tracing::info!("Execution failed");
            }
        },
    );
    Ok(())
 }
-#[allow(clippy::too_many_arguments)]
+fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> {
 async fn handle_case_driver<'a, L, F>(
    metadata_file_path: &'a Path,
    metadata: &'a Metadata,
    case_idx: CaseIdx,
    case: &Case,
    mode: SolcMode,
    config: &Arguments,
    compilation_cache: CompilationCache<'a>,
    leader_node: &L::Blockchain,
    follower_node: &F::Blockchain,
    _: Span,
 ) -> anyhow::Result<usize>
 where
    L: Platform,
    F: Platform,
    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
    let leader_pre_link_contracts = get_or_build_contracts::<L>(
        metadata,
        metadata_file_path,
        mode.clone(),
        config,
        compilation_cache.clone(),
        &HashMap::new(),
    )
    .await?;
    let follower_pre_link_contracts = get_or_build_contracts::<F>(
        metadata,
        metadata_file_path,
        mode.clone(),
        config,
        compilation_cache.clone(),
        &HashMap::new(),
    )
    .await?;
    let mut leader_deployed_libraries = HashMap::new();
    let mut follower_deployed_libraries = HashMap::new();
    let mut contract_sources = metadata.contract_sources()?;
    for library_instance in metadata
        .libraries
        .iter()
        .flatten()
        .flat_map(|(_, map)| map.values())
    {
        let ContractPathAndIdent {
            contract_source_path: library_source_path,
            contract_ident: library_ident,
        } = contract_sources
            .remove(library_instance)
            .context("Failed to find the contract source")?;
        let (leader_code, leader_abi) = leader_pre_link_contracts
            .1
            .contracts
            .get(&library_source_path)
            .and_then(|contracts| contracts.get(library_ident.as_str()))
            .context("Declared library was not compiled")?;
        let (follower_code, follower_abi) = follower_pre_link_contracts
            .1
            .contracts
            .get(&library_source_path)
            .and_then(|contracts| contracts.get(library_ident.as_str()))
            .context("Declared library was not compiled")?;
        let leader_code = match alloy::hex::decode(leader_code) {
            Ok(code) => code,
            Err(error) => {
                tracing::error!(
                    ?error,
                    contract_source_path = library_source_path.display().to_string(),
                    contract_ident = library_ident.as_ref(),
                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
                );
                anyhow::bail!("Failed to hex-decode the byte code {}", error)
            }
        };
        let follower_code = match alloy::hex::decode(follower_code) {
            Ok(code) => code,
            Err(error) => {
                tracing::error!(
                    ?error,
                    contract_source_path = library_source_path.display().to_string(),
                    contract_ident = library_ident.as_ref(),
                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
                );
                anyhow::bail!("Failed to hex-decode the byte code {}", error)
            }
        };
        // Getting the deployer address from the cases themselves. This is to ensure that we're
        // doing the deployments from different accounts and therefore we're not slowed down by
        // the nonce.
        let deployer_address = case
            .steps
            .iter()
            .filter_map(|step| match step {
                Step::FunctionCall(input) => Some(input.caller),
                Step::BalanceAssertion(..) => None,
                Step::StorageEmptyAssertion(..) => None,
            })
            .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(
    args: &Arguments,
    tests: &[MetadataFile],
    span: Span,
 ) -> anyhow::Result<()> {
    match (&args.leader, &args.follower) {
        (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, span).await?
+            run_driver::<Geth, Kitchensink>(args, tests, span)?
        }
        (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span).await?
+            run_driver::<Geth, Geth>(args, tests, span)?
        }
        _ => unimplemented!(),
    }
@@ -712,43 +155,24 @@ async fn execute_corpus(
    Ok(())
 }
-async fn compile_corpus(
+fn compile_corpus(
    config: &Arguments,
    tests: &[MetadataFile],
    platform: &TestingPlatform,
-    _: Span,
+    span: Span,
 ) {
-    let tests = tests.iter().flat_map(|metadata| {
+    tests.par_iter().for_each(|metadata| {
-        metadata
+        for mode in &metadata.solc_modes() {
            .solc_modes()
            .into_iter()
            .map(move |solc_mode| (metadata, solc_mode))
    });
    futures::stream::iter(tests)
        .for_each_concurrent(None, |(metadata, mode)| async move {
            match platform {
                TestingPlatform::Geth => {
-                    let _ = compile_contracts::<Geth>(
+                    let mut state = State::<Geth>::new(config, span);
-                        &metadata.content,
+                    let _ = state.build_contracts(mode, metadata);
                        &metadata.path,
                        &mode,
                        config,
                        &Default::default(),
                    )
                    .await;
                }
                TestingPlatform::Kitchensink => {
-                    let _ = compile_contracts::<Geth>(
+                    let mut state = State::<Kitchensink>::new(config, span);
-                        &metadata.content,
+                    let _ = state.build_contracts(mode, metadata);
                        &metadata.path,
                        &mode,
                        config,
                        &Default::default(),
                    )
                    .await;
                }
            };
        }
-        })
+    });
        .await;
 }
@@ -19,6 +19,3 @@ tracing = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 [dev-dependencies]
 tokio = { workspace = true }
@@ -1,38 +1,31 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use revive_dt_common::macros::define_wrapper_type;
 use crate::{
-    input::{Expected, Step},
+    input::{Expected, Input},
    mode::Mode,
 };
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Case {
    pub name: Option<String>,
    pub comment: Option<String>,
    pub modes: Option<Vec<Mode>>,
-    #[serde(rename = "inputs")]
+    pub inputs: Vec<Input>,
    pub steps: Vec<Step>,
    pub group: Option<String>,
    pub expected: Option<Expected>,
    pub ignore: Option<bool>,
 }
 impl Case {
-    #[allow(irrefutable_let_patterns)]
+    pub fn inputs_iterator(&self) -> impl Iterator<Item = Input> {
-    pub fn steps_iterator(&self) -> impl Iterator<Item = Step> {
+        let inputs_len = self.inputs.len();
-        let steps_len = self.steps.len();
+        self.inputs
        self.steps
            .clone()
            .into_iter()
            .enumerate()
-            .map(move |(idx, mut step)| {
+            .map(move |(idx, mut input)| {
-                let Step::FunctionCall(ref mut input) = step else {
+                if idx + 1 == inputs_len {
                    return step;
                };
                if idx + 1 == steps_len {
                    if input.expected.is_none() {
                        input.expected = self.expected.clone();
                    }
@@ -42,9 +35,9 @@ impl Case {
                    // the case? What are we supposed to do with that final expected field on the
                    // case?
-                    step
+                    input
                } else {
-                    step
+                    input
                }
            })
    }
@@ -17,25 +17,7 @@ impl Corpus {
    /// Try to read and parse the corpus definition file at given `path`.
    pub fn try_from_path(path: &Path) -> anyhow::Result<Self> {
        let file = File::open(path)?;
-        let mut corpus: Corpus = serde_json::from_reader(file)?;
+        Ok(serde_json::from_reader(file)?)
        // Ensure that the path mentioned in the corpus is relative to the corpus file.
        // Canonicalizing also helps make the path in any errors unambiguous.
        corpus.path = path
            .parent()
            .ok_or_else(|| {
                anyhow::anyhow!("Corpus path '{}' does not point to a file", path.display())
            })?
            .canonicalize()
            .map_err(|error| {
                anyhow::anyhow!(
                    "Failed to canonicalize path to corpus '{}': {error}",
                    path.display()
                )
            })?
            .join(corpus.path);
        Ok(corpus)
    }
    /// Scan the corpus base directory and return all tests found.
@@ -53,7 +35,6 @@ impl Corpus {
 ///
 /// `path` is expected to be a directory.
 pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
    if path.is_dir() {
    let dir_entry = match std::fs::read_dir(path) {
        Ok(dir_entry) => dir_entry,
        Err(error) => {
@@ -83,17 +64,4 @@ pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
            }
        }
    }
    } else {
        let Some(extension) = path.extension() else {
            tracing::error!("Failed to get file extension");
            return;
        };
        if extension.eq_ignore_ascii_case("sol") || extension.eq_ignore_ascii_case("json") {
            if let Some(metadata) = MetadataFile::try_from_file(path) {
                tests.push(metadata)
            }
        } else {
            tracing::error!(?extension, "Unsupported file extension");
        }
    }
 }
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use alloy::{
    eips::BlockNumberOrTag,
-    hex::ToHexExt,
+    json_abi::JsonAbi,
    network::TransactionBuilder,
    primitives::{Address, Bytes, U256},
    rpc::types::TransactionRequest,
@@ -14,25 +14,10 @@ use serde::{Deserialize, Serialize};
 use revive_dt_common::macros::define_wrapper_type;
 use crate::metadata::ContractInstance;
 use crate::traits::ResolverApi;
 use crate::{metadata::ContractInstance, traits::ResolutionContext};
-/// A test step.
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 ///
 /// A test step can be anything. It could be an invocation to a function, an assertion, or any other
 /// action that needs to be run or executed on the nodes used in the tests.
 #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Step {
    /// A function call or an invocation to some function on some smart contract.
    FunctionCall(Box<Input>),
    /// A step for performing a balance assertion on some account or contract.
    BalanceAssertion(Box<BalanceAssertion>),
    /// A step for asserting that the storage of some contract or account is empty.
    StorageEmptyAssertion(Box<StorageEmptyAssertion>),
 }
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
 pub struct Input {
    #[serde(default = "Input::default_caller")]
    pub caller: Address,
@@ -45,38 +30,9 @@ pub struct Input {
    pub expected: Option<Expected>,
    pub value: Option<EtherValue>,
    pub storage: Option<HashMap<String, Calldata>>,
    pub variable_assignments: Option<VariableAssignments>,
 }
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
 pub struct BalanceAssertion {
    /// The address that the balance assertion should be done on.
    ///
    /// This is a string which will be resolved into an address when being processed. Therefore,
    /// this could be a normal hex address, a variable such as `Test.address`, or perhaps even a
    /// full on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are
    /// followed in the calldata.
    pub address: String,
    /// The amount of balance to assert that the account or contract has.
    pub expected_balance: U256,
 }
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
 pub struct StorageEmptyAssertion {
    /// The address that the balance assertion should be done on.
    ///
    /// This is a string which will be resolved into an address when being processed. Therefore,
    /// this could be a normal hex address, a variable such as `Test.address`, or perhaps even a
    /// full on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are
    /// followed in the calldata.
    pub address: String,
    /// A boolean of whether the storage of the address is empty or not.
    pub is_storage_empty: bool,
 }
 #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Expected {
    Calldata(Calldata),
@@ -84,7 +40,7 @@ pub enum Expected {
    ExpectedMany(Vec<ExpectedOutput>),
 }
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct ExpectedOutput {
    pub compiler_version: Option<VersionReq>,
    pub return_data: Option<Calldata>,
@@ -93,9 +49,9 @@ pub struct ExpectedOutput {
    pub exception: bool,
 }
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Event {
-    pub address: Option<String>,
+    pub address: Option<Address>,
    pub topics: Vec<String>,
    pub values: Calldata,
 }
@@ -151,7 +107,7 @@ pub struct Event {
 /// [`Single`]: Calldata::Single
 /// [`Compound`]: Calldata::Compound
 /// [reverse polish notation]: https://en.wikipedia.org/wiki/Reverse_Polish_notation
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Calldata {
    Single(Bytes),
@@ -180,12 +136,10 @@ enum Operation {
    BitwiseAnd,
    BitwiseOr,
    BitwiseXor,
    ShiftLeft,
    ShiftRight,
 }
 /// Specify how the contract is called.
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub enum Method {
    /// Initiate a deploy transaction, calling contracts constructor.
    ///
@@ -210,14 +164,6 @@ define_wrapper_type!(
    pub struct EtherValue(U256);
 );
 #[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
 pub struct VariableAssignments {
    /// A vector of the variable names to assign to the return data.
    ///
    /// Example: `UniswapV3PoolAddress`
    pub return_data: Vec<String>,
 }
 impl Input {
    pub const fn default_caller() -> Address {
        Address(FixedBytes(alloy::hex!(
@@ -229,21 +175,35 @@ impl Input {
        ContractInstance::new("Test")
    }
-    pub async fn encoded_input(
+    fn instance_to_address(
        &self,
-        resolver: &impl ResolverApi,
+        instance: &ContractInstance,
-        context: ResolutionContext<'_>,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
    ) -> anyhow::Result<Address> {
        deployed_contracts
            .get(instance)
            .map(|(a, _)| *a)
            .ok_or_else(|| anyhow::anyhow!("instance {instance:?} not deployed"))
    }
    pub fn encoded_input(
        &self,
        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<Bytes> {
        match self.method {
            Method::Deployer | Method::Fallback => {
-                let calldata = self.calldata.calldata(resolver, context).await?;
+                let calldata = self
                    .calldata
                    .calldata(deployed_contracts, chain_state_provider)?;
                Ok(calldata.into())
            }
            Method::FunctionName(ref function_name) => {
-                let Some(abi) = context.deployed_contract_abi(&self.instance) else {
+                let Some(abi) = deployed_contracts.get(&self.instance).map(|(_, a)| a) else {
                    tracing::error!(
                        contract_name = self.instance.as_ref(),
                        available_abis = ?deployed_contracts.keys().collect::<Vec<_>>(),
                        "Attempted to lookup ABI of contract but it wasn't found"
                    );
                    anyhow::bail!("ABI for instance '{}' not found", self.instance.as_ref());
@@ -281,9 +241,11 @@ impl Input {
                // a new buffer for each one of the resolved arguments.
                let mut calldata = Vec::<u8>::with_capacity(4 + self.calldata.size_requirement());
                calldata.extend(function.selector().0);
-                self.calldata
+                self.calldata.calldata_into_slice(
-                    .calldata_into_slice(&mut calldata, resolver, context)
+                    &mut calldata,
-                    .await?;
+                    deployed_contracts,
                    chain_state_provider,
                )?;
                Ok(calldata.into())
            }
@@ -291,12 +253,12 @@ impl Input {
    }
    /// Parse this input into a legacy transaction.
-    pub async fn legacy_transaction(
+    pub fn legacy_transaction(
        &self,
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<TransactionRequest> {
-        let input_data = self.encoded_input(resolver, context).await?;
+        let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?;
        let transaction_request = TransactionRequest::default().from(self.caller).value(
            self.value
                .map(|value| value.into_inner())
@@ -305,10 +267,7 @@ impl Input {
        match self.method {
            Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
            _ => Ok(transaction_request
-                .to(context
+                .to(self.instance_to_address(&self.instance, deployed_contracts)?)
                    .deployed_contract_address(&self.instance)
                    .context("Failed to get the contract address")
                    .copied()?)
                .input(input_data.into())),
        }
    }
@@ -377,22 +336,21 @@ impl Calldata {
        }
    }
-    pub async fn calldata(
+    pub fn calldata(
        &self,
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<Vec<u8>> {
        let mut buffer = Vec::<u8>::with_capacity(self.size_requirement());
-        self.calldata_into_slice(&mut buffer, resolver, context)
+        self.calldata_into_slice(&mut buffer, deployed_contracts, chain_state_provider)?;
            .await?;
        Ok(buffer)
    }
-    pub async fn calldata_into_slice(
+    pub fn calldata_into_slice(
        &self,
        buffer: &mut Vec<u8>,
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<()> {
        match self {
            Calldata::Single(bytes) => {
@@ -400,7 +358,7 @@ impl Calldata {
            }
            Calldata::Compound(items) => {
                for (arg_idx, arg) in items.iter().enumerate() {
-                    match arg.resolve(resolver, context).await {
+                    match arg.resolve(deployed_contracts, chain_state_provider) {
                        Ok(resolved) => {
                            buffer.extend(resolved.to_be_bytes::<32>());
                        }
@@ -423,11 +381,11 @@ impl Calldata {
    }
    /// Checks if this [`Calldata`] is equivalent to the passed calldata bytes.
-    pub async fn is_equivalent(
+    pub fn is_equivalent(
        &self,
        other: &[u8],
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<bool> {
        match self {
            Calldata::Single(calldata) => Ok(calldata == other),
@@ -449,7 +407,7 @@ impl Calldata {
                        std::borrow::Cow::Borrowed(other)
                    };
-                    let this = this.resolve(resolver, context).await?;
+                    let this = this.resolve(deployed_contracts, chain_state_provider)?;
                    let other = U256::from_be_slice(&other);
                    if this != other {
                        return Ok(false);
@@ -462,18 +420,18 @@ impl Calldata {
 }
 impl CalldataItem {
-    async fn resolve(
+    fn resolve(
        &self,
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<U256> {
        let mut stack = Vec::<CalldataToken<U256>>::new();
        for token in self
            .calldata_tokens()
-            .map(|token| token.resolve(resolver, context))
+            .map(|token| token.resolve(deployed_contracts, chain_state_provider))
        {
-            let token = token.await?;
+            let token = token?;
            let new_token = match token {
                CalldataToken::Item(_) => token,
                CalldataToken::Operation(operation) => {
@@ -494,14 +452,8 @@ impl CalldataItem {
                        Operation::BitwiseAnd => Some(left_operand & right_operand),
                        Operation::BitwiseOr => Some(left_operand | right_operand),
                        Operation::BitwiseXor => Some(left_operand ^ right_operand),
                        Operation::ShiftLeft => {
                            Some(left_operand << usize::try_from(right_operand)?)
                    }
-                        Operation::ShiftRight => {
+                    .context("Invalid calldata arithmetic operation")?;
                            Some(left_operand >> usize::try_from(right_operand)?)
                        }
                    }
                    .context("Invalid calldata arithmetic operation - Invalid operation")?;
                    CalldataToken::Item(result)
                }
@@ -512,21 +464,12 @@ impl CalldataItem {
        match stack.as_slice() {
            // Empty stack means that we got an empty compound calldata which we resolve to zero.
            [] => Ok(U256::ZERO),
-            [CalldataToken::Item(item)] => {
+            [CalldataToken::Item(item)] => Ok(*item),
-                tracing::debug!(
+            _ => Err(anyhow::anyhow!("Invalid calldata arithmetic operation")),
                    original = self.0,
                    resolved = item.to_be_bytes::<32>().encode_hex(),
                    "Resolved a Calldata item"
                );
                Ok(*item)
            }
            _ => Err(anyhow::anyhow!(
                "Invalid calldata arithmetic operation - Invalid stack"
            )),
        }
    }
-    fn calldata_tokens(&self) -> impl Iterator<Item = CalldataToken<&str>> {
+    fn calldata_tokens<'a>(&'a self) -> impl Iterator<Item = CalldataToken<&'a str>> + 'a {
        self.0.split(' ').map(|item| match item {
            "+" => CalldataToken::Operation(Operation::Addition),
            "-" => CalldataToken::Operation(Operation::Subtraction),
@@ -535,8 +478,6 @@ impl CalldataItem {
            "&" => CalldataToken::Operation(Operation::BitwiseAnd),
            "|" => CalldataToken::Operation(Operation::BitwiseOr),
            "^" => CalldataToken::Operation(Operation::BitwiseXor),
            "<<" => CalldataToken::Operation(Operation::ShiftLeft),
            ">>" => CalldataToken::Operation(Operation::ShiftRight),
            _ => CalldataToken::Item(item),
        })
    }
@@ -550,12 +491,9 @@ impl<T> CalldataToken<T> {
    const GAS_LIMIT_VARIABLE: &str = "$GAS_LIMIT";
    const COINBASE_VARIABLE: &str = "$COINBASE";
    const DIFFICULTY_VARIABLE: &str = "$DIFFICULTY";
    const BLOCK_BASE_FEE_VARIABLE: &str = "$BASE_FEE";
    const BLOCK_HASH_VARIABLE_PREFIX: &str = "$BLOCK_HASH";
    const BLOCK_NUMBER_VARIABLE: &str = "$BLOCK_NUMBER";
    const BLOCK_TIMESTAMP_VARIABLE: &str = "$BLOCK_TIMESTAMP";
    const TRANSACTION_GAS_PRICE: &str = "$TRANSACTION_GAS_PRICE";
    const VARIABLE_PREFIX: &str = "$VARIABLE:";
    fn into_item(self) -> Option<T> {
        match self {
@@ -574,21 +512,23 @@ impl<T: AsRef<str>> CalldataToken<T> {
    /// This piece of code is taken from the matter-labs-tester repository which is licensed under
    /// MIT or Apache. The original source code can be found here:
    /// https://github.com/matter-labs/era-compiler-tester/blob/0ed598a27f6eceee7008deab3ff2311075a2ec69/compiler_tester/src/test/case/input/value.rs#L43-L146
-    async fn resolve(
+    fn resolve(
        self,
-        resolver: &impl ResolverApi,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        context: ResolutionContext<'_>,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<CalldataToken<U256>> {
        match self {
            Self::Item(item) => {
                let item = item.as_ref();
                let value = if let Some(instance) = item.strip_suffix(Self::ADDRESS_VARIABLE_SUFFIX)
                {
-                    context
+                    Ok(U256::from_be_slice(
-                        .deployed_contract_address(&ContractInstance::new(instance))
+                        deployed_contracts
-                        .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))
+                            .get(&ContractInstance::new(instance))
-                        .map(AsRef::as_ref)
+                            .map(|(a, _)| *a)
-                        .map(U256::from_be_slice)
+                            .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))?
                            .as_ref(),
                    ))
                } else if let Some(value) = item.strip_prefix(Self::NEGATIVE_VALUE_PREFIX) {
                    let value = U256::from_str_radix(value, 10).map_err(|error| {
                        anyhow::anyhow!("Invalid decimal literal after `-`: {}", error)
@@ -601,36 +541,23 @@ impl<T: AsRef<str>> CalldataToken<T> {
                        .ok_or_else(|| anyhow::anyhow!("`-0` is invalid literal"))?;
                    Ok(U256::MAX.checked_sub(value).expect("Always valid"))
                } else if let Some(value) = item.strip_prefix(Self::HEX_LITERAL_PREFIX) {
-                    U256::from_str_radix(value, 16)
+                    Ok(U256::from_str_radix(value, 16).map_err(|error| {
-                        .map_err(|error| anyhow::anyhow!("Invalid hexadecimal literal: {}", error))
+                        anyhow::anyhow!("Invalid hexadecimal literal: {}", error)
                    })?)
                } else if item == Self::CHAIN_VARIABLE {
-                    resolver.chain_id().await.map(U256::from)
+                    let chain_id = chain_state_provider.chain_id()?;
-                } else if item == Self::TRANSACTION_GAS_PRICE {
+                    Ok(U256::from(chain_id))
                    context
                        .transaction_hash()
                        .context("No transaction hash provided to get the transaction gas price")
                        .map(|tx_hash| resolver.transaction_gas_price(tx_hash))?
                        .await
                        .map(U256::from)
                } else if item == Self::GAS_LIMIT_VARIABLE {
-                    resolver
+                    let gas_limit =
-                        .block_gas_limit(context.resolve_block_number(BlockNumberOrTag::Latest))
+                        chain_state_provider.block_gas_limit(BlockNumberOrTag::Latest)?;
-                        .await
+                    Ok(U256::from(gas_limit))
                        .map(U256::from)
                } else if item == Self::COINBASE_VARIABLE {
-                    resolver
+                    let coinbase = chain_state_provider.block_coinbase(BlockNumberOrTag::Latest)?;
-                        .block_coinbase(context.resolve_block_number(BlockNumberOrTag::Latest))
+                    Ok(U256::from_be_slice(coinbase.as_ref()))
                        .await
                        .map(|address| U256::from_be_slice(address.as_ref()))
                } else if item == Self::DIFFICULTY_VARIABLE {
-                    resolver
+                    let block_difficulty =
-                        .block_difficulty(context.resolve_block_number(BlockNumberOrTag::Latest))
+                        chain_state_provider.block_difficulty(BlockNumberOrTag::Latest)?;
-                        .await
+                    Ok(block_difficulty)
                } else if item == Self::BLOCK_BASE_FEE_VARIABLE {
                    resolver
                        .block_base_fee(context.resolve_block_number(BlockNumberOrTag::Latest))
                        .await
                        .map(U256::from)
                } else if item.starts_with(Self::BLOCK_HASH_VARIABLE_PREFIX) {
                    let offset: u64 = item
                        .split(':')
@@ -638,34 +565,23 @@ impl<T: AsRef<str>> CalldataToken<T> {
                        .and_then(|value| value.parse().ok())
                        .unwrap_or_default();
-                    let current_block_number = match context.tip_block_number() {
+                    let current_block_number = chain_state_provider.last_block_number()?;
-                        Some(block_number) => *block_number,
+                    let desired_block_number = current_block_number - offset;
                        None => resolver.last_block_number().await?,
                    };
                    let desired_block_number = current_block_number.saturating_sub(offset);
-                    let block_hash = resolver.block_hash(desired_block_number.into()).await?;
+                    let block_hash =
                        chain_state_provider.block_hash(desired_block_number.into())?;
                    Ok(U256::from_be_bytes(block_hash.0))
                } else if item == Self::BLOCK_NUMBER_VARIABLE {
-                    let current_block_number = match context.tip_block_number() {
+                    let current_block_number = chain_state_provider.last_block_number()?;
                        Some(block_number) => *block_number,
                        None => resolver.last_block_number().await?,
                    };
                    Ok(U256::from(current_block_number))
                } else if item == Self::BLOCK_TIMESTAMP_VARIABLE {
-                    resolver
+                    let timestamp =
-                        .block_timestamp(context.resolve_block_number(BlockNumberOrTag::Latest))
+                        chain_state_provider.block_timestamp(BlockNumberOrTag::Latest)?;
-                        .await
+                    Ok(U256::from(timestamp))
                        .map(U256::from)
                } else if let Some(variable_name) = item.strip_prefix(Self::VARIABLE_PREFIX) {
                    context
                        .variable(variable_name)
                        .context("Variable lookup failed")
                        .copied()
                } else {
-                    U256::from_str_radix(item, 10)
+                    Ok(U256::from_str_radix(item, 10)
-                        .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))
+                        .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))?)
                };
                value.map(CalldataToken::Item)
            }
@@ -704,53 +620,51 @@ impl<'de> Deserialize<'de> for EtherValue {
 mod tests {
    use super::*;
-    use alloy::{eips::BlockNumberOrTag, json_abi::JsonAbi};
+    use alloy::json_abi::JsonAbi;
-    use alloy_primitives::{BlockHash, BlockNumber, BlockTimestamp, ChainId, TxHash, address};
+    use alloy_primitives::address;
    use alloy_sol_types::SolValue;
    use std::collections::HashMap;
    struct MockResolver;
    impl ResolverApi for MockResolver {
-        async fn chain_id(&self) -> anyhow::Result<ChainId> {
+        fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
            Ok(0x123)
        }
-        async fn block_gas_limit(&self, _: BlockNumberOrTag) -> anyhow::Result<u128> {
+        fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
            Ok(0x1234)
        }
-        async fn block_coinbase(&self, _: BlockNumberOrTag) -> anyhow::Result<Address> {
+        fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<Address> {
            Ok(Address::ZERO)
        }
-        async fn block_difficulty(&self, _: BlockNumberOrTag) -> anyhow::Result<U256> {
+        fn block_difficulty(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<U256> {
            Ok(U256::from(0x12345u128))
        }
-        async fn block_base_fee(&self, _: BlockNumberOrTag) -> anyhow::Result<u64> {
+        fn block_hash(
-            Ok(0x100)
+            &self,
-        }
+            _: alloy::eips::BlockNumberOrTag,
-
+        ) -> anyhow::Result<alloy_primitives::BlockHash> {
        async fn block_hash(&self, _: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
            Ok([0xEE; 32].into())
        }
-        async fn block_timestamp(&self, _: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+        fn block_timestamp(
            &self,
            _: alloy::eips::BlockNumberOrTag,
        ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
            Ok(0x123456)
        }
-        async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+        fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
            Ok(0x1234567)
        }
        async fn transaction_gas_price(&self, _: &TxHash) -> anyhow::Result<u128> {
            Ok(0x200)
        }
    }
-    #[tokio::test]
+    #[test]
-    async fn test_encoded_input_uint256() {
+    fn test_encoded_input_uint256() {
        let raw_metadata = r#"
            [
                {
@@ -785,9 +699,7 @@ mod tests {
            (Address::ZERO, parsed_abi),
        );
-        let resolver = MockResolver;
+        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
        let encoded = input.encoded_input(&resolver, context).await.unwrap();
        assert!(encoded.0.starts_with(&selector));
        type T = (u64,);
@@ -795,8 +707,8 @@ mod tests {
        assert_eq!(decoded.0, 42);
    }
-    #[tokio::test]
+    #[test]
-    async fn test_encoded_input_address_with_signature() {
+    fn test_encoded_input_address_with_signature() {
        let raw_abi = r#"[
        {
            "inputs": [{"name": "recipient", "type": "address"}],
@@ -829,9 +741,7 @@ mod tests {
            (Address::ZERO, parsed_abi),
        );
-        let resolver = MockResolver;
+        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
        let encoded = input.encoded_input(&resolver, context).await.unwrap();
        assert!(encoded.0.starts_with(&selector));
        type T = (alloy_primitives::Address,);
@@ -842,8 +752,8 @@ mod tests {
        );
    }
-    #[tokio::test]
+    #[test]
-    async fn test_encoded_input_address() {
+    fn test_encoded_input_address() {
        let raw_abi = r#"[
        {
            "inputs": [{"name": "recipient", "type": "address"}],
@@ -876,9 +786,7 @@ mod tests {
            (Address::ZERO, parsed_abi),
        );
-        let resolver = MockResolver;
+        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
        let encoded = input.encoded_input(&resolver, context).await.unwrap();
        assert!(encoded.0.starts_with(&selector));
        type T = (alloy_primitives::Address,);
@@ -889,56 +797,50 @@ mod tests {
        );
    }
-    async fn resolve_calldata_item(
+    fn resolve_calldata_item(
        input: &str,
        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        resolver: &impl ResolverApi,
+        chain_state_provider: &impl ResolverApi,
    ) -> anyhow::Result<U256> {
-        let context = ResolutionContext::new_from_parts(deployed_contracts, None, None, None);
+        CalldataItem::new(input).resolve(deployed_contracts, chain_state_provider)
        CalldataItem::new(input).resolve(resolver, context).await
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_chain_id_variable() {
+    fn resolver_can_resolve_chain_id_variable() {
        // Arrange
        let input = "$CHAIN_ID";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
-        assert_eq!(resolved, U256::from(MockResolver.chain_id().await.unwrap()))
+        assert_eq!(resolved, U256::from(MockResolver.chain_id().unwrap()))
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_gas_limit_variable() {
+    fn resolver_can_resolve_gas_limit_variable() {
        // Arrange
        let input = "$GAS_LIMIT";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            U256::from(
+            U256::from(MockResolver.block_gas_limit(Default::default()).unwrap())
                MockResolver
                    .block_gas_limit(Default::default())
                    .await
                    .unwrap()
            )
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_coinbase_variable() {
+    fn resolver_can_resolve_coinbase_variable() {
        // Arrange
        let input = "$COINBASE";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
@@ -947,243 +849,165 @@ mod tests {
            U256::from_be_slice(
                MockResolver
                    .block_coinbase(Default::default())
                    .await
                    .unwrap()
                    .as_ref()
            )
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_block_difficulty_variable() {
+    fn resolver_can_resolve_block_difficulty_variable() {
        // Arrange
        let input = "$DIFFICULTY";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            MockResolver
+            MockResolver.block_difficulty(Default::default()).unwrap()
                .block_difficulty(Default::default())
                .await
                .unwrap()
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_block_base_fee_variable() {
+    fn resolver_can_resolve_block_hash_variable() {
        // Arrange
        let input = "$BASE_FEE";
        // Act
        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
            MockResolver
                .block_base_fee(Default::default())
                .await
                .map(U256::from)
                .unwrap()
        )
    }
    #[tokio::test]
    async fn resolver_can_resolve_block_hash_variable() {
        // Arrange
        let input = "$BLOCK_HASH";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            U256::from_be_bytes(MockResolver.block_hash(Default::default()).await.unwrap().0)
+            U256::from_be_bytes(MockResolver.block_hash(Default::default()).unwrap().0)
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_block_number_variable() {
+    fn resolver_can_resolve_block_number_variable() {
        // Arrange
        let input = "$BLOCK_NUMBER";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            U256::from(MockResolver.last_block_number().await.unwrap())
+            U256::from(MockResolver.last_block_number().unwrap())
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn resolver_can_resolve_block_timestamp_variable() {
+    fn resolver_can_resolve_block_timestamp_variable() {
        // Arrange
        let input = "$BLOCK_TIMESTAMP";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            U256::from(
+            U256::from(MockResolver.block_timestamp(Default::default()).unwrap())
                MockResolver
                    .block_timestamp(Default::default())
                    .await
                    .unwrap()
            )
        )
    }
-    #[tokio::test]
+    #[test]
-    async fn simple_addition_can_be_resolved() {
+    fn simple_addition_can_be_resolved() {
        // Arrange
        let input = "2 4 +";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(resolved, U256::from(6));
    }
-    #[tokio::test]
+    #[test]
-    async fn simple_subtraction_can_be_resolved() {
+    fn simple_subtraction_can_be_resolved() {
        // Arrange
        let input = "4 2 -";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(resolved, U256::from(2));
    }
-    #[tokio::test]
+    #[test]
-    async fn simple_multiplication_can_be_resolved() {
+    fn simple_multiplication_can_be_resolved() {
        // Arrange
        let input = "4 2 *";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(resolved, U256::from(8));
    }
-    #[tokio::test]
+    #[test]
-    async fn simple_division_can_be_resolved() {
+    fn simple_division_can_be_resolved() {
        // Arrange
        let input = "4 2 /";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(resolved, U256::from(2));
    }
-    #[tokio::test]
+    #[test]
-    async fn arithmetic_errors_are_not_panics() {
+    fn arithmetic_errors_are_not_panics() {
        // Arrange
        let input = "4 0 /";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        assert!(resolved.is_err())
    }
-    #[tokio::test]
+    #[test]
-    async fn arithmetic_with_resolution_works() {
+    fn arithmetic_with_resolution_works() {
        // Arrange
        let input = "$BLOCK_NUMBER 10 +";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        let resolved = resolved.expect("Failed to resolve argument");
        assert_eq!(
            resolved,
-            U256::from(MockResolver.last_block_number().await.unwrap() + 10)
+            U256::from(MockResolver.last_block_number().unwrap() + 10)
        );
    }
-    #[tokio::test]
+    #[test]
-    async fn incorrect_number_of_arguments_errors() {
+    fn incorrect_number_of_arguments_errors() {
        // Arrange
        let input = "$BLOCK_NUMBER 10 + +";
        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
        // Assert
        assert!(resolved.is_err())
    }
    #[test]
    fn expected_json_can_be_deserialized1() {
        // Arrange
        let str = r#"
        {
            "return_data": [
                "1"
            ],
            "events": [
                {
                    "topics": [],
                    "values": []
                }
            ]
        }
        "#;
        // Act
        let expected = serde_json::from_str::<Expected>(str);
        // Assert
        expected.expect("Failed to deserialize");
    }
    #[test]
    fn expected_json_can_be_deserialized2() {
        // Arrange
        let str = r#"
        {
            "return_data": [
                "1"
            ],
            "events": [
                {
                    "address": "Main.address",
                    "topics": [],
                    "values": []
                }
            ]
        }
        "#;
        // Act
        let expected = serde_json::from_str::<Expected>(str);
        // Assert
        expected.expect("Failed to deserialize");
    }
 }
@@ -9,7 +9,7 @@ use std::{
 use serde::{Deserialize, Serialize};
-use revive_dt_common::{iterators::FilesWithExtensionIterator, macros::define_wrapper_type};
+use revive_dt_common::macros::define_wrapper_type;
 use crate::{
    case::Case,
@@ -43,11 +43,12 @@ impl Deref for MetadataFile {
    }
 }
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
    pub targets: Option<Vec<String>>,
    pub cases: Vec<Case>,
    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
    // TODO: Convert into wrapper types for clarity.
    pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
    pub ignore: Option<bool>,
    pub modes: Option<Vec<Mode>>,
@@ -192,7 +193,7 @@ impl Metadata {
                metadata.file_path = Some(path.to_path_buf());
                metadata.contracts = Some(
                    [(
-                        ContractInstance::new("Test"),
+                        ContractInstance::new("test"),
                        ContractPathAndIdent {
                            contract_source_path: path.to_path_buf(),
                            contract_ident: ContractIdent::new("Test"),
@@ -211,29 +212,6 @@ impl Metadata {
            }
        }
    }
    /// Returns an iterator over all of the solidity files that needs to be compiled for this
    /// [`Metadata`] object
    ///
    /// Note: if the metadata is contained within a solidity file then this is the only file that
    /// we wish to compile since this is a self-contained test. Otherwise, if it's a JSON file
    /// then we need to compile all of the contracts that are in the directory since imports are
    /// allowed in there.
    pub fn files_to_compile(&self) -> anyhow::Result<Box<dyn Iterator<Item = PathBuf>>> {
        let Some(ref metadata_file_path) = self.file_path else {
            anyhow::bail!("The metadata file path is not defined");
        };
        if metadata_file_path
            .extension()
            .is_some_and(|extension| extension.eq_ignore_ascii_case("sol"))
        {
            Ok(Box::new(std::iter::once(metadata_file_path.clone())))
        } else {
            Ok(Box::new(
                FilesWithExtensionIterator::new(self.directory()?).with_allowed_extension("sol"),
            ))
        }
    }
 }
 define_wrapper_type!(
@@ -309,23 +287,17 @@ impl FromStr for ContractPathAndIdent {
                identifier = Some(next_item.to_owned())
            }
        }
-        match (path, identifier) {
+        let Some(path) = path else {
-            (Some(path), Some(identifier)) => Ok(Self {
+            anyhow::bail!("Path is not defined");
-                contract_source_path: PathBuf::from(path),
+        };
-                contract_ident: ContractIdent::new(identifier),
+        let Some(identifier) = identifier else {
-            }),
+            anyhow::bail!("Contract identifier is not defined")
            (None, Some(path)) | (Some(path), None) => {
                let Some(identifier) = path.split(".").next().map(ToOwned::to_owned) else {
                    anyhow::bail!("Failed to find identifier");
        };
        Ok(Self {
            contract_source_path: PathBuf::from(path),
            contract_ident: ContractIdent::new(identifier),
        })
    }
            (None, None) => anyhow::bail!("Failed to find the path and identifier"),
        }
    }
 }
 impl TryFrom<String> for ContractPathAndIdent {
@@ -1,4 +1,3 @@
 use revive_dt_common::types::VersionOrRequirement;
 use semver::Version;
 use serde::de::Deserializer;
 use serde::{Deserialize, Serialize};
@@ -16,7 +15,6 @@ pub struct SolcMode {
    pub solc_version: Option<semver::VersionReq>,
    solc_optimize: Option<bool>,
    pub llvm_optimizer_settings: Vec<String>,
    mode_string: String,
 }
 impl SolcMode {
@@ -30,10 +28,7 @@ impl SolcMode {
    /// - A solc `SemVer version requirement` string
    /// - One or more `-OX` where X is a supposed to be an LLVM opt mode
    pub fn parse_from_mode_string(mode_string: &str) -> Option<Self> {
-        let mut result = Self {
+        let mut result = Self::default();
            mode_string: mode_string.to_string(),
            ..Default::default()
        };
        let mut parts = mode_string.trim().split(" ");
@@ -83,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 {
@@ -108,16 +94,3 @@ impl<'de> Deserialize<'de> for Mode {
        Ok(Self::Unknown(mode_string))
    }
 }
 impl Serialize for Mode {
    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
    where
        S: serde::Serializer,
    {
        let string = match self {
            Mode::Solidity(solc_mode) => &solc_mode.mode_string,
            Mode::Unknown(string) => string,
        };
        string.serialize(serializer)
    }
 }
@@ -1,150 +1,30 @@
 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>>;
+    fn chain_id(&self) -> 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>>;
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> Result<u128>;
    /// Returns the coinbase of the specified block.
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<Address>>;
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> Result<Address>;
    /// Returns the difficulty of the specified block.
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<U256>>;
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> 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>>;
+    fn block_hash(&self, number: BlockNumberOrTag) -> Result<BlockHash>;
    /// Returns the timestamp of the specified block,
-    fn block_timestamp(
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> Result<BlockTimestamp>;
        &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>>;
+    fn last_block_number(&self) -> 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
    }
 }
@@ -1,35 +1,21 @@
 //! This crate implements all node interactions.
 use alloy::primitives::{Address, StorageKey, U256};
 use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
-use alloy::rpc::types::{EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest};
+use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
 use anyhow::Result;
 /// An interface for all interactions with Ethereum compatible nodes.
 pub trait EthereumNode {
    /// Execute the [TransactionRequest] and return a [TransactionReceipt].
-    fn execute_transaction(
+    fn execute_transaction(&self, transaction: TransactionRequest) -> Result<TransactionReceipt>;
        &self,
        transaction: TransactionRequest,
    ) -> impl Future<Output = Result<TransactionReceipt>>;
    /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
    fn trace_transaction(
        &self,
        receipt: &TransactionReceipt,
        trace_options: GethDebugTracingOptions,
-    ) -> impl Future<Output = Result<GethTrace>>;
+    ) -> Result<GethTrace>;
    /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, receipt: &TransactionReceipt) -> impl Future<Output = Result<DiffMode>>;
+    fn state_diff(&self, receipt: &TransactionReceipt) -> Result<DiffMode>;
    /// Returns the balance of the provided [`Address`] back.
    fn balance_of(&self, address: Address) -> impl Future<Output = Result<U256>>;
    /// Returns the latest storage proof of the provided [`Address`]
    fn latest_state_proof(
        &self,
        address: Address,
        keys: Vec<StorageKey>,
    ) -> impl Future<Output = Result<EIP1186AccountProofResponse>>;
 }
@@ -3,13 +3,9 @@
 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::{
+    sync::atomic::{AtomicU32, Ordering},
        Arc,
        atomic::{AtomicU32, Ordering},
    },
    time::{Duration, Instant},
 };
@@ -17,27 +13,23 @@ use alloy::{
    eips::BlockNumberOrTag,
    genesis::{Genesis, GenesisAccount},
    network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{
+    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256},
        Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, StorageKey, TxHash, U256,
    },
    providers::{
        Provider, ProviderBuilder,
        ext::DebugApi,
        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
    },
    rpc::types::{
-        EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest,
+        TransactionReceipt, TransactionRequest,
        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
    },
    signers::local::PrivateKeySigner,
 };
-use anyhow::Context;
+use revive_dt_common::concepts::BlockingExecutor;
 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 tracing::Level;
 use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
@@ -51,7 +43,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,
@@ -70,7 +62,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";
@@ -85,17 +77,10 @@ impl GethNode {
    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)?;
@@ -114,8 +99,6 @@ impl GethNode {
        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)
@@ -169,16 +152,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()?
@@ -267,17 +240,24 @@ impl GethNode {
    }
 }
-impl EthereumNode for GethNode {
+impl EthereumNode for Instance {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn execute_transaction(
+    fn execute_transaction(
        &self,
        transaction: TransactionRequest,
    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let span = tracing::debug_span!("Submitting transaction", ?transaction);
+        let provider = self.provider();
-        let _guard = span.enter();
+        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 provider = provider.await?;
-        let transaction_hash = *provider.send_transaction(transaction).await?.tx_hash();
+
            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
@@ -297,203 +277,160 @@ impl EthereumNode for GethNode {
            // 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(
+            let mut retries = 0;
-            Self::RECEIPT_POLLING_DURATION,
+            let mut total_wait_duration = Duration::from_secs(0);
-            Default::default(),
+            let max_allowed_wait_duration = Duration::from_secs(5 * 60);
-            move || {
+            loop {
-                let provider = provider.clone();
+                if total_wait_duration >= max_allowed_wait_duration {
-                async move {
+                    tracing::error!(
-                    match provider.get_transaction_receipt(transaction_hash).await {
+                        ?total_wait_duration,
-                        Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
+                        ?max_allowed_wait_duration,
-                        Ok(None) => Ok(ControlFlow::Continue(())),
+                        retry_count = retries,
-                        Err(error) => {
+                        "Failed to get receipt after polling for it"
-                            let error_string = error.to_string();
+                    );
-                            match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+                    anyhow::bail!(
-                                true => Ok(ControlFlow::Continue(())),
+                        "Polled for receipt for {total_wait_duration:?} but failed to get it"
-                                false => 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))]
+                match provider.get_transaction_receipt(*transaction_hash).await {
-    async fn trace_transaction(
+                    Ok(Some(receipt)) => break Ok(receipt),
                    Ok(None) => {}
                    Err(error) => {
                        let error_string = error.to_string();
                        if !error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
                            break Err(error.into());
                        }
                    }
                };
                let next_wait_duration = Duration::from_secs(2u64.pow(retries))
                    .min(max_allowed_wait_duration - total_wait_duration);
                total_wait_duration += next_wait_duration;
                retries += 1;
                tokio::time::sleep(next_wait_duration).await;
            }
        })?
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
    fn trace_transaction(
        &self,
        transaction: &TransactionReceipt,
        trace_options: GethDebugTracingOptions,
    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let provider = Arc::new(self.provider().await?);
+        let tx_hash = transaction.transaction_hash;
-        poll(
+        let provider = self.provider();
-            Self::TRACE_POLLING_DURATION,
+        BlockingExecutor::execute(async move {
-            Default::default(),
+            Ok(provider
-            move || {
+                .await?
-                let provider = provider.clone();
+                .debug_trace_transaction(tx_hash, trace_options)
-                let trace_options = trace_options.clone();
+                .await?)
-                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
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
            diff_mode: Some(true),
            disable_code: None,
            disable_storage: None,
        });
        match self
-            .trace_transaction(transaction, trace_options)
+            .trace_transaction(transaction, trace_options)?
            .await?
            .try_into_pre_state_frame()?
        {
            PreStateFrame::Diff(diff) => Ok(diff),
            _ => anyhow::bail!("expected a diff mode trace"),
        }
    }
 }
 impl ResolverApi for Instance {
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_balance(address)
+            provider.await?.get_chain_id().await.map_err(Into::into)
-            .await
+        })?
            .map_err(Into::into)
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn latest_state_proof(
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        &self,
+        let provider = self.provider();
-        address: Address,
+        BlockingExecutor::execute(async move {
-        keys: Vec<StorageKey>,
+            provider
    ) -> anyhow::Result<EIP1186AccountProofResponse> {
        self.provider()
            .await?
            .get_proof(address, keys)
            .latest()
            .await
            .map_err(Into::into)
    }
 }
 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)
    }
    #[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)
    }
    #[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 _)
        })?
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                .map(|block| block.header.beneficiary)
        })?
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
+                .map(|block| block.header.difficulty)
        })?
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_by_number(number)
+            provider
            .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))]
    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> {
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                .map(|block| block.header.timestamp)
        })?
    }
    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_number()
+            provider.await?.get_block_number().await.map_err(Into::into)
-            .await
+        })?
            .map_err(Into::into)
    }
 }
-impl Node for GethNode {
+impl Node for Instance {
    fn new(config: &Arguments) -> Self {
        let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
        let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
@@ -581,7 +518,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")
@@ -606,9 +543,9 @@ mod tests {
        (config, temp_dir)
    }
-    fn new_node() -> (GethNode, TempDir) {
+    fn new_node() -> (Instance, TempDir) {
        let (args, temp_dir) = test_config();
-        let mut node = GethNode::new(&args);
+        let mut node = Instance::new(&args);
        node.init(GENESIS_JSON.to_owned())
            .expect("Failed to initialize the node")
            .spawn_process()
@@ -618,110 +555,110 @@ mod tests {
    #[test]
    fn init_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0)
            .init(GENESIS_JSON.to_string())
            .unwrap();
    }
    #[test]
    fn spawn_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0)
            .spawn(GENESIS_JSON.to_string())
            .unwrap();
    }
    #[test]
    fn version_works() {
-        let version = GethNode::new(&test_config().0).version().unwrap();
+        let version = Instance::new(&test_config().0).version().unwrap();
        assert!(
            version.starts_with("geth version"),
            "expected version string, got: '{version}'"
        );
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_chain_id_from_node() {
+    fn can_get_chain_id_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let chain_id = node.chain_id().await;
+        let chain_id = node.chain_id();
        // Assert
        let chain_id = chain_id.expect("Failed to get the chain id");
        assert_eq!(chain_id, 420_420_420);
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_gas_limit_from_node() {
+    fn can_get_gas_limit_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
        // Assert
        let gas_limit = gas_limit.expect("Failed to get the gas limit");
        assert_eq!(gas_limit, u32::MAX as u128)
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_coinbase_from_node() {
+    fn can_get_coinbase_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
        // Assert
        let coinbase = coinbase.expect("Failed to get the coinbase");
        assert_eq!(coinbase, Address::new([0xFF; 20]))
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_difficulty_from_node() {
+    fn can_get_block_difficulty_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
        // Assert
        let block_difficulty = block_difficulty.expect("Failed to get the block difficulty");
        assert_eq!(block_difficulty, U256::ZERO)
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_hash_from_node() {
+    fn can_get_block_hash_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
        // Assert
        let _ = block_hash.expect("Failed to get the block hash");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_timestamp_from_node() {
+    fn can_get_block_timestamp_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
        // Assert
        let _ = block_timestamp.expect("Failed to get the block timestamp");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_number_from_node() {
+    fn can_get_block_number_from_node() {
        // Arrange
        let (node, _temp_dir) = new_node();
        // Act
-        let block_number = node.last_block_number().await;
+        let block_number = node.last_block_number();
        // Assert
        let block_number = block_number.expect("Failed to get the block number");
@@ -16,8 +16,7 @@ use alloy::{
        TransactionBuilderError, UnbuiltTransactionError,
    },
    primitives::{
-        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes,
+        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256,
        StorageKey, TxHash, U256,
    },
    providers::{
        Provider, ProviderBuilder,
@@ -25,14 +24,12 @@ use alloy::{
        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
    },
    rpc::types::{
-        EIP1186AccountProofResponse, TransactionReceipt,
+        TransactionReceipt,
        eth::{Block, Header, Transaction},
        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
    },
    signers::local::PrivateKeySigner,
 };
 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};
@@ -40,6 +37,7 @@ use sp_core::crypto::Ss58Codec;
 use sp_runtime::AccountId32;
 use tracing::Level;
 use revive_dt_common::concepts::BlockingExecutor;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
@@ -88,9 +86,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)?;
@@ -211,7 +206,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 +235,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,169 +377,137 @@ impl KitchensinkNode {
 impl EthereumNode for KitchensinkNode {
    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn execute_transaction(
+    fn execute_transaction(
        &self,
        transaction: alloy::rpc::types::TransactionRequest,
    ) -> anyhow::Result<TransactionReceipt> {
        tracing::debug!(?transaction, "Submitting transaction");
-        let receipt = self
+        let provider = self.provider();
-            .provider()
+        let receipt = BlockingExecutor::execute(async move {
            Ok(provider
                .await?
                .send_transaction(transaction)
                .await?
                .get_receipt()
-            .await?;
+                .await?)
        })?;
        tracing::info!(?receipt, "Submitted tx to kitchensink");
-        Ok(receipt)
+        receipt
    }
    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn trace_transaction(
+    fn trace_transaction(
        &self,
        transaction: &TransactionReceipt,
        trace_options: GethDebugTracingOptions,
    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
        let tx_hash = transaction.transaction_hash;
-        Ok(self
+        let provider = self.provider();
-            .provider()
+        BlockingExecutor::execute(async move {
            Ok(provider
                .await?
                .debug_trace_transaction(tx_hash, trace_options)
                .await?)
        })?
    }
    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
            diff_mode: Some(true),
            disable_code: None,
            disable_storage: None,
        });
        match self
-            .trace_transaction(transaction, trace_options)
+            .trace_transaction(transaction, trace_options)?
            .await?
            .try_into_pre_state_frame()?
        {
            PreStateFrame::Diff(diff) => Ok(diff),
            _ => anyhow::bail!("expected a diff mode trace"),
        }
    }
    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
    async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
        self.provider()
            .await?
            .get_balance(address)
            .await
            .map_err(Into::into)
    }
    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
    async fn latest_state_proof(
        &self,
        address: Address,
        keys: Vec<StorageKey>,
    ) -> anyhow::Result<EIP1186AccountProofResponse> {
        self.provider()
            .await?
            .get_proof(address, keys)
            .latest()
            .await
            .map_err(Into::into)
    }
 }
 impl ResolverApi for KitchensinkNode {
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_chain_id()
+            provider.await?.get_chain_id().await.map_err(Into::into)
-            .await
+        })?
            .map_err(Into::into)
    }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_transaction_receipt(*tx_hash)
+            provider
            .await?
            .context("Failed to get the transaction receipt")
            .map(|receipt| receipt.effective_gas_price)
    }
    #[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 _)
+                .map(|block| block.header.gas_limit)
        })?
    }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                .map(|block| block.header.beneficiary)
        })?
    }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
+                .map(|block| block.header.difficulty)
        })?
    }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_by_number(number)
+            provider
            .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(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))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.provider()
+        let provider = self.provider();
        BlockingExecutor::execute(async move {
            provider
                .await?
                .get_block_by_number(number)
                .await?
                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                .map(|block| block.header.timestamp)
        })?
    }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_number()
+            provider.await?.get_block_number().await.map_err(Into::into)
-            .await
+        })?
            .map_err(Into::into)
    }
 }
@@ -1080,21 +1043,26 @@ mod tests {
    use revive_dt_config::Arguments;
    use std::path::PathBuf;
    use std::sync::{LazyLock, Mutex};
    use temp_dir::TempDir;
    use std::fs;
    use super::*;
    use crate::{GENESIS_JSON, Node};
-    fn test_config() -> Arguments {
+    fn test_config() -> (Arguments, TempDir) {
-        Arguments {
+        let mut config = Arguments::default();
-            kitchensink: PathBuf::from("substrate-node"),
+        let temp_dir = TempDir::new().unwrap();
-            eth_proxy: PathBuf::from("eth-rpc"),
+
-            ..Default::default()
+        config.working_directory = temp_dir.path().to_path_buf().into();
-        }
+
        config.kitchensink = PathBuf::from("substrate-node");
        config.eth_proxy = PathBuf::from("eth-rpc");
        (config, temp_dir)
    }
-    fn new_node() -> (KitchensinkNode, Arguments) {
+    fn new_node() -> (KitchensinkNode, Arguments, TempDir) {
        // Note: When we run the tests in the CI we found that if they're all
        // run in parallel then the CI is unable to start all of the nodes in
        // time and their start up times-out. Therefore, we want all of the
@@ -1113,20 +1081,20 @@ mod tests {
        static NODE_START_MUTEX: Mutex<()> = Mutex::new(());
        let _guard = NODE_START_MUTEX.lock().unwrap();
-        let args = test_config();
+        let (args, temp_dir) = test_config();
        let mut node = KitchensinkNode::new(&args);
        node.init(GENESIS_JSON)
            .expect("Failed to initialize the node")
            .spawn_process()
            .expect("Failed to spawn the node process");
-        (node, args)
+        (node, args, temp_dir)
    }
    /// A shared node that multiple tests can use. It starts up once.
    fn shared_node() -> &'static KitchensinkNode {
-        static NODE: LazyLock<(KitchensinkNode, Arguments)> = LazyLock::new(|| {
+        static NODE: LazyLock<(KitchensinkNode, TempDir)> = LazyLock::new(|| {
-            let (node, args) = new_node();
+            let (node, _, temp_dir) = new_node();
-            (node, args)
+            (node, temp_dir)
        });
        &NODE.0
    }
@@ -1134,7 +1102,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");
@@ -1169,7 +1137,7 @@ mod tests {
        }
        "#;
-        let mut dummy_node = KitchensinkNode::new(&test_config());
+        let mut dummy_node = KitchensinkNode::new(&test_config().0);
        // Call `init()`
        dummy_node.init(genesis_content).expect("init failed");
@@ -1213,7 +1181,7 @@ mod tests {
        }
        "#;
-        let node = KitchensinkNode::new(&test_config());
+        let node = KitchensinkNode::new(&test_config().0);
        let result = node
            .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
@@ -1284,16 +1252,15 @@ mod tests {
    #[test]
    fn spawn_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
        let mut node = KitchensinkNode::new(&config);
        node.spawn(GENESIS_JSON.to_string()).unwrap();
    }
    #[test]
    fn version_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
        let node = KitchensinkNode::new(&config);
        let version = node.version().unwrap();
@@ -1306,7 +1273,7 @@ mod tests {
    #[test]
    fn eth_rpc_version_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
        let node = KitchensinkNode::new(&config);
        let version = node.eth_rpc_version().unwrap();
@@ -1317,86 +1284,86 @@ mod tests {
        );
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_chain_id_from_node() {
+    fn can_get_chain_id_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let chain_id = node.chain_id().await;
+        let chain_id = node.chain_id();
        // Assert
        let chain_id = chain_id.expect("Failed to get the chain id");
        assert_eq!(chain_id, 420_420_420);
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_gas_limit_from_node() {
+    fn can_get_gas_limit_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
        // Assert
        let _ = gas_limit.expect("Failed to get the gas limit");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_coinbase_from_node() {
+    fn can_get_coinbase_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
        // Assert
        let _ = coinbase.expect("Failed to get the coinbase");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_difficulty_from_node() {
+    fn can_get_block_difficulty_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
        // Assert
        let _ = block_difficulty.expect("Failed to get the block difficulty");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_hash_from_node() {
+    fn can_get_block_hash_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
        // Assert
        let _ = block_hash.expect("Failed to get the block hash");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_timestamp_from_node() {
+    fn can_get_block_timestamp_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
        // Assert
        let _ = block_timestamp.expect("Failed to get the block timestamp");
    }
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_number_from_node() {
+    fn can_get_block_number_from_node() {
        // Arrange
        let node = shared_node();
        // Act
-        let block_number = node.last_block_number().await;
+        let block_number = node.last_block_number();
        // Assert
        let _ = block_number.expect("Failed to get the block number");
@@ -24,7 +24,7 @@ where
 {
    /// Create a new Pool. This will start as many nodes as there are workers in `config`.
    pub fn new(config: &Arguments) -> anyhow::Result<Self> {
-        let nodes = config.number_of_nodes;
+        let nodes = config.workers;
        let genesis = read_to_string(&config.genesis_file).context(format!(
            "can not read genesis file: {}",
            config.genesis_file.display()
@@ -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
+                let yul_size = contract
-                // when we overhaul the reporting.
+                    .ir_optimized
                    .as_ref()
                    .expect("if the contract has a deploy code it should also have the opimized IR")
                    .len();
-                self.update_sizes(bytecode_size, 0);
+                self.update_sizes(bytecode_size, yul_size);
            }
        }
    }
@@ -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::GHDownloader;
 use crate::download::SolcDownloader;
 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 {
+impl GHDownloader {
-    pub const BASE_URL: &str = "https://binaries.soliditylang.org";
+    pub const BASE_URL: &str = "https://github.com/ethereum/solidity/releases/download";
-    pub const LINUX_NAME: &str = "linux-amd64";
+    pub const LINUX_NAME: &str = "solc-static-linux";
-    pub const MACOSX_NAME: &str = "macosx-amd64";
+    pub const MACOSX_NAME: &str = "solc-macos";
-    pub const WINDOWS_NAME: &str = "windows-amd64";
+    pub const WINDOWS_NAME: &str = "solc-windows.exe";
-    pub const WASM_NAME: &str = "wasm";
+    pub const WASM_NAME: &str = "soljson.js";
-    async fn new(
+    fn new(version: Version, target: &'static str, list: &'static str) -> Self {
-        version: impl Into<VersionOrRequirement>,
+        Self {
        target: &'static str,
        list: &'static str,
    ) -> anyhow::Result<Self> {
        let version_or_requirement = version.into();
        match version_or_requirement {
            VersionOrRequirement::Version(version) => Ok(Self {
            version,
            target,
            list,
            }),
            VersionOrRequirement::Requirement(requirement) => {
                let Some(version) = List::download(list)
                    .await?
                    .builds
                    .into_iter()
                    .map(|build| build.version)
                    .filter(|version| requirement.matches(version))
                    .max()
                else {
                    anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
                };
                Ok(Self {
                    version,
                    target,
                    list,
                })
            }
        }
    }
-    pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn linux(version: Version) -> Self {
-        Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
+        Self::new(version, Self::LINUX_NAME, List::LINUX_URL)
    }
-    pub async fn macosx(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn macosx(version: Version) -> Self {
-        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL).await
+        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL)
    }
-    pub async fn windows(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn windows(version: Version) -> Self {
-        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL).await
+        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL)
    }
-    pub async fn wasm(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn wasm(version: Version) -> Self {
-        Self::new(version, Self::WASM_NAME, List::WASM_URL).await
+        Self::new(version, Self::WASM_NAME, List::WASM_URL)
    }
    /// Returns the download link.
    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 expected_digest = List::download(self.list)?
-        let build = builds
+            .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 file = reqwest::blocking::get(self.url())?.bytes()?.to_vec();
        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();
        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]
+    #[test]
-    async fn try_get_windows() {
+    fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL)
+        let version = List::download(List::WINDOWS_URL).unwrap().latest_release;
-            .await
+        GHDownloader::windows(version).download().unwrap();
            .unwrap()
            .latest_release;
        SolcDownloader::windows(version)
            .await
            .unwrap()
            .download()
            .await
            .unwrap();
    }
-    #[tokio::test]
+    #[test]
-    async fn try_get_macosx() {
+    fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL)
+        let version = List::download(List::MACOSX_URL).unwrap().latest_release;
-            .await
+        GHDownloader::macosx(version).download().unwrap();
            .unwrap()
            .latest_release;
        SolcDownloader::macosx(version)
            .await
            .unwrap()
            .download()
            .await
            .unwrap();
    }
-    #[tokio::test]
+    #[test]
-    async fn try_get_linux() {
+    fn try_get_linux() {
-        let version = List::download(List::LINUX_URL)
+        let version = List::download(List::LINUX_URL).unwrap().latest_release;
-            .await
+        GHDownloader::linux(version).download().unwrap();
            .unwrap()
            .latest_release;
        SolcDownloader::linux(version)
            .await
            .unwrap()
            .download()
            .await
            .unwrap();
    }
-    #[tokio::test]
+    #[test]
-    async fn try_get_wasm() {
+    fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).await.unwrap().latest_release;
+        let version = List::download(List::WASM_URL).unwrap().latest_release;
-        SolcDownloader::wasm(version)
+        GHDownloader::wasm(version).download().unwrap();
            .await
            .unwrap()
            .download()
            .await
            .unwrap();
    }
 }
@@ -6,9 +6,8 @@
 use std::path::{Path, PathBuf};
 use cache::get_or_download;
-use download::SolcDownloader;
+use download::GHDownloader;
-
+use semver::Version;
 use revive_dt_common::types::VersionOrRequirement;
 pub mod cache;
 pub mod download;
@@ -19,22 +18,22 @@ pub mod list;
 ///
 /// Subsequent calls for the same version will use a cached artifact
 /// and not download it again.
-pub async fn download_solc(
+pub fn download_solc(
    cache_directory: &Path,
-    version: impl Into<VersionOrRequirement>,
+    version: Version,
    wasm: bool,
 ) -> anyhow::Result<PathBuf> {
    let downloader = if wasm {
-        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)
 }
		`@@ -0,0 +1,3 @@`
							`mod blocking_executor;`

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

			`pub use version_or_requirement::*;`