Edit the formatting of the CLI case reporter

* Added a resolver tied to a specific block

* Increase the number of private keys

* Increase kitchensink wait time to 60 seconds

* Add a case ignore flag

Cargo.lock

@@ -2713,7 +2713,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.10",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -2953,6 +2953,17 @@ 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"
@@ -3969,9 +3980,7 @@ dependencies = [
  "base64",
  "bytes",
  "encoding_rs",
- "futures-channel",
  "futures-core",
- "futures-util",
  "h2",
  "http",
  "http-body",
@@ -4020,11 +4029,8 @@ name = "revive-dt-common"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "futures",
- "once_cell",
  "semver 1.0.26",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -4043,6 +4049,7 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "serde_json",
+ "tokio",
  "tracing",
 ]
 
@@ -4064,8 +4071,8 @@ dependencies = [
  "alloy",
  "anyhow",
  "clap",
+ "futures",
  "indexmap 2.10.0",
- "rayon",
  "revive-dt-common",
  "revive-dt-compiler",
  "revive-dt-config",
@@ -4075,6 +4082,7 @@ dependencies = [
  "revive-dt-report",
  "semver 1.0.26",
  "temp-dir",
+ "tokio",
  "tracing",
  "tracing-subscriber",
 ]
@@ -4091,6 +4099,7 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "serde_json",
+ "tokio",
  "tracing",
 ]
 
@@ -4145,6 +4154,7 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "sha2 0.10.9",
+ "tokio",
  "tracing",
 ]
 
@@ -4701,6 +4711,15 @@ 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"
@@ -4745,6 +4764,16 @@ 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"
@@ -5404,18 +5433,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
- "socket2",
+ "signal-hook-registry",
+ "slab",
+ "socket2 0.6.0",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

Cargo.toml

@@ -29,9 +29,8 @@ 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 = ["blocking", "json"] }
+reqwest = { version = "0.12.15", features = ["json"] }
 once_cell = "1.21"
-rayon = { version = "1.10" }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = [
@@ -43,8 +42,10 @@ sp-core = "36.1.0"
 sp-runtime = "41.1.0"
 temp-dir = { version = "0.1.16" }
 tempfile = "3.3"
-tokio = { version = "1", default-features = false, features = [
+tokio = { version = "1.47.0", default-features = false, features = [
     "rt-multi-thread",
+    "process",
+    "rt",
 ] }
 uuid = { version = "1.8", features = ["v4"] }
 tracing = "0.1.41"

crates/common/Cargo.toml

@@ -10,8 +10,5 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-futures = { workspace = true }
 semver = { workspace = true }
-tracing = { workspace = true }
+tokio = { workspace = true, default-features = false, features = ["time"] }
-once_cell = { workspace = true }
-tokio = { workspace = true }

crates/common/src/concepts/blocking_executor.rs

@@ -1,225 +0,0 @@
-//! 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)
-    }
-}

crates/common/src/concepts/mod.rs

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

crates/common/src/fs/clear_dir.rs

@@ -0,0 +1,22 @@
+use std::{
+    fs::{read_dir, remove_dir_all, remove_file},
+    path::Path,
+};
+
+use anyhow::Result;
+
+/// This method clears the passed directory of all of the files and directories contained within
+/// without deleting the directory.
+pub fn clear_directory(path: impl AsRef<Path>) -> Result<()> {
+    for entry in read_dir(path.as_ref())? {
+        let entry = entry?;
+        let entry_path = entry.path();
+
+        if entry_path.is_file() {
+            remove_file(entry_path)?
+        } else {
+            remove_dir_all(entry_path)?
+        }
+    }
+    Ok(())
+}

crates/common/src/fs/mod.rs

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

crates/common/src/futures/mod.rs

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

crates/common/src/futures/poll.rs

@@ -0,0 +1,69 @@
+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,
+}

crates/common/src/lib.rs

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

crates/compiler/Cargo.toml

@@ -23,3 +23,4 @@ semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
+tokio = { workspace = true }

crates/compiler/src/lib.rs

@@ -33,14 +33,14 @@ pub trait SolidityCompiler {
         &self,
         input: CompilerInput,
         additional_options: Self::Options,
-    ) -> anyhow::Result<CompilerOutput>;
+    ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
 
     fn new(solc_executable: PathBuf) -> Self;
 
     fn get_compiler_executable(
         config: &Arguments,
         version: impl Into<VersionOrRequirement>,
-    ) -> anyhow::Result<PathBuf>;
+    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
 
     fn version(&self) -> anyhow::Result<Version>;
 }
@@ -147,8 +147,13 @@ where
         self
     }
 
-    pub fn try_build(self, compiler_path: impl AsRef<Path>) -> anyhow::Result<CompilerOutput> {
+    pub async fn try_build(
-        T::new(compiler_path.as_ref().to_path_buf()).build(self.input, self.additional_options)
+        self,
+        compiler_path: impl AsRef<Path>,
+    ) -> anyhow::Result<CompilerOutput> {
+        T::new(compiler_path.as_ref().to_path_buf())
+            .build(self.input, self.additional_options)
+            .await
     }
 
     pub fn input(&self) -> CompilerInput {

crates/compiler/src/revive_resolc.rs

@@ -6,7 +6,6 @@ use std::{
     process::{Command, Stdio},
 };
 
-use alloy::json_abi::JsonAbi;
 use revive_dt_common::types::VersionOrRequirement;
 use revive_dt_config::Arguments;
 use revive_solc_json_interface::{
@@ -17,8 +16,10 @@ use revive_solc_json_interface::{
 
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
 
+use alloy::json_abi::JsonAbi;
 use anyhow::Context;
 use semver::Version;
+use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
 // TODO: I believe that we need to also pass the solc compiler to resolc so that resolc uses the
 // specified solc compiler. I believe that currently we completely ignore the specified solc binary
@@ -35,7 +36,7 @@ impl SolidityCompiler for Resolc {
     type Options = Vec<String>;
 
     #[tracing::instrument(level = "debug", ret)]
-    fn build(
+    async fn build(
         &self,
         CompilerInput {
             enable_optimization,
@@ -87,7 +88,7 @@ impl SolidityCompiler for Resolc {
             },
         };
 
-        let mut command = Command::new(&self.resolc_path);
+        let mut command = AsyncCommand::new(&self.resolc_path);
         command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
@@ -109,9 +110,10 @@ impl SolidityCompiler for Resolc {
         let mut child = command.spawn()?;
 
         let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
-        serde_json::to_writer(stdin_pipe, &input)?;
+        let serialized_input = serde_json::to_vec(&input)?;
+        stdin_pipe.write_all(&serialized_input).await?;
 
-        let output = child.wait_with_output()?;
+        let output = child.wait_with_output().await?;
         let stdout = output.stdout;
         let stderr = output.stderr;
 
@@ -195,7 +197,7 @@ impl SolidityCompiler for Resolc {
         Resolc { resolc_path }
     }
 
-    fn get_compiler_executable(
+    async fn get_compiler_executable(
         config: &Arguments,
         _version: impl Into<VersionOrRequirement>,
     ) -> anyhow::Result<PathBuf> {
@@ -233,11 +235,13 @@ impl SolidityCompiler for Resolc {
 mod test {
     use super::*;
 
-    #[test]
+    #[tokio::test]
-    fn compiler_version_can_be_obtained() {
+    async fn compiler_version_can_be_obtained() {
         // Arrange
         let args = Arguments::default();
-        let path = Resolc::get_compiler_executable(&args, Version::new(0, 7, 6)).unwrap();
+        let path = Resolc::get_compiler_executable(&args, Version::new(0, 7, 6))
+            .await
+            .unwrap();
         let compiler = Resolc::new(path);
 
         // Act

crates/compiler/src/solc.rs

@@ -21,6 +21,7 @@ use foundry_compilers_artifacts::{
     solc::*,
 };
 use semver::Version;
+use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
 #[derive(Debug)]
 pub struct Solc {
@@ -31,7 +32,7 @@ impl SolidityCompiler for Solc {
     type Options = ();
 
     #[tracing::instrument(level = "debug", ret)]
-    fn build(
+    async fn build(
         &self,
         CompilerInput {
             enable_optimization,
@@ -90,7 +91,7 @@ impl SolidityCompiler for Solc {
             },
         };
 
-        let mut command = Command::new(&self.solc_path);
+        let mut command = AsyncCommand::new(&self.solc_path);
         command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
@@ -112,8 +113,9 @@ impl SolidityCompiler for Solc {
         let mut child = command.spawn()?;
 
         let stdin = child.stdin.as_mut().expect("should be piped");
-        serde_json::to_writer(stdin, &input)?;
+        let serialized_input = serde_json::to_vec(&input)?;
-        let output = child.wait_with_output()?;
+        stdin.write_all(&serialized_input).await?;
+        let output = child.wait_with_output().await?;
 
         if !output.status.success() {
             let json_in = serde_json::to_string_pretty(&input)?;
@@ -177,11 +179,11 @@ impl SolidityCompiler for Solc {
         Self { solc_path }
     }
 
-    fn get_compiler_executable(
+    async fn get_compiler_executable(
         config: &Arguments,
         version: impl Into<VersionOrRequirement>,
     ) -> anyhow::Result<PathBuf> {
-        let path = download_solc(config.directory(), version, config.wasm)?;
+        let path = download_solc(config.directory(), version, config.wasm).await?;
         Ok(path)
     }
 
@@ -216,11 +218,15 @@ impl SolidityCompiler for Solc {
 mod test {
     use super::*;
 
-    #[test]
+    #[tokio::test]
-    fn compiler_version_can_be_obtained() {
+    async fn compiler_version_can_be_obtained() {
         // Arrange
         let args = Arguments::default();
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 7, 6)).unwrap();
+        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
@@ -232,4 +238,25 @@ mod test {
             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)
+        )
+    }
 }

crates/compiler/tests/lib.rs

@@ -4,11 +4,14 @@ use revive_dt_compiler::{Compiler, SolidityCompiler, revive_resolc::Resolc, solc
 use revive_dt_config::Arguments;
 use semver::Version;
 
-#[test]
+#[tokio::test]
-fn contracts_can_be_compiled_with_solc() {
+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)).unwrap();
+    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()
@@ -16,7 +19,8 @@ fn contracts_can_be_compiled_with_solc() {
         .unwrap()
         .with_source("./tests/assets/array_one_element/main.sol")
         .unwrap()
-        .try_build(compiler_path);
+        .try_build(compiler_path)
+        .await;
 
     // Assert
     let output = output.expect("Failed to compile");
@@ -42,11 +46,13 @@ fn contracts_can_be_compiled_with_solc() {
     assert!(callable_file_contracts.contains_key("Callable"));
 }
 
-#[test]
+#[tokio::test]
-fn contracts_can_be_compiled_with_resolc() {
+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)).unwrap();
+    let compiler_path = Resolc::get_compiler_executable(&args, Version::new(0, 8, 30))
+        .await
+        .unwrap();
 
     // Act
     let output = Compiler::<Resolc>::new()
@@ -54,7 +60,8 @@ fn contracts_can_be_compiled_with_resolc() {
         .unwrap()
         .with_source("./tests/assets/array_one_element/main.sol")
         .unwrap()
-        .try_build(compiler_path);
+        .try_build(compiler_path)
+        .await;
 
     // Assert
     let output = output.expect("Failed to compile");

crates/config/src/lib.rs

@@ -55,7 +55,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 = "2000")]
+    #[arg(long = "geth-start-timeout", default_value = "5000")]
     pub geth_start_timeout: u64,
 
     /// The test network chain ID.
@@ -77,7 +77,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 = 30)]
+    #[arg(long = "private-keys-count", default_value_t = 100_000)]
     pub private_keys_to_add: usize,
 
     /// The differential testing leader node implementation.
@@ -92,9 +92,13 @@ pub struct Arguments {
     #[arg(long = "compile-only")]
     pub compile_only: Option<TestingPlatform>,
 
-    /// Determines the amount of tests that are executed in parallel.
+    /// Determines the amount of nodes that will be spawned for each chain.
-    #[arg(long = "workers", default_value = "12")]
+    #[arg(long, default_value = "1")]
-    pub workers: usize,
+    pub number_of_nodes: usize,
+
+    /// Determines the amount of threads that will will be used.
+    #[arg(long, default_value = "12")]
+    pub number_of_threads: usize,
 
     /// Extract problems back to the test corpus.
     #[arg(short, long = "extract-problems")]
@@ -159,7 +163,9 @@ impl Default for Arguments {
 /// The Solidity compatible node implementation.
 ///
 /// This describes the solutions to be tested against on a high level.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Serialize, Deserialize)]
+#[derive(
+    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, ValueEnum, Serialize, Deserialize,
+)]
 #[clap(rename_all = "lower")]
 pub enum TestingPlatform {
     /// The go-ethereum reference full node EVM implementation.

crates/core/Cargo.toml

@@ -24,9 +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 }
-rayon = { workspace = true }
 semver = { workspace = true }
 temp-dir = { workspace = true }

crates/core/src/lib.rs

@@ -26,7 +26,7 @@ pub trait Platform {
 pub struct Geth;
 
 impl Platform for Geth {
-    type Blockchain = geth::Instance;
+    type Blockchain = geth::GethNode;
     type Compiler = solc::Solc;
 
     fn config_id() -> TestingPlatform {

crates/core/src/main.rs

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

crates/format/Cargo.toml

@@ -19,3 +19,6 @@ tracing = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
+
+[dev-dependencies]
+tokio = { workspace = true }

crates/format/src/case.rs

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

crates/format/src/corpus.rs

@@ -17,7 +17,25 @@ 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)?;
-        Ok(serde_json::from_reader(file)?)
+        let mut corpus: Corpus = serde_json::from_reader(file)?;
+
+        // Ensure that the path mentioned in the corpus is relative to the corpus file.
+        // Canonicalizing also helps make the path in any errors unambiguous.
+        corpus.path = path
+            .parent()
+            .ok_or_else(|| {
+                anyhow::anyhow!("Corpus path '{}' does not point to a file", path.display())
+            })?
+            .canonicalize()
+            .map_err(|error| {
+                anyhow::anyhow!(
+                    "Failed to canonicalize path to corpus '{}': {error}",
+                    path.display()
+                )
+            })?
+            .join(corpus.path);
+
+        Ok(corpus)
     }
 
     /// Scan the corpus base directory and return all tests found.
@@ -35,6 +53,7 @@ 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) => {
@@ -64,4 +83,17 @@ pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
                 }
             }
         }
+    } else {
+        let Some(extension) = path.extension() else {
+            tracing::error!("Failed to get file extension");
+            return;
+        };
+        if extension.eq_ignore_ascii_case("sol") || extension.eq_ignore_ascii_case("json") {
+            if let Some(metadata) = MetadataFile::try_from_file(path) {
+                tests.push(metadata)
+            }
+        } else {
+            tracing::error!(?extension, "Unsupported file extension");
+        }
+    }
 }

crates/format/src/input.rs

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 
 use alloy::{
     eips::BlockNumberOrTag,
+    hex::ToHexExt,
     json_abi::JsonAbi,
     network::TransactionBuilder,
     primitives::{Address, Bytes, U256},
@@ -30,6 +31,7 @@ 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, Deserialize, Eq, PartialEq)]
@@ -136,6 +138,8 @@ enum Operation {
     BitwiseAnd,
     BitwiseOr,
     BitwiseXor,
+    ShiftLeft,
+    ShiftRight,
 }
 
 /// Specify how the contract is called.
@@ -164,6 +168,14 @@ define_wrapper_type!(
     pub struct EtherValue(U256);
 );
 
+#[derive(Clone, Debug, Default, 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!(
@@ -186,16 +198,18 @@ impl Input {
             .ok_or_else(|| anyhow::anyhow!("instance {instance:?} not deployed"))
     }
 
-    pub fn encoded_input(
+    pub async fn encoded_input<'a>(
-        &self,
+        &'a self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<Bytes> {
         match self.method {
             Method::Deployer | Method::Fallback => {
                 let calldata = self
                     .calldata
-                    .calldata(deployed_contracts, chain_state_provider)?;
+                    .calldata(deployed_contracts, variables, resolver)
+                    .await?;
 
                 Ok(calldata.into())
             }
@@ -241,11 +255,9 @@ 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.calldata_into_slice(
+                self.calldata
-                    &mut calldata,
+                    .calldata_into_slice(&mut calldata, deployed_contracts, variables, resolver)
-                    deployed_contracts,
+                    .await?;
-                    chain_state_provider,
-                )?;
 
                 Ok(calldata.into())
             }
@@ -253,12 +265,15 @@ impl Input {
     }
 
     /// Parse this input into a legacy transaction.
-    pub fn legacy_transaction(
+    pub async fn legacy_transaction<'a>(
-        &self,
+        &'a self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<TransactionRequest> {
-        let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?;
+        let input_data = self
+            .encoded_input(deployed_contracts, variables, resolver)
+            .await?;
         let transaction_request = TransactionRequest::default().from(self.caller).value(
             self.value
                 .map(|value| value.into_inner())
@@ -336,21 +351,24 @@ impl Calldata {
         }
     }
 
-    pub fn calldata(
+    pub async fn calldata<'a>(
-        &self,
+        &'a self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<Vec<u8>> {
         let mut buffer = Vec::<u8>::with_capacity(self.size_requirement());
-        self.calldata_into_slice(&mut buffer, deployed_contracts, chain_state_provider)?;
+        self.calldata_into_slice(&mut buffer, deployed_contracts, variables, resolver)
+            .await?;
         Ok(buffer)
     }
 
-    pub fn calldata_into_slice(
+    pub async fn calldata_into_slice<'a>(
-        &self,
+        &'a self,
         buffer: &mut Vec<u8>,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<()> {
         match self {
             Calldata::Single(bytes) => {
@@ -358,7 +376,10 @@ impl Calldata {
             }
             Calldata::Compound(items) => {
                 for (arg_idx, arg) in items.iter().enumerate() {
-                    match arg.resolve(deployed_contracts, chain_state_provider) {
+                    match arg
+                        .resolve(deployed_contracts, variables.clone(), resolver)
+                        .await
+                    {
                         Ok(resolved) => {
                             buffer.extend(resolved.to_be_bytes::<32>());
                         }
@@ -381,11 +402,12 @@ impl Calldata {
     }
 
     /// Checks if this [`Calldata`] is equivalent to the passed calldata bytes.
-    pub fn is_equivalent(
+    pub async fn is_equivalent<'a>(
-        &self,
+        &'a self,
         other: &[u8],
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<bool> {
         match self {
             Calldata::Single(calldata) => Ok(calldata == other),
@@ -407,7 +429,9 @@ impl Calldata {
                         std::borrow::Cow::Borrowed(other)
                     };
 
-                    let this = this.resolve(deployed_contracts, chain_state_provider)?;
+                    let this = this
+                        .resolve(deployed_contracts, variables.clone(), resolver)
+                        .await?;
                     let other = U256::from_be_slice(&other);
                     if this != other {
                         return Ok(false);
@@ -420,18 +444,19 @@ impl Calldata {
 }
 
 impl CalldataItem {
-    fn resolve(
+    async fn resolve<'a>(
-        &self,
+        &'a self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<U256> {
         let mut stack = Vec::<CalldataToken<U256>>::new();
 
         for token in self
             .calldata_tokens()
-            .map(|token| token.resolve(deployed_contracts, chain_state_provider))
+            .map(|token| token.resolve(deployed_contracts, variables.clone(), resolver))
         {
-            let token = token?;
+            let token = token.await?;
             let new_token = match token {
                 CalldataToken::Item(_) => token,
                 CalldataToken::Operation(operation) => {
@@ -452,8 +477,14 @@ 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)?)
                         }
-                    .context("Invalid calldata arithmetic operation")?;
+                        Operation::ShiftRight => {
+                            Some(left_operand >> usize::try_from(right_operand)?)
+                        }
+                    }
+                    .context("Invalid calldata arithmetic operation - Invalid operation")?;
 
                     CalldataToken::Item(result)
                 }
@@ -464,8 +495,17 @@ 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)] => Ok(*item),
+            [CalldataToken::Item(item)] => {
-            _ => Err(anyhow::anyhow!("Invalid calldata arithmetic operation")),
+                tracing::debug!(
+                    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"
+            )),
         }
     }
 
@@ -478,6 +518,8 @@ 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),
         })
     }
@@ -494,6 +536,7 @@ impl<T> CalldataToken<T> {
     const BLOCK_HASH_VARIABLE_PREFIX: &str = "$BLOCK_HASH";
     const BLOCK_NUMBER_VARIABLE: &str = "$BLOCK_NUMBER";
     const BLOCK_TIMESTAMP_VARIABLE: &str = "$BLOCK_TIMESTAMP";
+    const VARIABLE_PREFIX: &str = "$VARIABLE:";
 
     fn into_item(self) -> Option<T> {
         match self {
@@ -512,10 +555,11 @@ 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
-    fn resolve(
+    async fn resolve<'a>(
         self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<CalldataToken<U256>> {
         match self {
             Self::Item(item) => {
@@ -545,18 +589,17 @@ impl<T: AsRef<str>> CalldataToken<T> {
                         anyhow::anyhow!("Invalid hexadecimal literal: {}", error)
                     })?)
                 } else if item == Self::CHAIN_VARIABLE {
-                    let chain_id = chain_state_provider.chain_id()?;
+                    let chain_id = resolver.chain_id().await?;
                     Ok(U256::from(chain_id))
                 } else if item == Self::GAS_LIMIT_VARIABLE {
-                    let gas_limit =
+                    let gas_limit = resolver.block_gas_limit(BlockNumberOrTag::Latest).await?;
-                        chain_state_provider.block_gas_limit(BlockNumberOrTag::Latest)?;
                     Ok(U256::from(gas_limit))
                 } else if item == Self::COINBASE_VARIABLE {
-                    let coinbase = chain_state_provider.block_coinbase(BlockNumberOrTag::Latest)?;
+                    let coinbase = resolver.block_coinbase(BlockNumberOrTag::Latest).await?;
                     Ok(U256::from_be_slice(coinbase.as_ref()))
                 } else if item == Self::DIFFICULTY_VARIABLE {
                     let block_difficulty =
-                        chain_state_provider.block_difficulty(BlockNumberOrTag::Latest)?;
+                        resolver.block_difficulty(BlockNumberOrTag::Latest).await?;
                     Ok(block_difficulty)
                 } else if item.starts_with(Self::BLOCK_HASH_VARIABLE_PREFIX) {
                     let offset: u64 = item
@@ -565,20 +608,28 @@ impl<T: AsRef<str>> CalldataToken<T> {
                         .and_then(|value| value.parse().ok())
                         .unwrap_or_default();
 
-                    let current_block_number = chain_state_provider.last_block_number()?;
+                    let current_block_number = resolver.last_block_number().await?;
                     let desired_block_number = current_block_number - offset;
 
-                    let block_hash =
+                    let block_hash = resolver.block_hash(desired_block_number.into()).await?;
-                        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 = chain_state_provider.last_block_number()?;
+                    let current_block_number = resolver.last_block_number().await?;
                     Ok(U256::from(current_block_number))
                 } else if item == Self::BLOCK_TIMESTAMP_VARIABLE {
-                    let timestamp =
+                    let timestamp = resolver.block_timestamp(BlockNumberOrTag::Latest).await?;
-                        chain_state_provider.block_timestamp(BlockNumberOrTag::Latest)?;
                     Ok(U256::from(timestamp))
+                } else if let Some(variable_name) = item.strip_prefix(Self::VARIABLE_PREFIX) {
+                    let Some(variables) = variables.into() else {
+                        anyhow::bail!(
+                            "Variable resolution required but no variables were passed in"
+                        );
+                    };
+                    let Some(variable) = variables.get(variable_name) else {
+                        anyhow::bail!("No variable found with the name {}", variable_name)
+                    };
+                    Ok(*variable)
                 } else {
                     Ok(U256::from_str_radix(item, 10)
                         .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))?)
@@ -628,43 +679,46 @@ mod tests {
     struct MockResolver;
 
     impl ResolverApi for MockResolver {
-        fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
+        async fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
             Ok(0x123)
         }
 
-        fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
+        async fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
             Ok(0x1234)
         }
 
-        fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<Address> {
+        async fn block_coinbase(
+            &self,
+            _: alloy::eips::BlockNumberOrTag,
+        ) -> anyhow::Result<Address> {
             Ok(Address::ZERO)
         }
 
-        fn block_difficulty(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<U256> {
+        async fn block_difficulty(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<U256> {
             Ok(U256::from(0x12345u128))
         }
 
-        fn block_hash(
+        async fn block_hash(
             &self,
             _: alloy::eips::BlockNumberOrTag,
         ) -> anyhow::Result<alloy_primitives::BlockHash> {
             Ok([0xEE; 32].into())
         }
 
-        fn block_timestamp(
+        async fn block_timestamp(
             &self,
             _: alloy::eips::BlockNumberOrTag,
         ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
             Ok(0x123456)
         }
 
-        fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
+        async fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
             Ok(0x1234567)
         }
     }
 
-    #[test]
+    #[tokio::test]
-    fn test_encoded_input_uint256() {
+    async fn test_encoded_input_uint256() {
         let raw_metadata = r#"
             [
                 {
@@ -699,7 +753,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (u64,);
@@ -707,8 +764,8 @@ mod tests {
         assert_eq!(decoded.0, 42);
     }
 
-    #[test]
+    #[tokio::test]
-    fn test_encoded_input_address_with_signature() {
+    async fn test_encoded_input_address_with_signature() {
         let raw_abi = r#"[
         {
             "inputs": [{"name": "recipient", "type": "address"}],
@@ -741,7 +798,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (alloy_primitives::Address,);
@@ -752,8 +812,8 @@ mod tests {
         );
     }
 
-    #[test]
+    #[tokio::test]
-    fn test_encoded_input_address() {
+    async fn test_encoded_input_address() {
         let raw_abi = r#"[
         {
             "inputs": [{"name": "recipient", "type": "address"}],
@@ -786,7 +846,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let encoded = input.encoded_input(&contracts, &MockResolver).unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (alloy_primitives::Address,);
@@ -797,50 +860,57 @@ mod tests {
         );
     }
 
-    fn resolve_calldata_item(
+    async fn resolve_calldata_item(
         input: &str,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl ResolverApi,
+        resolver: &impl ResolverApi,
     ) -> anyhow::Result<U256> {
-        CalldataItem::new(input).resolve(deployed_contracts, chain_state_provider)
+        CalldataItem::new(input)
+            .resolve(deployed_contracts, None, resolver)
+            .await
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_chain_id_variable() {
+    async fn resolver_can_resolve_chain_id_variable() {
         // Arrange
         let input = "$CHAIN_ID";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
-        assert_eq!(resolved, U256::from(MockResolver.chain_id().unwrap()))
+        assert_eq!(resolved, U256::from(MockResolver.chain_id().await.unwrap()))
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_gas_limit_variable() {
+    async fn resolver_can_resolve_gas_limit_variable() {
         // Arrange
         let input = "$GAS_LIMIT";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            U256::from(MockResolver.block_gas_limit(Default::default()).unwrap())
+            U256::from(
+                MockResolver
+                    .block_gas_limit(Default::default())
+                    .await
+                    .unwrap()
+            )
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_coinbase_variable() {
+    async fn resolver_can_resolve_coinbase_variable() {
         // Arrange
         let input = "$COINBASE";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
@@ -849,163 +919,172 @@ mod tests {
             U256::from_be_slice(
                 MockResolver
                     .block_coinbase(Default::default())
+                    .await
                     .unwrap()
                     .as_ref()
             )
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_block_difficulty_variable() {
+    async fn resolver_can_resolve_block_difficulty_variable() {
         // Arrange
         let input = "$DIFFICULTY";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            MockResolver.block_difficulty(Default::default()).unwrap()
+            MockResolver
+                .block_difficulty(Default::default())
+                .await
+                .unwrap()
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_block_hash_variable() {
+    async fn resolver_can_resolve_block_hash_variable() {
         // Arrange
         let input = "$BLOCK_HASH";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            U256::from_be_bytes(MockResolver.block_hash(Default::default()).unwrap().0)
+            U256::from_be_bytes(MockResolver.block_hash(Default::default()).await.unwrap().0)
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_block_number_variable() {
+    async fn resolver_can_resolve_block_number_variable() {
         // Arrange
         let input = "$BLOCK_NUMBER";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            U256::from(MockResolver.last_block_number().unwrap())
+            U256::from(MockResolver.last_block_number().await.unwrap())
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn resolver_can_resolve_block_timestamp_variable() {
+    async fn resolver_can_resolve_block_timestamp_variable() {
         // Arrange
         let input = "$BLOCK_TIMESTAMP";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            U256::from(MockResolver.block_timestamp(Default::default()).unwrap())
+            U256::from(
+                MockResolver
+                    .block_timestamp(Default::default())
+                    .await
+                    .unwrap()
+            )
         )
     }
 
-    #[test]
+    #[tokio::test]
-    fn simple_addition_can_be_resolved() {
+    async fn simple_addition_can_be_resolved() {
         // Arrange
         let input = "2 4 +";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(resolved, U256::from(6));
     }
 
-    #[test]
+    #[tokio::test]
-    fn simple_subtraction_can_be_resolved() {
+    async fn simple_subtraction_can_be_resolved() {
         // Arrange
         let input = "4 2 -";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(resolved, U256::from(2));
     }
 
-    #[test]
+    #[tokio::test]
-    fn simple_multiplication_can_be_resolved() {
+    async fn simple_multiplication_can_be_resolved() {
         // Arrange
         let input = "4 2 *";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(resolved, U256::from(8));
     }
 
-    #[test]
+    #[tokio::test]
-    fn simple_division_can_be_resolved() {
+    async fn simple_division_can_be_resolved() {
         // Arrange
         let input = "4 2 /";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(resolved, U256::from(2));
     }
 
-    #[test]
+    #[tokio::test]
-    fn arithmetic_errors_are_not_panics() {
+    async fn arithmetic_errors_are_not_panics() {
         // Arrange
         let input = "4 0 /";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         assert!(resolved.is_err())
     }
 
-    #[test]
+    #[tokio::test]
-    fn arithmetic_with_resolution_works() {
+    async fn arithmetic_with_resolution_works() {
         // Arrange
         let input = "$BLOCK_NUMBER 10 +";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         let resolved = resolved.expect("Failed to resolve argument");
         assert_eq!(
             resolved,
-            U256::from(MockResolver.last_block_number().unwrap() + 10)
+            U256::from(MockResolver.last_block_number().await.unwrap() + 10)
         );
     }
 
-    #[test]
+    #[tokio::test]
-    fn incorrect_number_of_arguments_errors() {
+    async fn incorrect_number_of_arguments_errors() {
         // Arrange
         let input = "$BLOCK_NUMBER 10 + +";
 
         // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver);
+        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
 
         // Assert
         assert!(resolved.is_err())

crates/format/src/metadata.rs

@@ -310,17 +310,23 @@ impl FromStr for ContractPathAndIdent {
                 identifier = Some(next_item.to_owned())
             }
         }
-        let Some(path) = path else {
+        match (path, identifier) {
-            anyhow::bail!("Path is not defined");
+            (Some(path), Some(identifier)) => Ok(Self {
-        };
+                contract_source_path: PathBuf::from(path),
-        let Some(identifier) = identifier else {
+                contract_ident: ContractIdent::new(identifier),
-            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 {

crates/format/src/traits.rs

@@ -6,25 +6,28 @@ use anyhow::Result;
 /// 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) -> Result<ChainId>;
+    fn chain_id(&self) -> impl Future<Output = Result<ChainId>>;
 
     // TODO: This is currently a u128 due to Kitchensink needing more than 64 bits for its gas limit
     // when we implement the changes to the gas we need to adjust this to be a u64.
     /// Returns the gas limit of the specified block.
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> Result<u128>;
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u128>>;
 
     /// Returns the coinbase of the specified block.
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> Result<Address>;
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<Address>>;
 
     /// Returns the difficulty of the specified block.
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> Result<U256>;
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<U256>>;
 
     /// Returns the hash of the specified block.
-    fn block_hash(&self, number: BlockNumberOrTag) -> Result<BlockHash>;
+    fn block_hash(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<BlockHash>>;
 
     /// Returns the timestamp of the specified block,
-    fn block_timestamp(&self, number: BlockNumberOrTag) -> Result<BlockTimestamp>;
+    fn block_timestamp(
+        &self,
+        number: BlockNumberOrTag,
+    ) -> impl Future<Output = Result<BlockTimestamp>>;
 
     /// Returns the number of the last block.
-    fn last_block_number(&self) -> Result<BlockNumber>;
+    fn last_block_number(&self) -> impl Future<Output = Result<BlockNumber>>;
 }

crates/node-interaction/src/lib.rs

@@ -7,15 +7,18 @@ 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(&self, transaction: TransactionRequest) -> Result<TransactionReceipt>;
+    fn execute_transaction(
+        &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,
-    ) -> Result<GethTrace>;
+    ) -> impl Future<Output = Result<GethTrace>>;
 
     /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, receipt: &TransactionReceipt) -> Result<DiffMode>;
+    fn state_diff(&self, receipt: &TransactionReceipt) -> impl Future<Output = Result<DiffMode>>;
 }

crates/node/src/geth.rs

@@ -3,9 +3,13 @@
 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::atomic::{AtomicU32, Ordering},
+    sync::{
+        Arc,
+        atomic::{AtomicU32, Ordering},
+    },
     time::{Duration, Instant},
 };
 
@@ -25,11 +29,12 @@ use alloy::{
     },
     signers::local::PrivateKeySigner,
 };
-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};
 
@@ -43,7 +48,7 @@ static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 ///
 /// Prunes the child process and the base directory on drop.
 #[derive(Debug)]
-pub struct Instance {
+pub struct GethNode {
     connection_string: String,
     base_directory: PathBuf,
     data_directory: PathBuf,
@@ -62,7 +67,7 @@ pub struct Instance {
     logs_file_to_flush: Vec<File>,
 }
 
-impl Instance {
+impl GethNode {
     const BASE_DIRECTORY: &str = "geth";
     const DATA_DIRECTORY: &str = "data";
     const LOGS_DIRECTORY: &str = "logs";
@@ -77,10 +82,17 @@ impl Instance {
     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)?;
 
@@ -99,6 +111,8 @@ impl Instance {
         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)
@@ -152,6 +166,16 @@ impl Instance {
             .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()?
@@ -240,25 +264,18 @@ impl Instance {
     }
 }
 
-impl EthereumNode for Instance {
+impl EthereumNode for GethNode {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn execute_transaction(
+    async fn execute_transaction(
         &self,
         transaction: TransactionRequest,
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let provider = self.provider();
+        let span = tracing::debug_span!("Submitting transaction", ?transaction);
-        BlockingExecutor::execute(async move {
-            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
-            let _outer_guard = outer_span.enter();
-
-            let provider = provider.await?;
-
-            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();
 
+        let provider = Arc::new(self.provider().await?);
+        let transaction_hash = *provider.send_transaction(transaction).await?.tx_hash();
+
         // The following is a fix for the "transaction indexing is in progress" error that we
         // used to get. You can find more information on this in the following GH issue in geth
         // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on,
@@ -277,68 +294,76 @@ impl EthereumNode for Instance {
         // 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.
-            let mut retries = 0;
+        poll(
-            let mut total_wait_duration = Duration::from_secs(0);
+            Self::RECEIPT_POLLING_DURATION,
-            let max_allowed_wait_duration = Duration::from_secs(5 * 60);
+            Default::default(),
-            loop {
+            move || {
-                if total_wait_duration >= max_allowed_wait_duration {
+                let provider = provider.clone();
-                    tracing::error!(
+                async move {
-                        ?total_wait_duration,
+                    match provider.get_transaction_receipt(transaction_hash).await {
-                        ?max_allowed_wait_duration,
+                        Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
-                        retry_count = retries,
+                        Ok(None) => Ok(ControlFlow::Continue(())),
-                        "Failed to get receipt after polling for it"
-                    );
-                    anyhow::bail!(
-                        "Polled for receipt for {total_wait_duration:?} but failed to get it"
-                    );
-                }
-
-                match provider.get_transaction_receipt(*transaction_hash).await {
-                    Ok(Some(receipt)) => break Ok(receipt),
-                    Ok(None) => {}
                         Err(error) => {
                             let error_string = error.to_string();
-                        if !error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+                            match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
-                            break Err(error.into());
+                                true => Ok(ControlFlow::Continue(())),
+                                false => 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;
                     }
-        })?
+                }
+            },
+        )
+        .instrument(tracing::info_span!(
+            "Awaiting transaction receipt",
+            ?transaction_hash
+        ))
+        .await
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn trace_transaction(
+    async fn trace_transaction(
         &self,
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let tx_hash = transaction.transaction_hash;
+        let provider = Arc::new(self.provider().await?);
-        let provider = self.provider();
+        poll(
-        BlockingExecutor::execute(async move {
+            Self::TRACE_POLLING_DURATION,
-            Ok(provider
+            Default::default(),
-                .await?
+            move || {
-                .debug_trace_transaction(tx_hash, trace_options)
+                let provider = provider.clone();
-                .await?)
+                let trace_options = trace_options.clone();
-        })?
+                async move {
+                    match provider
+                        .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                        .await
+                    {
+                        Ok(trace) => Ok(ControlFlow::Break(trace)),
+                        Err(error) => {
+                            let error_string = error.to_string();
+                            match error_string.contains(Self::TRANSACTION_TRACING_ERROR) {
+                                true => Ok(ControlFlow::Continue(())),
+                                false => Err(error.into()),
+                            }
+                        }
+                    }
+                }
+            },
+        )
+        .await
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    async 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),
@@ -347,90 +372,77 @@ impl EthereumNode for Instance {
     }
 }
 
-impl ResolverApi for Instance {
+impl ResolverApi for GethNode {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
+            .await?
-            provider.await?.get_chain_id().await.map_err(Into::into)
+            .get_chain_id()
-        })?
+            .await
+            .map_err(Into::into)
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
             .map(|block| block.header.gas_limit as _)
-        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        let provider = self.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))]
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
             .map(|block| block.header.difficulty)
-        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
             .map(|block| block.header.hash)
-        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        let provider = self.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))]
-    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
+            .await?
-            provider.await?.get_block_number().await.map_err(Into::into)
+            .get_block_number()
-        })?
+            .await
+            .map_err(Into::into)
     }
 }
 
-impl Node for Instance {
+impl Node for GethNode {
     fn new(config: &Arguments) -> Self {
         let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
@@ -518,7 +530,7 @@ impl Node for Instance {
     }
 }
 
-impl Drop for Instance {
+impl Drop for GethNode {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn drop(&mut self) {
         self.shutdown().expect("Failed to shutdown")
@@ -543,9 +555,9 @@ mod tests {
         (config, temp_dir)
     }
 
-    fn new_node() -> (Instance, TempDir) {
+    fn new_node() -> (GethNode, TempDir) {
         let (args, temp_dir) = test_config();
-        let mut node = Instance::new(&args);
+        let mut node = GethNode::new(&args);
         node.init(GENESIS_JSON.to_owned())
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -555,110 +567,110 @@ mod tests {
 
     #[test]
     fn init_works() {
-        Instance::new(&test_config().0)
+        GethNode::new(&test_config().0)
             .init(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn spawn_works() {
-        Instance::new(&test_config().0)
+        GethNode::new(&test_config().0)
             .spawn(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn version_works() {
-        let version = Instance::new(&test_config().0).version().unwrap();
+        let version = GethNode::new(&test_config().0).version().unwrap();
         assert!(
             version.starts_with("geth version"),
             "expected version string, got: '{version}'"
         );
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_chain_id_from_node() {
+    async fn can_get_chain_id_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let chain_id = node.chain_id();
+        let chain_id = node.chain_id().await;
 
         // Assert
         let chain_id = chain_id.expect("Failed to get the chain id");
         assert_eq!(chain_id, 420_420_420);
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_gas_limit_from_node() {
+    async fn can_get_gas_limit_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
 
         // Assert
         let gas_limit = gas_limit.expect("Failed to get the gas limit");
         assert_eq!(gas_limit, u32::MAX as u128)
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_coinbase_from_node() {
+    async fn can_get_coinbase_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
 
         // Assert
         let coinbase = coinbase.expect("Failed to get the coinbase");
         assert_eq!(coinbase, Address::new([0xFF; 20]))
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_difficulty_from_node() {
+    async fn can_get_block_difficulty_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
 
         // Assert
         let block_difficulty = block_difficulty.expect("Failed to get the block difficulty");
         assert_eq!(block_difficulty, U256::ZERO)
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_hash_from_node() {
+    async fn can_get_block_hash_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = block_hash.expect("Failed to get the block hash");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_timestamp_from_node() {
+    async fn can_get_block_timestamp_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = block_timestamp.expect("Failed to get the block timestamp");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_number_from_node() {
+    async fn can_get_block_number_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_number = node.last_block_number();
+        let block_number = node.last_block_number().await;
 
         // Assert
         let block_number = block_number.expect("Failed to get the block number");

crates/node/src/kitchensink.rs

@@ -30,6 +30,7 @@ use alloy::{
     },
     signers::local::PrivateKeySigner,
 };
+use revive_dt_common::fs::clear_directory;
 use revive_dt_format::traits::ResolverApi;
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
@@ -37,7 +38,6 @@ 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;
 
@@ -86,6 +86,9 @@ 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)?;
 
@@ -206,7 +209,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(30),
+            Duration::from_secs(60),
         ) {
             tracing::error!(
                 ?error,
@@ -235,7 +238,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(30),
+            Duration::from_secs(60),
         ) {
             tracing::error!(?error, "Failed to start proxy, shutting down gracefully");
             self.shutdown()?;
@@ -377,49 +380,46 @@ impl KitchensinkNode {
 
 impl EthereumNode for KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn execute_transaction(
+    async fn execute_transaction(
         &self,
         transaction: alloy::rpc::types::TransactionRequest,
     ) -> anyhow::Result<TransactionReceipt> {
         tracing::debug!(?transaction, "Submitting transaction");
-        let provider = self.provider();
+        let receipt = self
-        let receipt = BlockingExecutor::execute(async move {
+            .provider()
-            Ok(provider
             .await?
             .send_transaction(transaction)
             .await?
             .get_receipt()
-                .await?)
+            .await?;
-        })?;
         tracing::info!(?receipt, "Submitted tx to kitchensink");
-        receipt
+        Ok(receipt)
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn trace_transaction(
+    async fn trace_transaction(
         &self,
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
         let tx_hash = transaction.transaction_hash;
-        let provider = self.provider();
+        Ok(self
-        BlockingExecutor::execute(async move {
+            .provider()
-            Ok(provider
             .await?
             .debug_trace_transaction(tx_hash, trace_options)
             .await?)
-        })?
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    async 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),
@@ -429,85 +429,72 @@ impl EthereumNode for KitchensinkNode {
 }
 
 impl ResolverApi for KitchensinkNode {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
+            .await?
-            provider.await?.get_chain_id().await.map_err(Into::into)
+            .get_chain_id()
-        })?
+            .await
+            .map_err(Into::into)
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.gas_limit)
+            .map(|block| block.header.gas_limit as _)
-        })?
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        let provider = self.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))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
             .map(|block| block.header.difficulty)
-        })?
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
-            provider
             .await?
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
             .map(|block| block.header.hash)
-        })?
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        let provider = self.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))]
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        let provider = self.provider();
+        self.provider()
-        BlockingExecutor::execute(async move {
+            .await?
-            provider.await?.get_block_number().await.map_err(Into::into)
+            .get_block_number()
-        })?
+            .await
+            .map_err(Into::into)
     }
 }
 
@@ -1043,26 +1030,21 @@ 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, TempDir) {
+    fn test_config() -> Arguments {
-        let mut config = Arguments::default();
+        Arguments {
-        let temp_dir = TempDir::new().unwrap();
+            kitchensink: PathBuf::from("substrate-node"),
-
+            eth_proxy: PathBuf::from("eth-rpc"),
-        config.working_directory = temp_dir.path().to_path_buf().into();
+            ..Default::default()
-
+        }
-        config.kitchensink = PathBuf::from("substrate-node");
-        config.eth_proxy = PathBuf::from("eth-rpc");
-
-        (config, temp_dir)
     }
 
-    fn new_node() -> (KitchensinkNode, Arguments, TempDir) {
+    fn new_node() -> (KitchensinkNode, Arguments) {
         // 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
@@ -1081,20 +1063,20 @@ mod tests {
         static NODE_START_MUTEX: Mutex<()> = Mutex::new(());
         let _guard = NODE_START_MUTEX.lock().unwrap();
 
-        let (args, temp_dir) = test_config();
+        let args = 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, temp_dir)
+        (node, args)
     }
 
     /// A shared node that multiple tests can use. It starts up once.
     fn shared_node() -> &'static KitchensinkNode {
-        static NODE: LazyLock<(KitchensinkNode, TempDir)> = LazyLock::new(|| {
+        static NODE: LazyLock<(KitchensinkNode, Arguments)> = LazyLock::new(|| {
-            let (node, _, temp_dir) = new_node();
+            let (node, args) = new_node();
-            (node, temp_dir)
+            (node, args)
         });
         &NODE.0
     }
@@ -1102,7 +1084,7 @@ mod tests {
     #[tokio::test]
     async fn node_mines_simple_transfer_transaction_and_returns_receipt() {
         // Arrange
-        let (node, args, _temp_dir) = new_node();
+        let (node, args) = new_node();
 
         let provider = node.provider().await.expect("Failed to create provider");
 
@@ -1137,7 +1119,7 @@ mod tests {
         }
         "#;
 
-        let mut dummy_node = KitchensinkNode::new(&test_config().0);
+        let mut dummy_node = KitchensinkNode::new(&test_config());
 
         // Call `init()`
         dummy_node.init(genesis_content).expect("init failed");
@@ -1181,7 +1163,7 @@ mod tests {
         }
         "#;
 
-        let node = KitchensinkNode::new(&test_config().0);
+        let node = KitchensinkNode::new(&test_config());
 
         let result = node
             .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
@@ -1252,15 +1234,16 @@ mod tests {
 
     #[test]
     fn spawn_works() {
-        let (config, _temp_dir) = test_config();
+        let config = test_config();
 
         let mut node = KitchensinkNode::new(&config);
+
         node.spawn(GENESIS_JSON.to_string()).unwrap();
     }
 
     #[test]
     fn version_works() {
-        let (config, _temp_dir) = test_config();
+        let config = test_config();
 
         let node = KitchensinkNode::new(&config);
         let version = node.version().unwrap();
@@ -1273,7 +1256,7 @@ mod tests {
 
     #[test]
     fn eth_rpc_version_works() {
-        let (config, _temp_dir) = test_config();
+        let config = test_config();
 
         let node = KitchensinkNode::new(&config);
         let version = node.eth_rpc_version().unwrap();
@@ -1284,86 +1267,86 @@ mod tests {
         );
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_chain_id_from_node() {
+    async fn can_get_chain_id_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let chain_id = node.chain_id();
+        let chain_id = node.chain_id().await;
 
         // Assert
         let chain_id = chain_id.expect("Failed to get the chain id");
         assert_eq!(chain_id, 420_420_420);
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_gas_limit_from_node() {
+    async fn can_get_gas_limit_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = gas_limit.expect("Failed to get the gas limit");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_coinbase_from_node() {
+    async fn can_get_coinbase_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = coinbase.expect("Failed to get the coinbase");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_difficulty_from_node() {
+    async fn can_get_block_difficulty_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = block_difficulty.expect("Failed to get the block difficulty");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_hash_from_node() {
+    async fn can_get_block_hash_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = block_hash.expect("Failed to get the block hash");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_timestamp_from_node() {
+    async fn can_get_block_timestamp_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
 
         // Assert
         let _ = block_timestamp.expect("Failed to get the block timestamp");
     }
 
-    #[test]
+    #[tokio::test]
-    fn can_get_block_number_from_node() {
+    async fn can_get_block_number_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_number = node.last_block_number();
+        let block_number = node.last_block_number().await;
 
         // Assert
         let _ = block_number.expect("Failed to get the block number");

crates/node/src/pool.rs

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

crates/solc-binaries/Cargo.toml

@@ -14,6 +14,7 @@ revive-dt-common = { workspace = true }
 anyhow = { workspace = true }
 hex = { workspace = true }
 tracing = { workspace = true }
+tokio = { workspace = true }
 reqwest = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }

crates/solc-binaries/src/cache.rs

@@ -6,37 +6,39 @@ use std::{
     io::{BufWriter, Write},
     os::unix::fs::PermissionsExt,
     path::{Path, PathBuf},
-    sync::{LazyLock, Mutex},
+    sync::LazyLock,
 };
 
-use crate::download::GHDownloader;
+use tokio::sync::Mutex;
+
+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) fn get_or_download(
+pub(crate) async fn get_or_download(
     working_directory: &Path,
-    downloader: &GHDownloader,
+    downloader: &SolcDownloader,
 ) -> 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().unwrap();
+    let mut cache = SOLC_CACHER.lock().await;
     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)?;
+    download_to_file(&target_file, downloader).await?;
     cache.insert(target_file.clone());
 
     Ok(target_file)
 }
 
-fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()> {
+async fn download_to_file(path: &Path, downloader: &SolcDownloader) -> anyhow::Result<()> {
     tracing::info!("caching file: {}", path.display());
 
     let Ok(file) = File::create_new(path) else {
@@ -52,7 +54,7 @@ fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()
     }
 
     let mut file = BufWriter::new(file);
-    file.write_all(&downloader.download()?)?;
+    file.write_all(&downloader.download().await?)?;
     file.flush()?;
     drop(file);
 

crates/solc-binaries/src/download.rs

@@ -25,12 +25,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 fn download(url: &'static str) -> anyhow::Result<Self> {
+    pub async 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::blocking::get(url)?.json()?;
+        let body: List = reqwest::get(url).await?.json().await?;
 
         LIST_CACHE.lock().unwrap().insert(url, body.clone());
 
@@ -38,23 +38,23 @@ impl List {
     }
 }
 
-/// Download solc binaries from GitHub releases (IPFS links aren't reliable).
+/// Download solc binaries from the official SolidityLang site
 #[derive(Clone, Debug)]
-pub struct GHDownloader {
+pub struct SolcDownloader {
     pub version: Version,
     pub target: &'static str,
     pub list: &'static str,
 }
 
-impl GHDownloader {
+impl SolcDownloader {
-    pub const BASE_URL: &str = "https://github.com/ethereum/solidity/releases/download";
+    pub const BASE_URL: &str = "https://binaries.soliditylang.org";
 
-    pub const LINUX_NAME: &str = "solc-static-linux";
+    pub const LINUX_NAME: &str = "linux-amd64";
-    pub const MACOSX_NAME: &str = "solc-macos";
+    pub const MACOSX_NAME: &str = "macosx-amd64";
-    pub const WINDOWS_NAME: &str = "solc-windows.exe";
+    pub const WINDOWS_NAME: &str = "windows-amd64";
-    pub const WASM_NAME: &str = "soljson.js";
+    pub const WASM_NAME: &str = "wasm";
 
-    fn new(
+    async fn new(
         version: impl Into<VersionOrRequirement>,
         target: &'static str,
         list: &'static str,
@@ -67,7 +67,8 @@ impl GHDownloader {
                 list,
             }),
             VersionOrRequirement::Requirement(requirement) => {
-                let Some(version) = List::download(list)?
+                let Some(version) = List::download(list)
+                    .await?
                     .builds
                     .into_iter()
                     .map(|build| build.version)
@@ -85,41 +86,43 @@ impl GHDownloader {
         }
     }
 
-    pub fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::LINUX_NAME, List::LINUX_URL)
+        Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
     }
 
-    pub fn macosx(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub async fn macosx(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL)
+        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL).await
     }
 
-    pub fn windows(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub async fn windows(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL)
+        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL).await
     }
 
-    pub fn wasm(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub async fn wasm(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::WASM_NAME, List::WASM_URL)
+        Self::new(version, Self::WASM_NAME, List::WASM_URL).await
-    }
-
-    /// 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 fn download(&self) -> anyhow::Result<Vec<u8>> {
+    pub async fn download(&self) -> anyhow::Result<Vec<u8>> {
         tracing::info!("downloading solc: {self:?}");
-        let expected_digest = List::download(self.list)?
+        let builds = List::download(self.list).await?.builds;
-            .builds
+        let build = builds
             .iter()
             .find(|build| build.version == self.version)
-            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
+            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))?;
-            .map(|b| b.sha256.strip_prefix("0x").unwrap_or(&b.sha256).to_string())?;
 
-        let file = reqwest::blocking::get(self.url())?.bytes()?.to_vec();
+        let path = build.path.clone();
+        let expected_digest = build
+            .sha256
+            .strip_prefix("0x")
+            .unwrap_or(&build.sha256)
+            .to_string();
+        let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
+
+        let file = reqwest::get(url).await?.bytes().await?.to_vec();
 
         if hex::encode(Sha256::digest(&file)) != expected_digest {
             anyhow::bail!("sha256 mismatch for solc version {}", self.version);
@@ -131,29 +134,58 @@ impl GHDownloader {
 
 #[cfg(test)]
 mod tests {
-    use crate::{download::GHDownloader, list::List};
+    use crate::{download::SolcDownloader, list::List};
 
-    #[test]
+    #[tokio::test]
-    fn try_get_windows() {
+    async fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL).unwrap().latest_release;
+        let version = List::download(List::WINDOWS_URL)
-        GHDownloader::windows(version).unwrap().download().unwrap();
+            .await
+            .unwrap()
+            .latest_release;
+        SolcDownloader::windows(version)
+            .await
+            .unwrap()
+            .download()
+            .await
+            .unwrap();
     }
 
-    #[test]
+    #[tokio::test]
-    fn try_get_macosx() {
+    async fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL).unwrap().latest_release;
+        let version = List::download(List::MACOSX_URL)
-        GHDownloader::macosx(version).unwrap().download().unwrap();
+            .await
+            .unwrap()
+            .latest_release;
+        SolcDownloader::macosx(version)
+            .await
+            .unwrap()
+            .download()
+            .await
+            .unwrap();
     }
 
-    #[test]
+    #[tokio::test]
-    fn try_get_linux() {
+    async fn try_get_linux() {
-        let version = List::download(List::LINUX_URL).unwrap().latest_release;
+        let version = List::download(List::LINUX_URL)
-        GHDownloader::linux(version).unwrap().download().unwrap();
+            .await
+            .unwrap()
+            .latest_release;
+        SolcDownloader::linux(version)
+            .await
+            .unwrap()
+            .download()
+            .await
+            .unwrap();
     }
 
-    #[test]
+    #[tokio::test]
-    fn try_get_wasm() {
+    async fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).unwrap().latest_release;
+        let version = List::download(List::WASM_URL).await.unwrap().latest_release;
-        GHDownloader::wasm(version).unwrap().download().unwrap();
+        SolcDownloader::wasm(version)
+            .await
+            .unwrap()
+            .download()
+            .await
+            .unwrap();
     }
 }

crates/solc-binaries/src/lib.rs

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