save before flight

* Update compiler semaphore

* Fix the fallback gas for substrate chains

* Fix the concurrency & the substrate gas limit fallback value

.github/workflows/test.yml

@@ -15,6 +15,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
+  POLKADOT_VERSION: polkadot-stable2506-2
 
 jobs:
   cache-polkadot:
@@ -66,6 +67,37 @@ jobs:
           cd polkadot-sdk
           cargo install --path substrate/frame/revive/rpc --bin eth-rpc
       
+      - name: Cache downloaded Polkadot binaries
+        id: cache-polkadot
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/polkadot-cache/polkadot
+            ~/polkadot-cache/polkadot-execute-worker
+            ~/polkadot-cache/polkadot-prepare-worker
+            ~/polkadot-cache/polkadot-parachain
+          key: polkadot-downloaded-${{ matrix.os }}-${{ env.POLKADOT_VERSION }}
+
+      - name: Download Polkadot binaries on macOS
+        if: matrix.os == 'macos-14' && steps.cache-polkadot.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p ~/polkadot-cache
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-aarch64-apple-darwin -o ~/polkadot-cache/polkadot
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-execute-worker-aarch64-apple-darwin -o ~/polkadot-cache/polkadot-execute-worker
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-prepare-worker-aarch64-apple-darwin -o ~/polkadot-cache/polkadot-prepare-worker
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-parachain-aarch64-apple-darwin -o ~/polkadot-cache/polkadot-parachain
+          chmod +x ~/polkadot-cache/*
+
+      - name: Download Polkadot binaries on Ubuntu
+        if: matrix.os == 'ubuntu-24.04' && steps.cache-polkadot.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p ~/polkadot-cache
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot -o ~/polkadot-cache/polkadot
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-execute-worker -o ~/polkadot-cache/polkadot-execute-worker
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-prepare-worker -o ~/polkadot-cache/polkadot-prepare-worker
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-parachain -o ~/polkadot-cache/polkadot-parachain
+          chmod +x ~/polkadot-cache/*
+
   ci:
     name: CI on ${{ matrix.os }}
     needs: cache-polkadot
@@ -86,15 +118,33 @@ jobs:
             ~/.cargo/bin/eth-rpc
           key: polkadot-binaries-${{ matrix.os }}-${{ hashFiles('polkadot-sdk/.git') }}
 
+      - name: Restore downloaded Polkadot binaries from cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/polkadot-cache/polkadot
+            ~/polkadot-cache/polkadot-execute-worker
+            ~/polkadot-cache/polkadot-prepare-worker
+            ~/polkadot-cache/polkadot-parachain
+          key: polkadot-downloaded-${{ matrix.os }}-${{ env.POLKADOT_VERSION }}
+
+      - name: Install Polkadot binaries
+        run: |
+          sudo cp ~/polkadot-cache/polkadot /usr/local/bin/
+          sudo cp ~/polkadot-cache/polkadot-execute-worker /usr/local/bin/
+          sudo cp ~/polkadot-cache/polkadot-prepare-worker /usr/local/bin/
+          sudo cp ~/polkadot-cache/polkadot-parachain /usr/local/bin/
+          sudo chmod +x /usr/local/bin/polkadot*
+
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           rustflags: ""
 
-      - name: Add wasm32 target
+      - name: Add wasm32 target and formatting
         run: |
           rustup target add wasm32-unknown-unknown
-          rustup component add rust-src
+          rustup component add rust-src rustfmt clippy
 
       - name: Install Geth on Ubuntu
         if: matrix.os == 'ubuntu-24.04'
@@ -141,6 +191,17 @@ jobs:
           chmod +x resolc
           sudo mv resolc /usr/local/bin
 
+      - name: Install Kurtosis on macOS
+        if: matrix.os == 'macos-14'
+        run: brew install kurtosis-tech/tap/kurtosis-cli
+
+      - name: Install Kurtosis on Ubuntu
+        if: matrix.os == 'ubuntu-24.04'
+        run: |
+          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+          sudo apt update
+          sudo apt install kurtosis-cli
+
       - name: Machete
         uses: bnjbvr/cargo-machete@v0.7.1
 
@@ -159,5 +220,34 @@ jobs:
       - name: Check resolc version
         run: resolc --version
 
-      - name: Test cargo workspace
+      - name: Check polkadot version
-        run: make test
+        run: polkadot --version
+      
+      - name: Check polkadot-parachain version
+        run: polkadot-parachain --version
+
+      - name: Check polkadot-execute-worker version
+        run: polkadot-execute-worker --version
+      
+      - name: Check polkadot-prepare-worker version
+        run: polkadot-prepare-worker --version
+
+      - name: Test Formatting
+        run: make format
+
+      - name: Test Clippy
+        run: make clippy
+
+      - name: Test Machete
+        run: make machete
+
+      - name: Unit Tests
+        if: matrix.os == 'ubuntu-24.04'
+        run: cargo test --workspace -- --nocapture
+
+      # We can't install docker in the MacOS image used in CI and therefore we need to skip the
+      # Kurtosis and lighthouse related tests when running the CI on MacOS.
+      - name: Unit Tests
+        if: matrix.os == 'macos-14'
+        run: |
+          cargo test --workspace -- --nocapture --skip lighthouse_geth::tests::

.gitignore

@@ -7,3 +7,9 @@ node_modules
 # We do not want to commit any log files that we produce from running the code locally so this is 
 # added to the .gitignore file.
 *.log
+
+profile.json.gz
+resolc-compiler-tests
+workdir
+
+!/schema.json

.rustfmt.toml

@@ -0,0 +1,25 @@
+# Basic
+edition = "2024"
+hard_tabs = true
+max_width = 100
+use_small_heuristics = "Max"
+# Imports
+imports_granularity = "Crate"
+reorder_imports = true
+# Consistency
+newline_style = "Unix"
+# Misc
+chain_width = 80
+spaces_around_ranges = false
+binop_separator = "Back"
+reorder_impl_items = false
+match_arm_leading_pipes = "Preserve"
+match_arm_blocks = false
+match_block_trailing_comma = true
+trailing_comma = "Vertical"
+trailing_semicolon = false
+use_field_init_shorthand = true
+# Format comments
+comment_width = 100
+wrap_comments = true
+

Cargo.toml

@@ -22,17 +22,20 @@ revive-dt-node-pool = { version = "0.1.0", path = "crates/node-pool" }
 revive-dt-report = { version = "0.1.0", path = "crates/report" }
 revive-dt-solc-binaries = { version = "0.1.0", path = "crates/solc-binaries" }
 
-alloy-primitives = "1.2.1"
-alloy-sol-types = "1.2.1"
 anyhow = "1.0"
+bson = { version = "2.15.0" }
+cacache = { version = "13.1.0" }
 clap = { version = "4", features = ["derive"] }
+dashmap = { version = "6.1.0" }
 foundry-compilers-artifacts = { version = "0.18.0" }
 futures = { version = "0.3.31" }
 hex = "0.4.3"
 regex = "1"
 moka = "0.12.10"
+paste = "1.0.15"
 reqwest = { version = "0.12.15", features = ["json"] }
 once_cell = "1.21"
+schemars = { version = "1.0.4", features = ["semver1"] }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = [
@@ -40,9 +43,12 @@ serde_json = { version = "1.0", default-features = false, features = [
     "std",
     "unbounded_depth",
 ] }
+serde_with = { version = "3.14.0", features = ["hex"] }
+serde_yaml_ng = { version = "0.10.0" }
 sha2 = { version = "0.10.9" }
 sp-core = "36.1.0"
 sp-runtime = "41.1.0"
+strum = { version = "0.27.2", features = ["derive"] }
 temp-dir = { version = "0.1.16" }
 tempfile = "3.3"
 thiserror = "2"
@@ -51,8 +57,10 @@ tokio = { version = "1.47.0", default-features = false, features = [
     "process",
     "rt",
 ] }
+tower = { version = "0.5.2", features = ["limit"] }
 uuid = { version = "1.8", features = ["v4"] }
-tracing = "0.1.41"
+tracing = { version = "0.1.41" }
+tracing-appender = { version = "0.2.3" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = [
     "fmt",
     "json",
@@ -65,13 +73,17 @@ revive-solc-json-interface = { git = "https://github.com/paritytech/revive", rev
 revive-common = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
 revive-differential = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
 
+zombienet-sdk = { git = "https://github.com/paritytech/zombienet-sdk.git", rev ="891f6554354ce466abd496366dbf8b4f82141241" }
+
 [workspace.dependencies.alloy]
-version = "1.0.22"
+version = "1.0.37"
 default-features = false
 features = [
     "json-abi",
     "providers",
+    "provider-ws",
     "provider-ipc",
+    "provider-http",
     "provider-debug-api",
     "reqwest",
     "rpc-types",
@@ -81,9 +93,12 @@ features = [
     "serde",
     "rpc-types-eth",
     "genesis",
+    "sol-types",
 ]
 
 [profile.bench]
 inherits = "release"
 lto = true
 codegen-units = 1
+
+[workspace.lints.clippy]

Makefile

@@ -1,7 +1,7 @@
 .PHONY: format clippy test machete
 
 format:
-	cargo fmt --all -- --check
+	cargo +nightly fmt --all -- --check
 
 clippy:
 	cargo clippy --all-features --workspace -- --deny warnings

README.md

@@ -1,34 +1,243 @@
-# revive-differential-tests
+<div align="center">
+  <h1><code>Revive Differential Tests</code></h1>
 
-The revive differential testing framework allows to define smart contract tests in a declarative manner in order to compile and execute them against different Ethereum-compatible blockchain implmentations. This is useful to:
+  <p>
-- Analyze observable differences in contract compilation and execution across different blockchain implementations, including contract storage, account balances, transaction output and emitted events on a per-transaction base.
+    <strong>Differential testing for Ethereum-compatible smart contract stacks</strong>
-- Collect and compare benchmark metrics such as code size, gas usage or transaction throughput per seconds (TPS) of different blockchain implementations.
+  </p>
-- Ensure reproducible contract builds across multiple compiler implementations or multiple host platforms.
+</div>
-- Implement end-to-end regression tests for Ethereum-compatible smart contract stacks.
 
-# Declarative test format
+This project compiles and executes declarative smart-contract tests against multiple platforms, then compares behavior (status, return data, events, and state diffs). Today it supports:
 
-For now, the format used to write tests is the [matter-labs era compiler format](https://github.com/matter-labs/era-compiler-tests?tab=readme-ov-file#matter-labs-simplecomplex-format). This allows us to re-use many tests from their corpora.
+- Geth (EVM reference implementation)
+- Revive Kitchensink (Substrate-based PolkaVM + `eth-rpc` proxy)
 
-# The `retester` utility
+Use it to:
 
-The `retester` helper utilty is used to run the tests. To get an idea of what `retester` can do, please consults its command line help: 
+- Detect observable differences between platforms (execution success, logs, state changes)
+- Ensure reproducible builds across compilers/hosts
+- Run end-to-end regression suites
 
-```
+This framework uses the [MatterLabs tests format](https://github.com/matter-labs/era-compiler-tests/tree/main/solidity) for declarative tests which is composed of the following:
-cargo run -p revive-dt-core -- --help
+
+- Metadata files, this is akin to a module of tests in Rust.
+- Each metadata file contains multiple cases, a case is akin to a Rust test where a module can contain multiple tests.
+- Each case contains multiple steps and assertions, this is akin to any Rust test that contains multiple statements.
+
+Metadata files are JSON files, but Solidity files can also be metadata files if they include inline metadata provided as a comment at the top of the contract.
+
+All of the steps contained within each test case are either:
+
+- Transactions that need to be submitted and assertions to run on the submitted transactions.
+- Assertions on the state of the chain (e.g., account balances, storage, etc...)
+
+All of the transactions submitted by the this tool to the test nodes follow a similar logic to what wallets do. We first use alloy to estimate the transaction fees, then we attach that to the transaction and submit it to the node and then await the transaction receipt.
+
+This repository contains none of the tests and only contains the testing framework or the test runner. The tests can be found in the [`resolc-compiler-tests`](https://github.com/paritytech/resolc-compiler-tests) repository which is a clone of [MatterLab's test suite](https://github.com/matter-labs/era-compiler-tests) with some modifications and adjustments made to suit our use case.
+
+## Requirements
+
+This section describes the required dependencies that this framework requires to run. Compiling this framework is pretty straightforward and no additional dependencies beyond what's specified in the `Cargo.toml` file should be required.
+
+- Stable Rust
+- Geth - When doing differential testing against the PVM we submit transactions to a Geth node and to Kitchensink to compare them.
+- Kitchensink - When doing differential testing against the PVM we submit transactions to a Geth node and to Kitchensink to compare them.
+- ETH-RPC - All communication with Kitchensink is done through the ETH RPC.
+- Solc - This is actually a transitive dependency, while this tool doesn't require solc as it downloads the versions that it requires, resolc requires that Solc is installed and available in the path.
+- Resolc - This is required to compile the contracts to PolkaVM bytecode.
+- Kurtosis - The Kurtosis CLI tool is required for the production Ethereum mainnet-like node configuration with Geth as the execution layer and lighthouse as the consensus layer. Kurtosis also requires docker to be installed since it runs everything inside of docker containers.
+
+All of the above need to be installed and available in the path in order for the tool to work.
+
+## Running The Tool
+
+This tool is being updated quite frequently. Therefore, it's recommended that you don't install the tool and then run it, but rather that you run it from the root of the directory using `cargo run --release`. The help command of the tool gives you all of the information you need to know about each of the options and flags that the tool offers.
+
+```bash
+$ cargo run --release -- execute-tests --help
+Error: Executes tests in the MatterLabs format differentially on multiple targets concurrently
+
+Usage: retester execute-tests [OPTIONS]
+
+Options:
+  -w, --working-directory <WORKING_DIRECTORY>
+          The working directory that the program will use for all of the temporary artifacts needed at runtime.
+
+          If not specified, then a temporary directory will be created and used by the program for all temporary artifacts.
+
+          [default: ]
+
+  -p, --platform <PLATFORMS>
+          The set of platforms that the differential tests should run on
+
+          [default: geth-evm-solc,revive-dev-node-polkavm-resolc]
+
+          Possible values:
+          - geth-evm-solc:                  The Go-ethereum reference full node EVM implementation with the solc compiler
+          - kitchensink-polkavm-resolc:     The kitchensink node with the PolkaVM backend with the resolc compiler
+          - kitchensink-revm-solc:          The kitchensink node with the REVM backend with the solc compiler
+          - revive-dev-node-polkavm-resolc: The revive dev node with the PolkaVM backend with the resolc compiler
+          - revive-dev-node-revm-solc:      The revive dev node with the REVM backend with the solc compiler
+
+  -c, --corpus <CORPUS>
+          A list of test corpus JSON files to be tested
+
+  -h, --help
+          Print help (see a summary with '-h')
+
+Solc Configuration:
+      --solc.version <VERSION>
+          Specifies the default version of the Solc compiler that should be used if there is no override specified by one of the test cases
+
+          [default: 0.8.29]
+
+Resolc Configuration:
+      --resolc.path <resolc.path>
+          Specifies the path of the resolc compiler to be used by the tool.
+
+          If this is not specified, then the tool assumes that it should use the resolc binary that's provided in the user's $PATH.
+
+          [default: resolc]
+
+Geth Configuration:
+      --geth.path <geth.path>
+          Specifies the path of the geth node to be used by the tool.
+
+          If this is not specified, then the tool assumes that it should use the geth binary that's provided in the user's $PATH.
+
+          [default: geth]
+
+      --geth.start-timeout-ms <geth.start-timeout-ms>
+          The amount of time to wait upon startup before considering that the node timed out
+
+          [default: 5000]
+
+Kitchensink Configuration:
+      --kitchensink.path <kitchensink.path>
+          Specifies the path of the kitchensink node to be used by the tool.
+
+          If this is not specified, then the tool assumes that it should use the kitchensink binary that's provided in the user's $PATH.
+
+          [default: substrate-node]
+
+      --kitchensink.start-timeout-ms <kitchensink.start-timeout-ms>
+          The amount of time to wait upon startup before considering that the node timed out
+
+          [default: 5000]
+
+      --kitchensink.dont-use-dev-node
+          This configures the tool to use Kitchensink instead of using the revive-dev-node
+
+Revive Dev Node Configuration:
+      --revive-dev-node.path <revive-dev-node.path>
+          Specifies the path of the revive dev node to be used by the tool.
+
+          If this is not specified, then the tool assumes that it should use the revive dev node binary that's provided in the user's $PATH.
+
+          [default: revive-dev-node]
+
+      --revive-dev-node.start-timeout-ms <revive-dev-node.start-timeout-ms>
+          The amount of time to wait upon startup before considering that the node timed out
+
+          [default: 5000]
+
+Eth RPC Configuration:
+      --eth-rpc.path <eth-rpc.path>
+          Specifies the path of the ETH RPC to be used by the tool.
+
+          If this is not specified, then the tool assumes that it should use the ETH RPC binary that's provided in the user's $PATH.
+
+          [default: eth-rpc]
+
+      --eth-rpc.start-timeout-ms <eth-rpc.start-timeout-ms>
+          The amount of time to wait upon startup before considering that the node timed out
+
+          [default: 5000]
+
+Genesis Configuration:
+      --genesis.path <genesis.path>
+          Specifies the path of the genesis file to use for the nodes that are started.
+
+          This is expected to be the path of a JSON geth genesis file.
+
+Wallet Configuration:
+      --wallet.default-private-key <DEFAULT_KEY>
+          The private key of the default signer
+
+          [default: 0x4f3edf983ac636a65a842ce7c78d9aa706d3b113bce9c46f30d7d21715b23b1d]
+
+      --wallet.additional-keys <ADDITIONAL_KEYS>
+          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
+
+          [default: 100000]
+
+Concurrency Configuration:
+      --concurrency.number-of-nodes <NUMBER_OF_NODES>
+          Determines the amount of nodes that will be spawned for each chain
+
+          [default: 5]
+
+      --concurrency.number-of-threads <NUMBER_OF_THREADS>
+          Determines the amount of tokio worker threads that will will be used
+
+          [default: 16]
+
+      --concurrency.number-of-concurrent-tasks <NUMBER_CONCURRENT_TASKS>
+          Determines the amount of concurrent tasks that will be spawned to run tests.
+
+          Defaults to 10 x the number of nodes.
+
+      --concurrency.ignore-concurrency-limit
+          Determines if the concurrency limit should be ignored or not
+
+Compilation Configuration:
+      --compilation.invalidate-cache
+          Controls if the compilation cache should be invalidated or not
+
+Report Configuration:
+      --report.include-compiler-input
+          Controls if the compiler input is included in the final report
+
+      --report.include-compiler-output
+          Controls if the compiler output is included in the final report
 ```
 
-For example, to run the [complex Solidity tests](https://github.com/matter-labs/era-compiler-tests/tree/main/solidity/complex), define a corpus structure as follows:
+To run tests with this tool you need a corpus JSON file that defines the tests included in the corpus. The simplest corpus file looks like the following:
 
 ```json
 {
-    "name": "ML Solidity Complex",
+  "name": "MatterLabs Solidity Simple, Complex, and Semantic Tests",
-    "path": "/path/to/era-compiler-tests/solidity/complex"
+  "path": "resolc-compiler-tests/fixtures/solidity"
 }
 ```
 
-Assuming this to be saved in a `ml-solidity-complex.json` file, the following command will try to compile and execute the tests found inside the corpus:
+> [!NOTE]  
+> Note that the tests can be found in the [`resolc-compiler-tests`](https://github.com/paritytech/resolc-compiler-tests) repository.
+
+The above corpus file instructs the tool to look for all of the test cases contained within all of the metadata files of the specified directory.
+
+The simplest command to run this tool is the following:
 
 ```bash
-RUST_LOG=debug cargo r --release -p revive-dt-core  -- --corpus ml-solidity-complex.json 
+RUST_LOG="info" cargo run --release -- execute-tests \
+    --platform geth-evm-solc \
+    --corpus corp.json \
+    --working-directory workdir \
+    --concurrency.number-of-nodes 5 \
+    --concurrency.ignore-concurrency-limit \
+    > logs.log \
+    2> output.log
+```
+
+The above command will run the tool executing every one of the tests discovered in the path specified in the corpus file. All of the logs from the execution will be persisted in the `logs.log` file and all of the output of the tool will be persisted to the `output.log` file. If all that you're looking for is to run the tool and check which tests succeeded and failed, then the `output.log` file is what you need to be looking at. However, if you're contributing the to the tool then the `logs.log` file will be very valuable.
+
+If you only want to run a subset of tests, then you can specify that in your corpus file. The following is an example:
+
+```json
+{
+  "name": "MatterLabs Solidity Simple, Complex, and Semantic Tests",
+  "paths": [
+    "path/to/a/single/metadata/file/I/want/to/run.json",
+    "path/to/a/directory/to/find/all/metadata/files/within"
+  ]
+}
 ```

clippy.toml

@@ -0,0 +1 @@
+

crates/common/Cargo.toml

@@ -9,9 +9,16 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+alloy = { workspace = true }
 anyhow = { workspace = true }
+clap = { workspace = true }
 moka = { workspace = true, features = ["sync"] }
 once_cell = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
+schemars = { workspace = true }
+strum = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["time"] }
+
+[lints]
+workspace = true

crates/common/src/cached_fs/mod.rs

@@ -1,49 +1,48 @@
 //! This module implements a cached file system allowing for results to be stored in-memory rather
 //! rather being queried from the file system again.
 
-use std::fs;
+use std::{
-use std::io::{Error, Result};
+	fs,
-use std::path::{Path, PathBuf};
+	io::{Error, Result},
+	path::{Path, PathBuf},
+};
 
 use moka::sync::Cache;
 use once_cell::sync::Lazy;
 
 pub fn read(path: impl AsRef<Path>) -> Result<Vec<u8>> {
-    static READ_CACHE: Lazy<Cache<PathBuf, Vec<u8>>> = Lazy::new(|| Cache::new(10_000));
+	static READ_CACHE: Lazy<Cache<PathBuf, Vec<u8>>> = Lazy::new(|| Cache::new(10_000));
 
-    let path = path.as_ref().canonicalize()?;
+	let path = path.as_ref().canonicalize()?;
-    match READ_CACHE.get(path.as_path()) {
+	match READ_CACHE.get(path.as_path()) {
-        Some(content) => Ok(content),
+		Some(content) => Ok(content),
-        None => {
+		None => {
-            let content = fs::read(path.as_path())?;
+			let content = fs::read(path.as_path())?;
-            READ_CACHE.insert(path, content.clone());
+			READ_CACHE.insert(path, content.clone());
-            Ok(content)
+			Ok(content)
-        }
+		},
-    }
+	}
 }
 
 pub fn read_to_string(path: impl AsRef<Path>) -> Result<String> {
-    let content = read(path)?;
+	let content = read(path)?;
-    String::from_utf8(content).map_err(|_| {
+	String::from_utf8(content).map_err(|_| {
-        Error::new(
+		Error::new(std::io::ErrorKind::InvalidData, "The contents of the file are not valid UTF8")
-            std::io::ErrorKind::InvalidData,
+	})
-            "The contents of the file are not valid UTF8",
-        )
-    })
 }
 
 pub fn read_dir(path: impl AsRef<Path>) -> Result<Box<dyn Iterator<Item = Result<PathBuf>>>> {
-    static READ_DIR_CACHE: Lazy<Cache<PathBuf, Vec<PathBuf>>> = Lazy::new(|| Cache::new(10_000));
+	static READ_DIR_CACHE: Lazy<Cache<PathBuf, Vec<PathBuf>>> = Lazy::new(|| Cache::new(10_000));
 
-    let path = path.as_ref().canonicalize()?;
+	let path = path.as_ref().canonicalize()?;
-    match READ_DIR_CACHE.get(path.as_path()) {
+	match READ_DIR_CACHE.get(path.as_path()) {
-        Some(entries) => Ok(Box::new(entries.into_iter().map(Ok)) as Box<_>),
+		Some(entries) => Ok(Box::new(entries.into_iter().map(Ok)) as Box<_>),
-        None => {
+		None => {
-            let entries = fs::read_dir(path.as_path())?
+			let entries = fs::read_dir(path.as_path())?
-                .flat_map(|maybe_entry| maybe_entry.map(|entry| entry.path()))
+				.flat_map(|maybe_entry| maybe_entry.map(|entry| entry.path()))
-                .collect();
+				.collect();
-            READ_DIR_CACHE.insert(path.clone(), entries);
+			READ_DIR_CACHE.insert(path.clone(), entries);
-            Ok(read_dir(path).unwrap())
+			Ok(read_dir(path).unwrap())
-        }
+		},
-    }
+	}
 }

crates/common/src/fs/clear_dir.rs

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

crates/common/src/futures/poll.rs

@@ -1,7 +1,6 @@
-use std::ops::ControlFlow;
+use std::{ops::ControlFlow, time::Duration};
-use std::time::Duration;
 
-use anyhow::{Result, anyhow};
+use anyhow::{Context as _, Result, anyhow};
 
 const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60);
 
@@ -18,52 +17,51 @@ const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60);
 /// [`Break`]: ControlFlow::Break
 /// [`Continue`]: ControlFlow::Continue
 pub async fn poll<F, O>(
-    polling_duration: Duration,
+	polling_duration: Duration,
-    polling_wait_behavior: PollingWaitBehavior,
+	polling_wait_behavior: PollingWaitBehavior,
-    mut future: impl FnMut() -> F,
+	mut future: impl FnMut() -> F,
 ) -> Result<O>
 where
-    F: Future<Output = Result<ControlFlow<O, ()>>>,
+	F: Future<Output = Result<ControlFlow<O, ()>>>,
 {
-    let mut retries = 0;
+	let mut retries = 0;
-    let mut total_wait_duration = Duration::ZERO;
+	let mut total_wait_duration = Duration::ZERO;
-    let max_allowed_wait_duration = polling_duration;
+	let max_allowed_wait_duration = polling_duration;
 
-    loop {
+	loop {
-        if total_wait_duration >= max_allowed_wait_duration {
+		if total_wait_duration >= max_allowed_wait_duration {
-            break Err(anyhow!(
+			break Err(anyhow!(
-                "Polling failed after {} retries and a total of {:?} of wait time",
+				"Polling failed after {} retries and a total of {:?} of wait time",
-                retries,
+				retries,
-                total_wait_duration
+				total_wait_duration
-            ));
+			));
-        }
+		}
 
-        match future().await? {
+		match future().await.context("Polled future returned an error during polling loop")? {
-            ControlFlow::Continue(()) => {
+			ControlFlow::Continue(()) => {
-                let next_wait_duration = match polling_wait_behavior {
+				let next_wait_duration = match polling_wait_behavior {
-                    PollingWaitBehavior::Constant(duration) => duration,
+					PollingWaitBehavior::Constant(duration) => duration,
-                    PollingWaitBehavior::ExponentialBackoff => {
+					PollingWaitBehavior::ExponentialBackoff =>
-                        Duration::from_secs(2u64.pow(retries))
+						Duration::from_secs(2u64.pow(retries))
-                            .min(EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION)
+							.min(EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION),
-                    }
+				};
-                };
+				let next_wait_duration =
-                let next_wait_duration =
+					next_wait_duration.min(max_allowed_wait_duration - total_wait_duration);
-                    next_wait_duration.min(max_allowed_wait_duration - total_wait_duration);
+				total_wait_duration += next_wait_duration;
-                total_wait_duration += next_wait_duration;
+				retries += 1;
-                retries += 1;
 
-                tokio::time::sleep(next_wait_duration).await;
+				tokio::time::sleep(next_wait_duration).await;
-            }
+			},
-            ControlFlow::Break(output) => {
+			ControlFlow::Break(output) => {
-                break Ok(output);
+				break Ok(output);
-            }
+			},
-        }
+		}
-    }
+	}
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 pub enum PollingWaitBehavior {
-    Constant(Duration),
+	Constant(Duration),
-    #[default]
+	#[default]
-    ExponentialBackoff,
+	ExponentialBackoff,
 }

crates/common/src/iterators/either_iter.rs

@@ -0,0 +1,21 @@
+/// An iterator that could be either of two iterators.
+#[derive(Clone, Debug)]
+pub enum EitherIter<A, B> {
+	A(A),
+	B(B),
+}
+
+impl<A, B, T> Iterator for EitherIter<A, B>
+where
+	A: Iterator<Item = T>,
+	B: Iterator<Item = T>,
+{
+	type Item = T;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		match self {
+			EitherIter::A(iter) => iter.next(),
+			EitherIter::B(iter) => iter.next(),
+		}
+	}
+}

crates/common/src/iterators/files_with_extension_iterator.rs

@@ -1,91 +1,90 @@
 use std::{
-    borrow::Cow,
+	borrow::Cow,
-    collections::HashSet,
+	collections::HashSet,
-    path::{Path, PathBuf},
+	path::{Path, PathBuf},
 };
 
 /// An iterator that finds files of a certain extension in the provided directory. You can think of
 /// this a glob pattern similar to: `${path}/**/*.md`
 pub struct FilesWithExtensionIterator {
-    /// The set of allowed extensions that that match the requirement and that should be returned
+	/// The set of allowed extensions that that match the requirement and that should be returned
-    /// when found.
+	/// when found.
-    allowed_extensions: HashSet<Cow<'static, str>>,
+	allowed_extensions: HashSet<Cow<'static, str>>,
 
-    /// The set of directories to visit next. This iterator does BFS and so these directories will
+	/// The set of directories to visit next. This iterator does BFS and so these directories will
-    /// only be visited if we can't find any files in our state.
+	/// only be visited if we can't find any files in our state.
-    directories_to_search: Vec<PathBuf>,
+	directories_to_search: Vec<PathBuf>,
 
-    /// The set of files matching the allowed extensions that were found. If there are entries in
+	/// The set of files matching the allowed extensions that were found. If there are entries in
-    /// this vector then they will be returned when the [`Iterator::next`] method is called. If not
+	/// this vector then they will be returned when the [`Iterator::next`] method is called. If not
-    /// then we visit one of the next directories to visit.
+	/// then we visit one of the next directories to visit.
-    files_matching_allowed_extensions: Vec<PathBuf>,
+	files_matching_allowed_extensions: Vec<PathBuf>,
 
-    /// This option controls if the the cached file system should be used or not. This could be
+	/// This option controls if the the cached file system should be used or not. This could be
-    /// better for certain cases where the entries in the directories do not change and therefore
+	/// better for certain cases where the entries in the directories do not change and therefore
-    /// caching can be used.
+	/// caching can be used.
-    use_cached_fs: bool,
+	use_cached_fs: bool,
 }
 
 impl FilesWithExtensionIterator {
-    pub fn new(root_directory: impl AsRef<Path>) -> Self {
+	pub fn new(root_directory: impl AsRef<Path>) -> Self {
-        Self {
+		Self {
-            allowed_extensions: Default::default(),
+			allowed_extensions: Default::default(),
-            directories_to_search: vec![root_directory.as_ref().to_path_buf()],
+			directories_to_search: vec![root_directory.as_ref().to_path_buf()],
-            files_matching_allowed_extensions: Default::default(),
+			files_matching_allowed_extensions: Default::default(),
-            use_cached_fs: Default::default(),
+			use_cached_fs: Default::default(),
-        }
+		}
-    }
+	}
 
-    pub fn with_allowed_extension(
+	pub fn with_allowed_extension(
-        mut self,
+		mut self,
-        allowed_extension: impl Into<Cow<'static, str>>,
+		allowed_extension: impl Into<Cow<'static, str>>,
-    ) -> Self {
+	) -> Self {
-        self.allowed_extensions.insert(allowed_extension.into());
+		self.allowed_extensions.insert(allowed_extension.into());
-        self
+		self
-    }
+	}
 
-    pub fn with_use_cached_fs(mut self, use_cached_fs: bool) -> Self {
+	pub fn with_use_cached_fs(mut self, use_cached_fs: bool) -> Self {
-        self.use_cached_fs = use_cached_fs;
+		self.use_cached_fs = use_cached_fs;
-        self
+		self
-    }
+	}
 }
 
 impl Iterator for FilesWithExtensionIterator {
-    type Item = PathBuf;
+	type Item = PathBuf;
 
-    fn next(&mut self) -> Option<Self::Item> {
+	fn next(&mut self) -> Option<Self::Item> {
-        if let Some(file_path) = self.files_matching_allowed_extensions.pop() {
+		if let Some(file_path) = self.files_matching_allowed_extensions.pop() {
-            return Some(file_path);
+			return Some(file_path);
-        };
+		};
 
-        let directory_to_search = self.directories_to_search.pop()?;
+		let directory_to_search = self.directories_to_search.pop()?;
 
-        let iterator = if self.use_cached_fs {
+		let iterator = if self.use_cached_fs {
-            let Ok(dir_entries) = crate::cached_fs::read_dir(directory_to_search.as_path()) else {
+			let Ok(dir_entries) = crate::cached_fs::read_dir(directory_to_search.as_path()) else {
-                return self.next();
+				return self.next();
-            };
+			};
-            Box::new(dir_entries) as Box<dyn Iterator<Item = std::io::Result<PathBuf>>>
+			Box::new(dir_entries) as Box<dyn Iterator<Item = std::io::Result<PathBuf>>>
-        } else {
+		} else {
-            let Ok(dir_entries) = std::fs::read_dir(directory_to_search) else {
+			let Ok(dir_entries) = std::fs::read_dir(directory_to_search) else {
-                return self.next();
+				return self.next();
-            };
+			};
-            Box::new(dir_entries.map(|maybe_entry| maybe_entry.map(|entry| entry.path()))) as Box<_>
+			Box::new(dir_entries.map(|maybe_entry| maybe_entry.map(|entry| entry.path()))) as Box<_>
-        };
+		};
 
-        for entry_path in iterator.flatten() {
+		for entry_path in iterator.flatten() {
-            if entry_path.is_dir() {
+			if entry_path.is_dir() {
-                self.directories_to_search.push(entry_path)
+				self.directories_to_search.push(entry_path)
-            } else if entry_path.is_file()
+			} else if entry_path.is_file() &&
-                && entry_path.extension().is_some_and(|ext| {
+				entry_path.extension().is_some_and(|ext| {
-                    self.allowed_extensions
+					self.allowed_extensions
-                        .iter()
+						.iter()
-                        .any(|allowed| ext.eq_ignore_ascii_case(allowed.as_ref()))
+						.any(|allowed| ext.eq_ignore_ascii_case(allowed.as_ref()))
-                })
+				}) {
-            {
+				self.files_matching_allowed_extensions.push(entry_path)
-                self.files_matching_allowed_extensions.push(entry_path)
+			}
-            }
+		}
-        }
 
-        self.next()
+		self.next()
-    }
+	}
 }

crates/common/src/iterators/mod.rs

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

crates/common/src/macros/define_wrapper_type.rs

@@ -1,3 +1,25 @@
+#[macro_export]
+macro_rules! impl_for_wrapper {
+	(Display, $ident: ident) => {
+		#[automatically_derived]
+		impl std::fmt::Display for $ident {
+			fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+				std::fmt::Display::fmt(&self.0, f)
+			}
+		}
+	};
+	(FromStr, $ident: ident) => {
+		#[automatically_derived]
+		impl std::str::FromStr for $ident {
+			type Err = anyhow::Error;
+
+			fn from_str(s: &str) -> anyhow::Result<Self> {
+				s.parse().map(Self).map_err(Into::into)
+			}
+		}
+	};
+}
+
 /// Defines wrappers around types.
 ///
 /// For example, the macro invocation seen below:
@@ -42,7 +64,13 @@
 macro_rules! define_wrapper_type {
     (
         $(#[$meta: meta])*
-        $vis:vis struct $ident: ident($ty: ty);
+        $vis:vis struct $ident: ident($ty: ty)
+
+        $(
+            impl $($trait_ident: ident),*
+        )?
+
+        ;
     ) => {
         $(#[$meta])*
         $vis struct $ident($ty);
@@ -98,9 +126,15 @@ macro_rules! define_wrapper_type {
                 value.0
             }
         }
+
+        $(
+            $(
+                $crate::macros::impl_for_wrapper!($trait_ident, $ident);
+            )*
+        )?
     };
 }
 
-/// Technically not needed but this allows for the macro to be found in the `macros` module of the
+/// Technically not needed but this allows for the macro to be found in the `macros` module of
-/// crate in addition to being found in the root of the crate.
+/// the crate in addition to being found in the root of the crate.
-pub use define_wrapper_type;
+pub use {define_wrapper_type, impl_for_wrapper};

crates/common/src/types/identifiers.rs

@@ -0,0 +1,134 @@
+use clap::ValueEnum;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use strum::{AsRefStr, Display, EnumString, IntoStaticStr};
+
+/// An enum of the platform identifiers of all of the platforms supported by this framework. This
+/// could be thought of like the target triple from Rust and LLVM where it specifies the platform
+/// completely starting with the node, the vm, and finally the compiler used for this combination.
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Serialize,
+	Deserialize,
+	ValueEnum,
+	EnumString,
+	Display,
+	AsRefStr,
+	IntoStaticStr,
+	JsonSchema,
+)]
+#[serde(rename_all = "kebab-case")]
+#[strum(serialize_all = "kebab-case")]
+pub enum PlatformIdentifier {
+	/// The Go-ethereum reference full node EVM implementation with the solc compiler.
+	GethEvmSolc,
+	/// The Lighthouse Go-ethereum reference full node EVM implementation with the solc compiler.
+	LighthouseGethEvmSolc,
+	/// The kitchensink node with the PolkaVM backend with the resolc compiler.
+	KitchensinkPolkavmResolc,
+	/// The kitchensink node with the REVM backend with the solc compiler.
+	KitchensinkRevmSolc,
+	/// The revive dev node with the PolkaVM backend with the resolc compiler.
+	ReviveDevNodePolkavmResolc,
+	/// The revive dev node with the REVM backend with the solc compiler.
+	ReviveDevNodeRevmSolc,
+	/// A zombienet based Substrate/Polkadot node with the PolkaVM backend with the resolc compiler.
+	ZombienetPolkavmResolc,
+	/// A zombienet based Substrate/Polkadot node with the REVM backend with the solc compiler.
+	ZombienetRevmSolc,
+}
+
+/// An enum of the platform identifiers of all of the platforms supported by this framework.
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Serialize,
+	Deserialize,
+	ValueEnum,
+	EnumString,
+	Display,
+	AsRefStr,
+	IntoStaticStr,
+	JsonSchema,
+)]
+pub enum CompilerIdentifier {
+	/// The solc compiler.
+	Solc,
+	/// The resolc compiler.
+	Resolc,
+}
+
+/// An enum representing the identifiers of the supported nodes.
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Serialize,
+	Deserialize,
+	ValueEnum,
+	EnumString,
+	Display,
+	AsRefStr,
+	IntoStaticStr,
+	JsonSchema,
+)]
+pub enum NodeIdentifier {
+	/// The go-ethereum node implementation.
+	Geth,
+	/// The go-ethereum node implementation.
+	LighthouseGeth,
+	/// The Kitchensink node implementation.
+	Kitchensink,
+	/// The revive dev node implementation.
+	ReviveDevNode,
+	/// A zombienet spawned nodes
+	Zombienet,
+}
+
+/// An enum representing the identifiers of the supported VMs.
+#[derive(
+	Clone,
+	Copy,
+	Debug,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Serialize,
+	Deserialize,
+	ValueEnum,
+	EnumString,
+	Display,
+	AsRefStr,
+	IntoStaticStr,
+	JsonSchema,
+)]
+#[serde(rename_all = "lowercase")]
+#[strum(serialize_all = "lowercase")]
+pub enum VmIdentifier {
+	/// The ethereum virtual machine.
+	Evm,
+	/// The EraVM virtual machine.
+	EraVM,
+	/// Polkadot's PolaVM Risc-v based virtual machine.
+	PolkaVM,
+}

crates/common/src/types/mod.rs

@@ -1,5 +1,11 @@
+mod identifiers;
 mod mode;
+mod private_key_allocator;
+mod round_robin_pool;
 mod version_or_requirement;
 
+pub use identifiers::*;
 pub use mode::*;
+pub use private_key_allocator::*;
+pub use round_robin_pool::*;
 pub use version_or_requirement::*;

crates/common/src/types/mode.rs

@@ -1,8 +1,7 @@
 use crate::types::VersionOrRequirement;
 use semver::Version;
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
+use std::{fmt::Display, str::FromStr, sync::LazyLock};
-use std::str::FromStr;
 
 /// This represents a mode that a given test should be run with, if possible.
 ///
@@ -10,158 +9,161 @@ use std::str::FromStr;
 /// in its requirements, and then expanding it out into a list of [`Mode`]s.
 ///
 /// Use [`ParsedMode::to_test_modes()`] to do this.
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Mode {
-    pub pipeline: ModePipeline,
+	pub pipeline: ModePipeline,
-    pub optimize_setting: ModeOptimizerSetting,
+	pub optimize_setting: ModeOptimizerSetting,
-    pub version: Option<semver::VersionReq>,
+	pub version: Option<semver::VersionReq>,
 }
 
 impl Display for Mode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.pipeline.fmt(f)?;
+		self.pipeline.fmt(f)?;
-        f.write_str(" ")?;
+		f.write_str(" ")?;
-        self.optimize_setting.fmt(f)?;
+		self.optimize_setting.fmt(f)?;
 
-        if let Some(version) = &self.version {
+		if let Some(version) = &self.version {
-            f.write_str(" ")?;
+			f.write_str(" ")?;
-            version.fmt(f)?;
+			version.fmt(f)?;
-        }
+		}
 
-        Ok(())
+		Ok(())
-    }
+	}
 }
 
 impl Mode {
-    /// Return all of the available mode combinations.
+	/// Return all of the available mode combinations.
-    pub fn all() -> impl Iterator<Item = Mode> {
+	pub fn all() -> impl Iterator<Item = &'static Mode> {
-        ModePipeline::test_cases().flat_map(|pipeline| {
+		static ALL_MODES: LazyLock<Vec<Mode>> = LazyLock::new(|| {
-            ModeOptimizerSetting::test_cases().map(move |optimize_setting| Mode {
+			ModePipeline::test_cases()
-                pipeline,
+				.flat_map(|pipeline| {
-                optimize_setting,
+					ModeOptimizerSetting::test_cases().map(move |optimize_setting| Mode {
-                version: None,
+						pipeline,
-            })
+						optimize_setting,
-        })
+						version: None,
-    }
+					})
+				})
+				.collect::<Vec<_>>()
+		});
+		ALL_MODES.iter()
+	}
 
-    /// Resolves the [`Mode`]'s solidity version requirement into a [`VersionOrRequirement`] if
+	/// Resolves the [`Mode`]'s solidity version requirement into a [`VersionOrRequirement`] if
-    /// the requirement is present on the object. Otherwise, the passed default version is used.
+	/// the requirement is present on the object. Otherwise, the passed default version is used.
-    pub fn compiler_version_to_use(&self, default: Version) -> VersionOrRequirement {
+	pub fn compiler_version_to_use(&self, default: Version) -> VersionOrRequirement {
-        match self.version {
+		match self.version {
-            Some(ref requirement) => requirement.clone().into(),
+			Some(ref requirement) => requirement.clone().into(),
-            None => default.into(),
+			None => default.into(),
-        }
+		}
-    }
+	}
 }
 
 /// What do we want the compiler to do?
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
 pub enum ModePipeline {
-    /// Compile Solidity code via Yul IR
+	/// Compile Solidity code via Yul IR
-    ViaYulIR,
+	ViaYulIR,
-    /// Compile Solidity direct to assembly
+	/// Compile Solidity direct to assembly
-    ViaEVMAssembly,
+	ViaEVMAssembly,
 }
 
 impl FromStr for ModePipeline {
-    type Err = anyhow::Error;
+	type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
+		match s {
-            // via Yul IR
+			// via Yul IR
-            "Y" => Ok(ModePipeline::ViaYulIR),
+			"Y" => Ok(ModePipeline::ViaYulIR),
-            // Don't go via Yul IR
+			// Don't go via Yul IR
-            "E" => Ok(ModePipeline::ViaEVMAssembly),
+			"E" => Ok(ModePipeline::ViaEVMAssembly),
-            // Anything else that we see isn't a mode at all
+			// Anything else that we see isn't a mode at all
-            _ => Err(anyhow::anyhow!(
+			_ => Err(anyhow::anyhow!("Unsupported pipeline '{s}': expected 'Y' or 'E'")),
-                "Unsupported pipeline '{s}': expected 'Y' or 'E'"
+		}
-            )),
+	}
-        }
-    }
 }
 
 impl Display for ModePipeline {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
+		match self {
-            ModePipeline::ViaYulIR => f.write_str("Y"),
+			ModePipeline::ViaYulIR => f.write_str("Y"),
-            ModePipeline::ViaEVMAssembly => f.write_str("E"),
+			ModePipeline::ViaEVMAssembly => f.write_str("E"),
-        }
+		}
-    }
+	}
 }
 
 impl ModePipeline {
-    /// Should we go via Yul IR?
+	/// Should we go via Yul IR?
-    pub fn via_yul_ir(&self) -> bool {
+	pub fn via_yul_ir(&self) -> bool {
-        matches!(self, ModePipeline::ViaYulIR)
+		matches!(self, ModePipeline::ViaYulIR)
-    }
+	}
 
-    /// An iterator over the available pipelines that we'd like to test,
+	/// An iterator over the available pipelines that we'd like to test,
-    /// when an explicit pipeline was not specified.
+	/// when an explicit pipeline was not specified.
-    pub fn test_cases() -> impl Iterator<Item = ModePipeline> + Clone {
+	pub fn test_cases() -> impl Iterator<Item = ModePipeline> + Clone {
-        [ModePipeline::ViaYulIR, ModePipeline::ViaEVMAssembly].into_iter()
+		[ModePipeline::ViaYulIR, ModePipeline::ViaEVMAssembly].into_iter()
-    }
+	}
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
 pub enum ModeOptimizerSetting {
-    /// 0 / -: Don't apply any optimizations
+	/// 0 / -: Don't apply any optimizations
-    M0,
+	M0,
-    /// 1: Apply less than default optimizations
+	/// 1: Apply less than default optimizations
-    M1,
+	M1,
-    /// 2: Apply the default optimizations
+	/// 2: Apply the default optimizations
-    M2,
+	M2,
-    /// 3 / +: Apply aggressive optimizations
+	/// 3 / +: Apply aggressive optimizations
-    M3,
+	M3,
-    /// s: Optimize for size
+	/// s: Optimize for size
-    Ms,
+	Ms,
-    /// z: Aggressively optimize for size
+	/// z: Aggressively optimize for size
-    Mz,
+	Mz,
 }
 
 impl FromStr for ModeOptimizerSetting {
-    type Err = anyhow::Error;
+	type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
+		match s {
-            "M0" => Ok(ModeOptimizerSetting::M0),
+			"M0" => Ok(ModeOptimizerSetting::M0),
-            "M1" => Ok(ModeOptimizerSetting::M1),
+			"M1" => Ok(ModeOptimizerSetting::M1),
-            "M2" => Ok(ModeOptimizerSetting::M2),
+			"M2" => Ok(ModeOptimizerSetting::M2),
-            "M3" => Ok(ModeOptimizerSetting::M3),
+			"M3" => Ok(ModeOptimizerSetting::M3),
-            "Ms" => Ok(ModeOptimizerSetting::Ms),
+			"Ms" => Ok(ModeOptimizerSetting::Ms),
-            "Mz" => Ok(ModeOptimizerSetting::Mz),
+			"Mz" => Ok(ModeOptimizerSetting::Mz),
-            _ => Err(anyhow::anyhow!(
+			_ => Err(anyhow::anyhow!(
-                "Unsupported optimizer setting '{s}': expected 'M0', 'M1', 'M2', 'M3', 'Ms' or 'Mz'"
+				"Unsupported optimizer setting '{s}': expected 'M0', 'M1', 'M2', 'M3', 'Ms' or 'Mz'"
-            )),
+			)),
-        }
+		}
-    }
+	}
 }
 
 impl Display for ModeOptimizerSetting {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
+		match self {
-            ModeOptimizerSetting::M0 => f.write_str("M0"),
+			ModeOptimizerSetting::M0 => f.write_str("M0"),
-            ModeOptimizerSetting::M1 => f.write_str("M1"),
+			ModeOptimizerSetting::M1 => f.write_str("M1"),
-            ModeOptimizerSetting::M2 => f.write_str("M2"),
+			ModeOptimizerSetting::M2 => f.write_str("M2"),
-            ModeOptimizerSetting::M3 => f.write_str("M3"),
+			ModeOptimizerSetting::M3 => f.write_str("M3"),
-            ModeOptimizerSetting::Ms => f.write_str("Ms"),
+			ModeOptimizerSetting::Ms => f.write_str("Ms"),
-            ModeOptimizerSetting::Mz => f.write_str("Mz"),
+			ModeOptimizerSetting::Mz => f.write_str("Mz"),
-        }
+		}
-    }
+	}
 }
 
 impl ModeOptimizerSetting {
-    /// An iterator over the available optimizer settings that we'd like to test,
+	/// An iterator over the available optimizer settings that we'd like to test,
-    /// when an explicit optimizer setting was not specified.
+	/// when an explicit optimizer setting was not specified.
-    pub fn test_cases() -> impl Iterator<Item = ModeOptimizerSetting> + Clone {
+	pub fn test_cases() -> impl Iterator<Item = ModeOptimizerSetting> + Clone {
-        [
+		[
-            // No optimizations:
+			// No optimizations:
-            ModeOptimizerSetting::M0,
+			ModeOptimizerSetting::M0,
-            // Aggressive optimizations:
+			// Aggressive optimizations:
-            ModeOptimizerSetting::M3,
+			ModeOptimizerSetting::M3,
-        ]
+		]
-        .into_iter()
+		.into_iter()
-    }
+	}
 
-    /// Are any optimizations enabled?
+	/// Are any optimizations enabled?
-    pub fn optimizations_enabled(&self) -> bool {
+	pub fn optimizations_enabled(&self) -> bool {
-        !matches!(self, ModeOptimizerSetting::M0)
+		!matches!(self, ModeOptimizerSetting::M0)
-    }
+	}
 }

crates/common/src/types/private_key_allocator.rs

@@ -0,0 +1,32 @@
+use alloy::{primitives::U256, signers::local::PrivateKeySigner};
+use anyhow::{Context, Result, bail};
+
+/// This is a sequential private key allocator. When instantiated, it allocated private keys in
+/// sequentially and in order until the maximum private key specified is reached.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct PrivateKeyAllocator {
+	/// The next private key to be returned by the allocator when requested.
+	next_private_key: U256,
+
+	/// The highest private key (exclusive) that can be returned by this allocator.
+	highest_private_key_inclusive: U256,
+}
+
+impl PrivateKeyAllocator {
+	/// Creates a new instance of the private key allocator.
+	pub fn new(highest_private_key_inclusive: U256) -> Self {
+		Self { next_private_key: U256::ONE, highest_private_key_inclusive }
+	}
+
+	/// Allocates a new private key and errors out if the maximum private key has been reached.
+	pub fn allocate(&mut self) -> Result<PrivateKeySigner> {
+		if self.next_private_key > self.highest_private_key_inclusive {
+			bail!("Attempted to allocate a private key but failed since all have been allocated");
+		};
+		let private_key =
+			PrivateKeySigner::from_slice(self.next_private_key.to_be_bytes::<32>().as_slice())
+				.context("Failed to convert the private key digits into a private key")?;
+		self.next_private_key += U256::ONE;
+		Ok(private_key)
+	}
+}

crates/common/src/types/round_robin_pool.rs

@@ -0,0 +1,21 @@
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+pub struct RoundRobinPool<T> {
+	next_index: AtomicUsize,
+	items: Vec<T>,
+}
+
+impl<T> RoundRobinPool<T> {
+	pub fn new(items: Vec<T>) -> Self {
+		Self { next_index: Default::default(), items }
+	}
+
+	pub fn round_robin(&self) -> &T {
+		let current = self.next_index.fetch_add(1, Ordering::SeqCst) % self.items.len();
+		self.items.get(current).unwrap()
+	}
+
+	pub fn iter(&self) -> impl Iterator<Item = &T> {
+		self.items.iter()
+	}
+}

crates/common/src/types/version_or_requirement.rs

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

crates/compiler/Cargo.toml

@@ -16,11 +16,14 @@ revive-dt-solc-binaries = { workspace = true }
 revive-common = { workspace = true }
 
 alloy = { workspace = true }
-alloy-primitives = { workspace = true }
 anyhow = { workspace = true }
+dashmap = { workspace = true }
 foundry-compilers-artifacts = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
+
+[lints]
+workspace = true

crates/compiler/src/constants.rs

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

crates/compiler/src/lib.rs

@@ -3,23 +3,20 @@
 //! - Polkadot revive resolc compiler
 //! - Polkadot revive Wasm compiler
 
-mod constants;
-
 use std::{
-    collections::HashMap,
+	collections::HashMap,
-    hash::Hash,
+	hash::Hash,
-    path::{Path, PathBuf},
+	path::{Path, PathBuf},
+	pin::Pin,
 };
 
-use alloy::json_abi::JsonAbi;
+use alloy::{json_abi::JsonAbi, primitives::Address};
-use alloy_primitives::Address;
+use anyhow::{Context as _, Result};
 use semver::Version;
 use serde::{Deserialize, Serialize};
 
 use revive_common::EVMVersion;
 use revive_dt_common::cached_fs::read_to_string;
-use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
 
 // Re-export this as it's a part of the compiler interface.
 pub use revive_dt_common::types::{Mode, ModeOptimizerSetting, ModePipeline};
@@ -30,167 +27,149 @@ pub mod solc;
 
 /// A common interface for all supported Solidity compilers.
 pub trait SolidityCompiler {
-    /// Extra options specific to the compiler.
+	/// Returns the version of the compiler.
-    type Options: Default + PartialEq + Eq + Hash;
+	fn version(&self) -> &Version;
 
-    /// The low-level compiler interface.
+	/// Returns the path of the compiler executable.
-    fn build(
+	fn path(&self) -> &Path;
-        &self,
-        input: CompilerInput,
-        additional_options: Self::Options,
-    ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
 
-    fn new(solc_executable: PathBuf) -> Self;
+	/// The low-level compiler interface.
+	fn build(
+		&self,
+		input: CompilerInput,
+	) -> Pin<Box<dyn Future<Output = Result<CompilerOutput>> + '_>>;
 
-    fn get_compiler_executable(
+	/// Does the compiler support the provided mode and version settings.
-        config: &Arguments,
+	fn supports_mode(
-        version: impl Into<VersionOrRequirement>,
+		&self,
-    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
+		optimizer_setting: ModeOptimizerSetting,
-
+		pipeline: ModePipeline,
-    fn version(&self) -> anyhow::Result<Version>;
+	) -> bool;
-
-    /// Does the compiler support the provided mode and version settings?
-    fn supports_mode(
-        compiler_version: &Version,
-        optimize_setting: ModeOptimizerSetting,
-        pipeline: ModePipeline,
-    ) -> bool;
 }
 
 /// The generic compilation input configuration.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct CompilerInput {
-    pub pipeline: Option<ModePipeline>,
+	pub pipeline: Option<ModePipeline>,
-    pub optimization: Option<ModeOptimizerSetting>,
+	pub optimization: Option<ModeOptimizerSetting>,
-    pub evm_version: Option<EVMVersion>,
+	pub evm_version: Option<EVMVersion>,
-    pub allow_paths: Vec<PathBuf>,
+	pub allow_paths: Vec<PathBuf>,
-    pub base_path: Option<PathBuf>,
+	pub base_path: Option<PathBuf>,
-    pub sources: HashMap<PathBuf, String>,
+	pub sources: HashMap<PathBuf, String>,
-    pub libraries: HashMap<PathBuf, HashMap<String, Address>>,
+	pub libraries: HashMap<PathBuf, HashMap<String, Address>>,
-    pub revert_string_handling: Option<RevertString>,
+	pub revert_string_handling: Option<RevertString>,
 }
 
 /// The generic compilation output configuration.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct CompilerOutput {
-    /// The compiled contracts. The bytecode of the contract is kept as a string incase linking is
+	/// The compiled contracts. The bytecode of the contract is kept as a string in case linking is
-    /// required and the compiled source has placeholders.
+	/// required and the compiled source has placeholders.
-    pub contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+	pub contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
 }
 
 /// A generic builder style interface for configuring the supported compiler options.
-pub struct Compiler<T: SolidityCompiler> {
+#[derive(Default)]
-    input: CompilerInput,
+pub struct Compiler {
-    additional_options: T::Options,
+	input: CompilerInput,
 }
 
-impl Default for Compiler<solc::Solc> {
+impl Compiler {
-    fn default() -> Self {
+	pub fn new() -> Self {
-        Self::new()
+		Self {
-    }
+			input: CompilerInput {
-}
+				pipeline: Default::default(),
+				optimization: Default::default(),
+				evm_version: Default::default(),
+				allow_paths: Default::default(),
+				base_path: Default::default(),
+				sources: Default::default(),
+				libraries: Default::default(),
+				revert_string_handling: Default::default(),
+			},
+		}
+	}
 
-impl<T> Compiler<T>
+	pub fn with_optimization(mut self, value: impl Into<Option<ModeOptimizerSetting>>) -> Self {
-where
+		self.input.optimization = value.into();
-    T: SolidityCompiler,
+		self
-{
+	}
-    pub fn new() -> Self {
-        Self {
-            input: CompilerInput {
-                pipeline: Default::default(),
-                optimization: Default::default(),
-                evm_version: Default::default(),
-                allow_paths: Default::default(),
-                base_path: Default::default(),
-                sources: Default::default(),
-                libraries: Default::default(),
-                revert_string_handling: Default::default(),
-            },
-            additional_options: T::Options::default(),
-        }
-    }
 
-    pub fn with_optimization(mut self, value: impl Into<Option<ModeOptimizerSetting>>) -> Self {
+	pub fn with_pipeline(mut self, value: impl Into<Option<ModePipeline>>) -> Self {
-        self.input.optimization = value.into();
+		self.input.pipeline = value.into();
-        self
+		self
-    }
+	}
 
-    pub fn with_pipeline(mut self, value: impl Into<Option<ModePipeline>>) -> Self {
+	pub fn with_evm_version(mut self, version: impl Into<Option<EVMVersion>>) -> Self {
-        self.input.pipeline = value.into();
+		self.input.evm_version = version.into();
-        self
+		self
-    }
+	}
 
-    pub fn with_evm_version(mut self, version: impl Into<Option<EVMVersion>>) -> Self {
+	pub fn with_allow_path(mut self, path: impl AsRef<Path>) -> Self {
-        self.input.evm_version = version.into();
+		self.input.allow_paths.push(path.as_ref().into());
-        self
+		self
-    }
+	}
 
-    pub fn with_allow_path(mut self, path: impl AsRef<Path>) -> Self {
+	pub fn with_base_path(mut self, path: impl Into<Option<PathBuf>>) -> Self {
-        self.input.allow_paths.push(path.as_ref().into());
+		self.input.base_path = path.into();
-        self
+		self
-    }
+	}
 
-    pub fn with_base_path(mut self, path: impl Into<Option<PathBuf>>) -> Self {
+	pub fn with_source(mut self, path: impl AsRef<Path>) -> Result<Self> {
-        self.input.base_path = path.into();
+		self.input.sources.insert(
-        self
+			path.as_ref().to_path_buf(),
-    }
+			read_to_string(path.as_ref()).context("Failed to read the contract source")?,
+		);
+		Ok(self)
+	}
 
-    pub fn with_source(mut self, path: impl AsRef<Path>) -> anyhow::Result<Self> {
+	pub fn with_library(
-        self.input
+		mut self,
-            .sources
+		path: impl AsRef<Path>,
-            .insert(path.as_ref().to_path_buf(), read_to_string(path.as_ref())?);
+		name: impl AsRef<str>,
-        Ok(self)
+		address: Address,
-    }
+	) -> Self {
+		self.input
+			.libraries
+			.entry(path.as_ref().to_path_buf())
+			.or_default()
+			.insert(name.as_ref().into(), address);
+		self
+	}
 
-    pub fn with_library(
+	pub fn with_revert_string_handling(
-        mut self,
+		mut self,
-        path: impl AsRef<Path>,
+		revert_string_handling: impl Into<Option<RevertString>>,
-        name: impl AsRef<str>,
+	) -> Self {
-        address: Address,
+		self.input.revert_string_handling = revert_string_handling.into();
-    ) -> Self {
+		self
-        self.input
+	}
-            .libraries
-            .entry(path.as_ref().to_path_buf())
-            .or_default()
-            .insert(name.as_ref().into(), address);
-        self
-    }
 
-    pub fn with_revert_string_handling(
+	pub fn then(self, callback: impl FnOnce(Self) -> Self) -> Self {
-        mut self,
+		callback(self)
-        revert_string_handling: impl Into<Option<RevertString>>,
+	}
-    ) -> Self {
-        self.input.revert_string_handling = revert_string_handling.into();
-        self
-    }
 
-    pub fn with_additional_options(mut self, options: impl Into<T::Options>) -> Self {
+	pub fn try_then<E>(self, callback: impl FnOnce(Self) -> Result<Self, E>) -> Result<Self, E> {
-        self.additional_options = options.into();
+		callback(self)
-        self
+	}
-    }
 
-    pub async fn try_build(
+	pub async fn try_build(self, compiler: &dyn SolidityCompiler) -> Result<CompilerOutput> {
-        self,
+		compiler.build(self.input).await
-        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 {
+	pub fn input(&self) -> &CompilerInput {
-        self.input.clone()
+		&self.input
-    }
+	}
 }
 
 /// Defines how the compiler should handle revert strings.
 #[derive(
-    Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize, Deserialize,
+	Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize, Deserialize,
 )]
 pub enum RevertString {
-    #[default]
+	#[default]
-    Default,
+	Default,
-    Debug,
+	Debug,
-    Strip,
+	Strip,
-    VerboseDebug,
+	VerboseDebug,
 }

crates/compiler/src/revive_resolc.rs

@@ -2,275 +2,302 @@
 //! compiling contracts to PolkaVM (PVM) bytecode.
 
 use std::{
-    path::PathBuf,
+	path::PathBuf,
-    process::{Command, Stdio},
+	pin::Pin,
+	process::Stdio,
+	sync::{Arc, LazyLock},
 };
 
+use dashmap::DashMap;
 use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
+use revive_dt_config::{ResolcConfiguration, SolcConfiguration, WorkingDirectoryConfiguration};
 use revive_solc_json_interface::{
-    SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
+	SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
-    SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
+	SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
-    SolcStandardJsonOutput,
+	SolcStandardJsonOutput,
 };
+use tracing::{Span, field::display};
 
-use super::constants::SOLC_VERSION_SUPPORTING_VIA_YUL_IR;
+use crate::{
-use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler};
+	CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler, solc::Solc,
+};
 
 use alloy::json_abi::JsonAbi;
-use anyhow::Context;
+use anyhow::{Context as _, Result};
 use semver::Version;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
-// TODO: I believe that we need to also pass the solc compiler to resolc so that resolc uses the
-// specified solc compiler. I believe that currently we completely ignore the specified solc binary
-// when invoking resolc which doesn't seem right if we're using solc as a compiler frontend.
-
 /// A wrapper around the `resolc` binary, emitting PVM-compatible bytecode.
-#[derive(Debug)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Resolc {
+pub struct Resolc(Arc<ResolcInner>);
-    /// Path to the `resolc` executable
+
-    resolc_path: PathBuf,
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct ResolcInner {
+	/// The internal solc compiler that the resolc compiler uses as a compiler frontend.
+	solc: Solc,
+	/// Path to the `resolc` executable
+	resolc_path: PathBuf,
+}
+
+impl Resolc {
+	pub async fn new(
+		context: impl AsRef<SolcConfiguration>
+		+ AsRef<ResolcConfiguration>
+		+ AsRef<WorkingDirectoryConfiguration>,
+		version: impl Into<Option<VersionOrRequirement>>,
+	) -> Result<Self> {
+		/// This is a cache of all of the resolc compiler objects. Since we do not currently support
+		/// multiple resolc compiler versions, so our cache is just keyed by the solc compiler and
+		/// its version to the resolc compiler.
+		static COMPILERS_CACHE: LazyLock<DashMap<Solc, Resolc>> = LazyLock::new(Default::default);
+
+		let resolc_configuration = AsRef::<ResolcConfiguration>::as_ref(&context);
+
+		let solc = Solc::new(&context, version)
+			.await
+			.context("Failed to create the solc compiler frontend for resolc")?;
+
+		Ok(COMPILERS_CACHE
+			.entry(solc.clone())
+			.or_insert_with(|| {
+				Self(Arc::new(ResolcInner { solc, resolc_path: resolc_configuration.path.clone() }))
+			})
+			.clone())
+	}
 }
 
 impl SolidityCompiler for Resolc {
-    type Options = Vec<String>;
+	fn version(&self) -> &Version {
+		// We currently return the solc compiler version since we do not support multiple resolc
+		// compiler versions.
+		SolidityCompiler::version(&self.0.solc)
+	}
 
-    #[tracing::instrument(level = "debug", ret)]
+	fn path(&self) -> &std::path::Path {
-    async fn build(
+		&self.0.resolc_path
-        &self,
+	}
-        CompilerInput {
-            pipeline,
-            optimization,
-            evm_version,
-            allow_paths,
-            base_path,
-            sources,
-            libraries,
-            // TODO: this is currently not being handled since there is no way to pass it into
-            // resolc. So, we need to go back to this later once it's supported.
-            revert_string_handling: _,
-        }: CompilerInput,
-        additional_options: Self::Options,
-    ) -> anyhow::Result<CompilerOutput> {
-        if !matches!(pipeline, None | Some(ModePipeline::ViaYulIR)) {
-            anyhow::bail!(
-                "Resolc only supports the Y (via Yul IR) pipeline, but the provided pipeline is {pipeline:?}"
-            );
-        }
 
-        let input = SolcStandardJsonInput {
+	#[tracing::instrument(level = "debug", ret)]
-            language: SolcStandardJsonInputLanguage::Solidity,
+	#[tracing::instrument(
-            sources: sources
+        level = "error",
-                .into_iter()
+        skip_all,
-                .map(|(path, source)| (path.display().to_string(), source.into()))
+        fields(
-                .collect(),
+            resolc_version = %self.version(),
-            settings: SolcStandardJsonInputSettings {
+            solc_version = %self.0.solc.version(),
-                evm_version,
+            json_in = tracing::field::Empty
-                libraries: Some(
+        ),
-                    libraries
+        err(Debug)
-                        .into_iter()
+    )]
-                        .map(|(source_code, libraries_map)| {
+	fn build(
-                            (
+		&self,
-                                source_code.display().to_string(),
+		CompilerInput {
-                                libraries_map
+			pipeline,
-                                    .into_iter()
+			optimization,
-                                    .map(|(library_ident, library_address)| {
+			evm_version,
-                                        (library_ident, library_address.to_string())
+			allow_paths,
-                                    })
+			base_path,
-                                    .collect(),
+			sources,
-                            )
+			libraries,
-                        })
+			// TODO: this is currently not being handled since there is no way to pass it into
-                        .collect(),
+			// resolc. So, we need to go back to this later once it's supported.
-                ),
+			revert_string_handling: _,
-                remappings: None,
+		}: CompilerInput,
-                output_selection: Some(SolcStandardJsonInputSettingsSelection::new_required()),
+	) -> Pin<Box<dyn Future<Output = Result<CompilerOutput>> + '_>> {
-                via_ir: Some(true),
+		Box::pin(async move {
-                optimizer: SolcStandardJsonInputSettingsOptimizer::new(
+			if !matches!(pipeline, None | Some(ModePipeline::ViaYulIR)) {
-                    optimization
+				anyhow::bail!(
-                        .unwrap_or(ModeOptimizerSetting::M0)
+					"Resolc only supports the Y (via Yul IR) pipeline, but the provided pipeline is {pipeline:?}"
-                        .optimizations_enabled(),
+				);
-                    None,
+			}
-                    &Version::new(0, 0, 0),
-                    false,
-                ),
-                metadata: None,
-                polkavm: None,
-            },
-        };
 
-        let mut command = AsyncCommand::new(&self.resolc_path);
+			let input = SolcStandardJsonInput {
-        command
+				language: SolcStandardJsonInputLanguage::Solidity,
-            .stdin(Stdio::piped())
+				sources: sources
-            .stdout(Stdio::piped())
+					.into_iter()
-            .stderr(Stdio::piped())
+					.map(|(path, source)| (path.display().to_string(), source.into()))
-            .arg("--standard-json");
+					.collect(),
+				settings: SolcStandardJsonInputSettings {
+					evm_version,
+					libraries: Some(
+						libraries
+							.into_iter()
+							.map(|(source_code, libraries_map)| {
+								(
+									source_code.display().to_string(),
+									libraries_map
+										.into_iter()
+										.map(|(library_ident, library_address)| {
+											(library_ident, library_address.to_string())
+										})
+										.collect(),
+								)
+							})
+							.collect(),
+					),
+					remappings: None,
+					output_selection: Some(SolcStandardJsonInputSettingsSelection::new_required()),
+					via_ir: Some(true),
+					optimizer: SolcStandardJsonInputSettingsOptimizer::new(
+						optimization.unwrap_or(ModeOptimizerSetting::M0).optimizations_enabled(),
+						None,
+						&Version::new(0, 0, 0),
+						false,
+					),
+					metadata: None,
+					polkavm: None,
+				},
+			};
+			Span::current().record("json_in", display(serde_json::to_string(&input).unwrap()));
 
-        if let Some(ref base_path) = base_path {
+			let path = &self.0.resolc_path;
-            command.arg("--base-path").arg(base_path);
+			let mut command = AsyncCommand::new(path);
-        }
+			command
-        if !allow_paths.is_empty() {
+				.stdin(Stdio::piped())
-            command.arg("--allow-paths").arg(
+				.stdout(Stdio::piped())
-                allow_paths
+				.stderr(Stdio::piped())
-                    .iter()
+				.arg("--solc")
-                    .map(|path| path.display().to_string())
+				.arg(self.0.solc.path())
-                    .collect::<Vec<_>>()
+				.arg("--standard-json");
-                    .join(","),
-            );
-        }
-        let mut child = command.spawn()?;
 
-        let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
+			if let Some(ref base_path) = base_path {
-        let serialized_input = serde_json::to_vec(&input)?;
+				command.arg("--base-path").arg(base_path);
-        stdin_pipe.write_all(&serialized_input).await?;
+			}
+			if !allow_paths.is_empty() {
+				command.arg("--allow-paths").arg(
+					allow_paths
+						.iter()
+						.map(|path| path.display().to_string())
+						.collect::<Vec<_>>()
+						.join(","),
+				);
+			}
+			let mut child = command
+				.spawn()
+				.with_context(|| format!("Failed to spawn resolc at {}", path.display()))?;
 
-        let output = child.wait_with_output().await?;
+			let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
-        let stdout = output.stdout;
+			let serialized_input = serde_json::to_vec(&input)
-        let stderr = output.stderr;
+				.context("Failed to serialize Standard JSON input for resolc")?;
+			stdin_pipe
+				.write_all(&serialized_input)
+				.await
+				.context("Failed to write Standard JSON to resolc stdin")?;
 
-        if !output.status.success() {
+			let output = child
-            let json_in = serde_json::to_string_pretty(&input)?;
+				.wait_with_output()
-            let message = String::from_utf8_lossy(&stderr);
+				.await
-            tracing::error!(
+				.context("Failed while waiting for resolc process to finish")?;
-                status = %output.status,
+			let stdout = output.stdout;
-                message = %message,
+			let stderr = output.stderr;
-                json_input = json_in,
-                "Compilation using resolc failed"
-            );
-            anyhow::bail!("Compilation failed with an error: {message}");
-        }
 
-        let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
+			if !output.status.success() {
-            anyhow::anyhow!(
+				let json_in = serde_json::to_string_pretty(&input)
-                "failed to parse resolc JSON output: {e}\nstderr: {}",
+					.context("Failed to pretty-print Standard JSON input for logging")?;
-                String::from_utf8_lossy(&stderr)
+				let message = String::from_utf8_lossy(&stderr);
-            )
+				tracing::error!(
-        })?;
+					status = %output.status,
+					message = %message,
+					json_input = json_in,
+					"Compilation using resolc failed"
+				);
+				anyhow::bail!("Compilation failed with an error: {message}");
+			}
 
-        tracing::debug!(
+			let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout)
-            output = %serde_json::to_string(&parsed).unwrap(),
+				.map_err(|e| {
-            "Compiled successfully"
+					anyhow::anyhow!(
-        );
+						"failed to parse resolc JSON output: {e}\nstderr: {}",
+						String::from_utf8_lossy(&stderr)
+					)
+				})
+				.context("Failed to parse resolc standard JSON output")?;
 
-        // Detecting if the compiler output contained errors and reporting them through logs and
+			tracing::debug!(
-        // errors instead of returning the compiler output that might contain errors.
+				output = %serde_json::to_string(&parsed).unwrap(),
-        for error in parsed.errors.iter().flatten() {
+				"Compiled successfully"
-            if error.severity == "error" {
+			);
-                tracing::error!(
-                    ?error,
-                    ?input,
-                    output = %serde_json::to_string(&parsed).unwrap(),
-                    "Encountered an error in the compilation"
-                );
-                anyhow::bail!("Encountered an error in the compilation: {error}")
-            }
-        }
 
-        let Some(contracts) = parsed.contracts else {
+			// Detecting if the compiler output contained errors and reporting them through logs and
-            anyhow::bail!("Unexpected error - resolc output doesn't have a contracts section");
+			// errors instead of returning the compiler output that might contain errors.
-        };
+			for error in parsed.errors.iter().flatten() {
+				if error.severity == "error" {
+					tracing::error!(
+						?error,
+						?input,
+						output = %serde_json::to_string(&parsed).unwrap(),
+						"Encountered an error in the compilation"
+					);
+					anyhow::bail!("Encountered an error in the compilation: {error}")
+				}
+			}
 
-        let mut compiler_output = CompilerOutput::default();
+			let Some(contracts) = parsed.contracts else {
-        for (source_path, contracts) in contracts.into_iter() {
+				anyhow::bail!("Unexpected error - resolc output doesn't have a contracts section");
-            let source_path = PathBuf::from(source_path).canonicalize()?;
+			};
 
-            let map = compiler_output.contracts.entry(source_path).or_default();
+			let mut compiler_output = CompilerOutput::default();
-            for (contract_name, contract_information) in contracts.into_iter() {
+			for (source_path, contracts) in contracts.into_iter() {
-                let bytecode = contract_information
+				let src_for_msg = source_path.clone();
-                    .evm
+				let source_path = PathBuf::from(source_path)
-                    .and_then(|evm| evm.bytecode.clone())
+					.canonicalize()
-                    .context("Unexpected - Contract compiled with resolc has no bytecode")?;
+					.with_context(|| format!("Failed to canonicalize path {src_for_msg}"))?;
-                let abi = contract_information
-                    .metadata
-                    .as_ref()
-                    .and_then(|metadata| metadata.as_object())
-                    .and_then(|metadata| metadata.get("solc_metadata"))
-                    .and_then(|solc_metadata| solc_metadata.as_str())
-                    .and_then(|metadata| serde_json::from_str::<serde_json::Value>(metadata).ok())
-                    .and_then(|metadata| {
-                        metadata.get("output").and_then(|output| {
-                            output
-                                .get("abi")
-                                .and_then(|abi| serde_json::from_value::<JsonAbi>(abi.clone()).ok())
-                        })
-                    })
-                    .context(
-                        "Unexpected - Failed to get the ABI for a contract compiled with resolc",
-                    )?;
-                map.insert(contract_name, (bytecode.object, abi));
-            }
-        }
 
-        Ok(compiler_output)
+				let map = compiler_output.contracts.entry(source_path).or_default();
-    }
+				for (contract_name, contract_information) in contracts.into_iter() {
+					let bytecode = contract_information
+						.evm
+						.and_then(|evm| evm.bytecode.clone())
+						.context("Unexpected - Contract compiled with resolc has no bytecode")?;
+					let abi = {
+						let metadata = contract_information
+							.metadata
+							.as_ref()
+							.context("No metadata found for the contract")?;
+						let solc_metadata_str = match metadata {
+							serde_json::Value::String(solc_metadata_str) =>
+								solc_metadata_str.as_str(),
+							serde_json::Value::Object(metadata_object) => {
+								let solc_metadata_value = metadata_object
+									.get("solc_metadata")
+									.context("Contract doesn't have a 'solc_metadata' field")?;
+								solc_metadata_value
+									.as_str()
+									.context("The 'solc_metadata' field is not a string")?
+							},
+							serde_json::Value::Null |
+							serde_json::Value::Bool(_) |
+							serde_json::Value::Number(_) |
+							serde_json::Value::Array(_) => {
+								anyhow::bail!("Unsupported type of metadata {metadata:?}")
+							},
+						};
+						let solc_metadata =
+							serde_json::from_str::<serde_json::Value>(solc_metadata_str).context(
+								"Failed to deserialize the solc_metadata as a serde_json generic value",
+							)?;
+						let output_value = solc_metadata
+							.get("output")
+							.context("solc_metadata doesn't have an output field")?;
+						let abi_value = output_value
+							.get("abi")
+							.context("solc_metadata output doesn't contain an abi field")?;
+						serde_json::from_value::<JsonAbi>(abi_value.clone())
+							.context("ABI found in solc_metadata output is not valid ABI")?
+					};
+					map.insert(contract_name, (bytecode.object, abi));
+				}
+			}
 
-    fn new(resolc_path: PathBuf) -> Self {
+			Ok(compiler_output)
-        Resolc { resolc_path }
+		})
-    }
+	}
 
-    async fn get_compiler_executable(
+	fn supports_mode(
-        config: &Arguments,
+		&self,
-        _version: impl Into<VersionOrRequirement>,
+		optimize_setting: ModeOptimizerSetting,
-    ) -> anyhow::Result<PathBuf> {
+		pipeline: ModePipeline,
-        if !config.resolc.as_os_str().is_empty() {
+	) -> bool {
-            return Ok(config.resolc.clone());
+		pipeline == ModePipeline::ViaYulIR &&
-        }
+			SolidityCompiler::supports_mode(&self.0.solc, optimize_setting, pipeline)
-
+	}
-        Ok(PathBuf::from("resolc"))
-    }
-
-    fn version(&self) -> anyhow::Result<semver::Version> {
-        // Logic for parsing the resolc version from the following string:
-        // Solidity frontend for the revive compiler version 0.3.0+commit.b238913.llvm-18.1.8
-
-        let output = Command::new(self.resolc_path.as_path())
-            .arg("--version")
-            .stdout(Stdio::piped())
-            .spawn()?
-            .wait_with_output()?
-            .stdout;
-        let output = String::from_utf8_lossy(&output);
-        let version_string = output
-            .split("version ")
-            .nth(1)
-            .context("Version parsing failed")?
-            .split("+")
-            .next()
-            .context("Version parsing failed")?;
-
-        Version::parse(version_string).map_err(Into::into)
-    }
-
-    fn supports_mode(
-        compiler_version: &Version,
-        _optimize_setting: ModeOptimizerSetting,
-        pipeline: ModePipeline,
-    ) -> bool {
-        // We only support the Y (IE compile via Yul IR) mode here, which also means that we can
-        // only use solc version 0.8.13 and above. We must always compile via Yul IR as resolc
-        // needs this to translate to LLVM IR and then RISCV.
-        pipeline == ModePipeline::ViaYulIR
-            && compiler_version >= &SOLC_VERSION_SUPPORTING_VIA_YUL_IR
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained() {
-        // Arrange
-        let args = Arguments::default();
-        let path = Resolc::get_compiler_executable(&args, Version::new(0, 7, 6))
-            .await
-            .unwrap();
-        let compiler = Resolc::new(path);
-
-        // Act
-        let version = compiler.version();
-
-        // Assert
-        let _ = version.expect("Failed to get version");
-    }
 }

crates/compiler/src/solc.rs

@@ -2,295 +2,290 @@
 //! compiling contracts to EVM bytecode.
 
 use std::{
-    path::PathBuf,
+	path::PathBuf,
-    process::{Command, Stdio},
+	pin::Pin,
+	process::Stdio,
+	sync::{Arc, LazyLock},
 };
 
+use dashmap::DashMap;
 use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
+use revive_dt_config::{SolcConfiguration, WorkingDirectoryConfiguration};
 use revive_dt_solc_binaries::download_solc;
+use tracing::{Span, field::display, info};
 
-use super::constants::SOLC_VERSION_SUPPORTING_VIA_YUL_IR;
 use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler};
 
-use anyhow::Context;
+use anyhow::{Context as _, Result};
 use foundry_compilers_artifacts::{
-    output_selection::{
+	output_selection::{
-        BytecodeOutputSelection, ContractOutputSelection, EvmOutputSelection, OutputSelection,
+		BytecodeOutputSelection, ContractOutputSelection, EvmOutputSelection, OutputSelection,
-    },
+	},
-    solc::CompilerOutput as SolcOutput,
+	solc::{CompilerOutput as SolcOutput, *},
-    solc::*,
 };
 use semver::Version;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
-#[derive(Debug)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Solc {
+pub struct Solc(Arc<SolcInner>);
-    solc_path: PathBuf,
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct SolcInner {
+	/// The path of the solidity compiler executable that this object uses.
+	solc_path: PathBuf,
+	/// The version of the solidity compiler executable that this object uses.
+	solc_version: Version,
+}
+
+impl Solc {
+	pub async fn new(
+		context: impl AsRef<SolcConfiguration> + AsRef<WorkingDirectoryConfiguration>,
+		version: impl Into<Option<VersionOrRequirement>>,
+	) -> Result<Self> {
+		// This is a cache for the compiler objects so that whenever the same compiler version is
+		// requested the same object is returned. We do this as we do not want to keep cloning the
+		// compiler around.
+		static COMPILERS_CACHE: LazyLock<DashMap<(PathBuf, Version), Solc>> =
+			LazyLock::new(Default::default);
+
+		let working_directory_configuration =
+			AsRef::<WorkingDirectoryConfiguration>::as_ref(&context);
+		let solc_configuration = AsRef::<SolcConfiguration>::as_ref(&context);
+
+		// We attempt to download the solc binary. Note the following: this call does the version
+		// resolution for us. Therefore, even if the download didn't proceed, this function will
+		// resolve the version requirement into a canonical version of the compiler. It's then up
+		// to us to either use the provided path or not.
+		let version = version.into().unwrap_or_else(|| solc_configuration.version.clone().into());
+		let (version, path) =
+			download_solc(working_directory_configuration.as_path(), version, false)
+				.await
+				.context("Failed to download/get path to solc binary")?;
+
+		Ok(COMPILERS_CACHE
+			.entry((path.clone(), version.clone()))
+			.or_insert_with(|| {
+				info!(
+					solc_path = %path.display(),
+					solc_version = %version,
+					"Created a new solc compiler object"
+				);
+				Self(Arc::new(SolcInner { solc_path: path, solc_version: version }))
+			})
+			.clone())
+	}
 }
 
 impl SolidityCompiler for Solc {
-    type Options = ();
+	fn version(&self) -> &Version {
+		&self.0.solc_version
+	}
 
-    #[tracing::instrument(level = "debug", ret)]
+	fn path(&self) -> &std::path::Path {
-    async fn build(
+		&self.0.solc_path
-        &self,
+	}
-        CompilerInput {
-            pipeline,
-            optimization,
-            evm_version,
-            allow_paths,
-            base_path,
-            sources,
-            libraries,
-            revert_string_handling,
-        }: CompilerInput,
-        _: Self::Options,
-    ) -> anyhow::Result<CompilerOutput> {
-        let compiler_supports_via_ir = self.version()? >= SOLC_VERSION_SUPPORTING_VIA_YUL_IR;
 
-        // Be careful to entirely omit the viaIR field if the compiler does not support it,
+	#[tracing::instrument(level = "debug", ret)]
-        // as it will error if you provide fields it does not know about. Because
+	#[tracing::instrument(
-        // `supports_mode` is called prior to instantiating a compiler, we should never
+        level = "error",
-        // ask for something which is invalid.
+        skip_all,
-        let via_ir = match (pipeline, compiler_supports_via_ir) {
+        fields(json_in = tracing::field::Empty),
-            (pipeline, true) => pipeline.map(|p| p.via_yul_ir()),
+        err(Debug)
-            (_pipeline, false) => None,
+    )]
-        };
+	fn build(
+		&self,
+		CompilerInput {
+			pipeline,
+			optimization,
+			evm_version,
+			allow_paths,
+			base_path,
+			sources,
+			libraries,
+			revert_string_handling,
+		}: CompilerInput,
+	) -> Pin<Box<dyn Future<Output = Result<CompilerOutput>> + '_>> {
+		Box::pin(async move {
+			// Be careful to entirely omit the viaIR field if the compiler does not support it,
+			// as it will error if you provide fields it does not know about. Because
+			// `supports_mode` is called prior to instantiating a compiler, we should never
+			// ask for something which is invalid.
+			let via_ir = match (pipeline, self.compiler_supports_yul()) {
+				(pipeline, true) => pipeline.map(|p| p.via_yul_ir()),
+				(_pipeline, false) => None,
+			};
 
-        let input = SolcInput {
+			let input = SolcInput {
-            language: SolcLanguage::Solidity,
+				language: SolcLanguage::Solidity,
-            sources: Sources(
+				sources: Sources(
-                sources
+					sources
-                    .into_iter()
+						.into_iter()
-                    .map(|(source_path, source_code)| (source_path, Source::new(source_code)))
+						.map(|(source_path, source_code)| (source_path, Source::new(source_code)))
-                    .collect(),
+						.collect(),
-            ),
+				),
-            settings: Settings {
+				settings: Settings {
-                optimizer: Optimizer {
+					optimizer: Optimizer {
-                    enabled: optimization.map(|o| o.optimizations_enabled()),
+						enabled: optimization.map(|o| o.optimizations_enabled()),
-                    details: Some(Default::default()),
+						details: Some(Default::default()),
-                    ..Default::default()
+						..Default::default()
-                },
+					},
-                output_selection: OutputSelection::common_output_selection(
+					output_selection: OutputSelection::common_output_selection(
-                    [
+						[
-                        ContractOutputSelection::Abi,
+							ContractOutputSelection::Abi,
-                        ContractOutputSelection::Evm(EvmOutputSelection::ByteCode(
+							ContractOutputSelection::Evm(EvmOutputSelection::ByteCode(
-                            BytecodeOutputSelection::Object,
+								BytecodeOutputSelection::Object,
-                        )),
+							)),
-                    ]
+						]
-                    .into_iter()
+						.into_iter()
-                    .map(|item| item.to_string()),
+						.map(|item| item.to_string()),
-                ),
+					),
-                evm_version: evm_version.map(|version| version.to_string().parse().unwrap()),
+					evm_version: evm_version.map(|version| version.to_string().parse().unwrap()),
-                via_ir,
+					via_ir,
-                libraries: Libraries {
+					libraries: Libraries {
-                    libs: libraries
+						libs: libraries
-                        .into_iter()
+							.into_iter()
-                        .map(|(file_path, libraries)| {
+							.map(|(file_path, libraries)| {
-                            (
+								(
-                                file_path,
+									file_path,
-                                libraries
+									libraries
-                                    .into_iter()
+										.into_iter()
-                                    .map(|(library_name, library_address)| {
+										.map(|(library_name, library_address)| {
-                                        (library_name, library_address.to_string())
+											(library_name, library_address.to_string())
-                                    })
+										})
-                                    .collect(),
+										.collect(),
-                            )
+								)
-                        })
+							})
-                        .collect(),
+							.collect(),
-                },
+					},
-                debug: revert_string_handling.map(|revert_string_handling| DebuggingSettings {
+					debug: revert_string_handling.map(|revert_string_handling| DebuggingSettings {
-                    revert_strings: match revert_string_handling {
+						revert_strings: match revert_string_handling {
-                        crate::RevertString::Default => Some(RevertStrings::Default),
+							crate::RevertString::Default => Some(RevertStrings::Default),
-                        crate::RevertString::Debug => Some(RevertStrings::Debug),
+							crate::RevertString::Debug => Some(RevertStrings::Debug),
-                        crate::RevertString::Strip => Some(RevertStrings::Strip),
+							crate::RevertString::Strip => Some(RevertStrings::Strip),
-                        crate::RevertString::VerboseDebug => Some(RevertStrings::VerboseDebug),
+							crate::RevertString::VerboseDebug => Some(RevertStrings::VerboseDebug),
-                    },
+						},
-                    debug_info: Default::default(),
+						debug_info: Default::default(),
-                }),
+					}),
-                ..Default::default()
+					..Default::default()
-            },
+				},
-        };
+			};
 
-        let mut command = AsyncCommand::new(&self.solc_path);
+			Span::current().record("json_in", display(serde_json::to_string(&input).unwrap()));
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .arg("--standard-json");
 
-        if let Some(ref base_path) = base_path {
+			let path = &self.0.solc_path;
-            command.arg("--base-path").arg(base_path);
+			let mut command = AsyncCommand::new(path);
-        }
+			command
-        if !allow_paths.is_empty() {
+				.stdin(Stdio::piped())
-            command.arg("--allow-paths").arg(
+				.stdout(Stdio::piped())
-                allow_paths
+				.stderr(Stdio::null())
-                    .iter()
+				.arg("--standard-json");
-                    .map(|path| path.display().to_string())
-                    .collect::<Vec<_>>()
-                    .join(","),
-            );
-        }
-        let mut child = command.spawn()?;
 
-        let stdin = child.stdin.as_mut().expect("should be piped");
+			if let Some(ref base_path) = base_path {
-        let serialized_input = serde_json::to_vec(&input)?;
+				command.arg("--base-path").arg(base_path);
-        stdin.write_all(&serialized_input).await?;
+			}
-        let output = child.wait_with_output().await?;
+			if !allow_paths.is_empty() {
+				command.arg("--allow-paths").arg(
+					allow_paths
+						.iter()
+						.map(|path| path.display().to_string())
+						.collect::<Vec<_>>()
+						.join(","),
+				);
+			}
+			let mut child = command
+				.spawn()
+				.with_context(|| format!("Failed to spawn solc at {}", path.display()))?;
 
-        if !output.status.success() {
+			let stdin = child.stdin.as_mut().expect("should be piped");
-            let json_in = serde_json::to_string_pretty(&input)?;
+			let serialized_input = serde_json::to_vec(&input)
-            let message = String::from_utf8_lossy(&output.stderr);
+				.context("Failed to serialize Standard JSON input for solc")?;
-            tracing::error!(
+			stdin
-                status = %output.status,
+				.write_all(&serialized_input)
-                message = %message,
+				.await
-                json_input = json_in,
+				.context("Failed to write Standard JSON to solc stdin")?;
-                "Compilation using solc failed"
+			let output = child
-            );
+				.wait_with_output()
-            anyhow::bail!("Compilation failed with an error: {message}");
+				.await
-        }
+				.context("Failed while waiting for solc process to finish")?;
 
-        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout).map_err(|e| {
+			if !output.status.success() {
-            anyhow::anyhow!(
+				let json_in = serde_json::to_string_pretty(&input)
-                "failed to parse resolc JSON output: {e}\nstderr: {}",
+					.context("Failed to pretty-print Standard JSON input for logging")?;
-                String::from_utf8_lossy(&output.stdout)
+				tracing::error!(
-            )
+					status = %output.status,
-        })?;
+					json_input = json_in,
+					"Compilation using solc failed"
+				);
+				anyhow::bail!("Compilation failed");
+			}
 
-        // Detecting if the compiler output contained errors and reporting them through logs and
+			let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout)
-        // errors instead of returning the compiler output that might contain errors.
+				.map_err(|e| {
-        for error in parsed.errors.iter() {
+					anyhow::anyhow!(
-            if error.severity == Severity::Error {
+						"failed to parse resolc JSON output: {e}\nstdout: {}",
-                tracing::error!(?error, ?input, "Encountered an error in the compilation");
+						String::from_utf8_lossy(&output.stdout)
-                anyhow::bail!("Encountered an error in the compilation: {error}")
+					)
-            }
+				})
-        }
+				.context("Failed to parse solc standard JSON output")?;
 
-        tracing::debug!(
+			// Detecting if the compiler output contained errors and reporting them through logs and
-            output = %String::from_utf8_lossy(&output.stdout).to_string(),
+			// errors instead of returning the compiler output that might contain errors.
-            "Compiled successfully"
+			for error in parsed.errors.iter() {
-        );
+				if error.severity == Severity::Error {
+					tracing::error!(?error, ?input, "Encountered an error in the compilation");
+					anyhow::bail!("Encountered an error in the compilation: {error}")
+				}
+			}
 
-        let mut compiler_output = CompilerOutput::default();
+			tracing::debug!(
-        for (contract_path, contracts) in parsed.contracts {
+				output = %String::from_utf8_lossy(&output.stdout).to_string(),
-            let map = compiler_output
+				"Compiled successfully"
-                .contracts
+			);
-                .entry(contract_path.canonicalize()?)
-                .or_default();
-            for (contract_name, contract_info) in contracts.into_iter() {
-                let source_code = contract_info
-                    .evm
-                    .and_then(|evm| evm.bytecode)
-                    .map(|bytecode| match bytecode.object {
-                        BytecodeObject::Bytecode(bytecode) => bytecode.to_string(),
-                        BytecodeObject::Unlinked(unlinked) => unlinked,
-                    })
-                    .context("Unexpected - contract compiled with solc has no source code")?;
-                let abi = contract_info
-                    .abi
-                    .context("Unexpected - contract compiled with solc as no ABI")?;
-                map.insert(contract_name, (source_code, abi));
-            }
-        }
 
-        Ok(compiler_output)
+			let mut compiler_output = CompilerOutput::default();
-    }
+			for (contract_path, contracts) in parsed.contracts {
+				let map = compiler_output
+					.contracts
+					.entry(contract_path.canonicalize().with_context(|| {
+						format!("Failed to canonicalize contract path {}", contract_path.display())
+					})?)
+					.or_default();
+				for (contract_name, contract_info) in contracts.into_iter() {
+					let source_code = contract_info
+						.evm
+						.and_then(|evm| evm.bytecode)
+						.map(|bytecode| match bytecode.object {
+							BytecodeObject::Bytecode(bytecode) => bytecode.to_string(),
+							BytecodeObject::Unlinked(unlinked) => unlinked,
+						})
+						.context("Unexpected - contract compiled with solc has no source code")?;
+					let abi = contract_info
+						.abi
+						.context("Unexpected - contract compiled with solc as no ABI")?;
+					map.insert(contract_name, (source_code, abi));
+				}
+			}
 
-    fn new(solc_path: PathBuf) -> Self {
+			Ok(compiler_output)
-        Self { solc_path }
+		})
-    }
+	}
 
-    async fn get_compiler_executable(
+	fn supports_mode(
-        config: &Arguments,
+		&self,
-        version: impl Into<VersionOrRequirement>,
+		_optimize_setting: ModeOptimizerSetting,
-    ) -> anyhow::Result<PathBuf> {
+		pipeline: ModePipeline,
-        let path = download_solc(config.directory(), version, config.wasm).await?;
+	) -> bool {
-        Ok(path)
+		// solc 0.8.13 and above supports --via-ir, and less than that does not. Thus, we support
-    }
+		// mode E (ie no Yul IR) in either case, but only support Y (via Yul IR) if the compiler
-
+		// is new enough.
-    fn version(&self) -> anyhow::Result<semver::Version> {
+		pipeline == ModePipeline::ViaEVMAssembly ||
-        // The following is the parsing code for the version from the solc version strings which
+			(pipeline == ModePipeline::ViaYulIR && self.compiler_supports_yul())
-        // look like the following:
+	}
-        // ```
-        // solc, the solidity compiler commandline interface
-        // Version: 0.8.30+commit.73712a01.Darwin.appleclang
-        // ```
-
-        let child = Command::new(self.solc_path.as_path())
-            .arg("--version")
-            .stdout(Stdio::piped())
-            .spawn()?;
-        let output = child.wait_with_output()?;
-        let output = String::from_utf8_lossy(&output.stdout);
-        let version_line = output
-            .split("Version: ")
-            .nth(1)
-            .context("Version parsing failed")?;
-        let version_string = version_line
-            .split("+")
-            .next()
-            .context("Version parsing failed")?;
-
-        Version::parse(version_string).map_err(Into::into)
-    }
-
-    fn supports_mode(
-        compiler_version: &Version,
-        _optimize_setting: ModeOptimizerSetting,
-        pipeline: ModePipeline,
-    ) -> bool {
-        // solc 0.8.13 and above supports --via-ir, and less than that does not. Thus, we support mode E
-        // (ie no Yul IR) in either case, but only support Y (via Yul IR) if the compiler is new enough.
-        pipeline == ModePipeline::ViaEVMAssembly
-            || (pipeline == ModePipeline::ViaYulIR
-                && compiler_version >= &SOLC_VERSION_SUPPORTING_VIA_YUL_IR)
-    }
 }
 
-#[cfg(test)]
+impl Solc {
-mod test {
+	fn compiler_supports_yul(&self) -> bool {
-    use super::*;
+		const SOLC_VERSION_SUPPORTING_VIA_YUL_IR: Version = Version::new(0, 8, 13);
-
+		SolidityCompiler::version(self) >= &SOLC_VERSION_SUPPORTING_VIA_YUL_IR
-    #[tokio::test]
+	}
-    async fn compiler_version_can_be_obtained() {
-        // Arrange
-        let args = Arguments::default();
-        println!("Getting compiler path");
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 7, 6))
-            .await
-            .unwrap();
-        println!("Got compiler path");
-        let compiler = Solc::new(path);
-
-        // Act
-        let version = compiler.version();
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 7, 6)
-        )
-    }
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained1() {
-        // Arrange
-        let args = Arguments::default();
-        println!("Getting compiler path");
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 4, 21))
-            .await
-            .unwrap();
-        println!("Got compiler path");
-        let compiler = Solc::new(path);
-
-        // Act
-        let version = compiler.version();
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 4, 21)
-        )
-    }
 }

crates/compiler/tests/lib.rs

@@ -1,88 +1,88 @@
 use std::path::PathBuf;
 
-use revive_dt_compiler::{Compiler, SolidityCompiler, revive_resolc::Resolc, solc::Solc};
+use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
+use revive_dt_compiler::{Compiler, revive_resolc::Resolc, solc::Solc};
+use revive_dt_config::TestExecutionContext;
 use semver::Version;
 
 #[tokio::test]
 async fn contracts_can_be_compiled_with_solc() {
-    // Arrange
+	// Arrange
-    let args = Arguments::default();
+	let args = TestExecutionContext::default();
-    let compiler_path = Solc::get_compiler_executable(&args, Version::new(0, 8, 30))
+	let solc = Solc::new(&args, VersionOrRequirement::Version(Version::new(0, 8, 30)))
-        .await
+		.await
-        .unwrap();
+		.unwrap();
-    println!("About to assert");
 
-    // Act
+	// Act
-    let output = Compiler::<Solc>::new()
+	let output = Compiler::new()
-        .with_source("./tests/assets/array_one_element/callable.sol")
+		.with_source("./tests/assets/array_one_element/callable.sol")
-        .unwrap()
+		.unwrap()
-        .with_source("./tests/assets/array_one_element/main.sol")
+		.with_source("./tests/assets/array_one_element/main.sol")
-        .unwrap()
+		.unwrap()
-        .try_build(compiler_path)
+		.try_build(&solc)
-        .await;
+		.await;
 
-    // Assert
+	// Assert
-    let output = output.expect("Failed to compile");
+	let output = output.expect("Failed to compile");
-    assert_eq!(output.contracts.len(), 2);
+	assert_eq!(output.contracts.len(), 2);
 
-    let main_file_contracts = output
+	let main_file_contracts = output
-        .contracts
+		.contracts
-        .get(
+		.get(
-            &PathBuf::from("./tests/assets/array_one_element/main.sol")
+			&PathBuf::from("./tests/assets/array_one_element/main.sol")
-                .canonicalize()
+				.canonicalize()
-                .unwrap(),
+				.unwrap(),
-        )
+		)
-        .unwrap();
+		.unwrap();
-    let callable_file_contracts = output
+	let callable_file_contracts = output
-        .contracts
+		.contracts
-        .get(
+		.get(
-            &PathBuf::from("./tests/assets/array_one_element/callable.sol")
+			&PathBuf::from("./tests/assets/array_one_element/callable.sol")
-                .canonicalize()
+				.canonicalize()
-                .unwrap(),
+				.unwrap(),
-        )
+		)
-        .unwrap();
+		.unwrap();
-    assert!(main_file_contracts.contains_key("Main"));
+	assert!(main_file_contracts.contains_key("Main"));
-    assert!(callable_file_contracts.contains_key("Callable"));
+	assert!(callable_file_contracts.contains_key("Callable"));
 }
 
 #[tokio::test]
 async fn contracts_can_be_compiled_with_resolc() {
-    // Arrange
+	// Arrange
-    let args = Arguments::default();
+	let args = TestExecutionContext::default();
-    let compiler_path = Resolc::get_compiler_executable(&args, Version::new(0, 8, 30))
+	let resolc = Resolc::new(&args, VersionOrRequirement::Version(Version::new(0, 8, 30)))
-        .await
+		.await
-        .unwrap();
+		.unwrap();
 
-    // Act
+	// Act
-    let output = Compiler::<Resolc>::new()
+	let output = Compiler::new()
-        .with_source("./tests/assets/array_one_element/callable.sol")
+		.with_source("./tests/assets/array_one_element/callable.sol")
-        .unwrap()
+		.unwrap()
-        .with_source("./tests/assets/array_one_element/main.sol")
+		.with_source("./tests/assets/array_one_element/main.sol")
-        .unwrap()
+		.unwrap()
-        .try_build(compiler_path)
+		.try_build(&resolc)
-        .await;
+		.await;
 
-    // Assert
+	// Assert
-    let output = output.expect("Failed to compile");
+	let output = output.expect("Failed to compile");
-    assert_eq!(output.contracts.len(), 2);
+	assert_eq!(output.contracts.len(), 2);
 
-    let main_file_contracts = output
+	let main_file_contracts = output
-        .contracts
+		.contracts
-        .get(
+		.get(
-            &PathBuf::from("./tests/assets/array_one_element/main.sol")
+			&PathBuf::from("./tests/assets/array_one_element/main.sol")
-                .canonicalize()
+				.canonicalize()
-                .unwrap(),
+				.unwrap(),
-        )
+		)
-        .unwrap();
+		.unwrap();
-    let callable_file_contracts = output
+	let callable_file_contracts = output
-        .contracts
+		.contracts
-        .get(
+		.get(
-            &PathBuf::from("./tests/assets/array_one_element/callable.sol")
+			&PathBuf::from("./tests/assets/array_one_element/callable.sol")
-                .canonicalize()
+				.canonicalize()
-                .unwrap(),
+				.unwrap(),
-        )
+		)
-        .unwrap();
+		.unwrap();
-    assert!(main_file_contracts.contains_key("Main"));
+	assert!(main_file_contracts.contains_key("Main"));
-    assert!(callable_file_contracts.contains_key("Callable"));
+	assert!(callable_file_contracts.contains_key("Callable"));
 }

crates/config/Cargo.toml

@@ -9,9 +9,16 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+revive-dt-common = { workspace = true }
+
 alloy = { workspace = true }
+anyhow = { workspace = true }
 clap = { workspace = true }
 semver = { workspace = true }
 temp-dir = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
+strum = { workspace = true }
 
+[lints]
+workspace = true

crates/core/Cargo.toml

@@ -23,12 +23,19 @@ revive-dt-report = { workspace = true }
 
 alloy = { workspace = true }
 anyhow = { workspace = true }
+bson = { workspace = true }
+cacache = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
 indexmap = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
+tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
+schemars = { workspace = true }
 semver = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
-temp-dir = { workspace = true }
+
+[lints]
+workspace = true

crates/core/src/differential_benchmarks/driver.rs

@@ -0,0 +1,732 @@
+use std::{
+	collections::HashMap,
+	ops::ControlFlow,
+	sync::{
+		Arc,
+		atomic::{AtomicUsize, Ordering},
+	},
+	time::Duration,
+};
+
+use alloy::{
+	hex,
+	json_abi::JsonAbi,
+	network::{Ethereum, TransactionBuilder},
+	primitives::{Address, TxHash, U256},
+	rpc::types::{
+		TransactionReceipt, TransactionRequest,
+		trace::geth::{
+			CallFrame, GethDebugBuiltInTracerType, GethDebugTracerConfig, GethDebugTracerType,
+			GethDebugTracingOptions,
+		},
+	},
+};
+use anyhow::{Context as _, Result, bail};
+use indexmap::IndexMap;
+use revive_dt_common::{
+	futures::{PollingWaitBehavior, poll},
+	types::PrivateKeyAllocator,
+};
+use revive_dt_format::{
+	metadata::{ContractInstance, ContractPathAndIdent},
+	steps::{
+		AllocateAccountStep, BalanceAssertionStep, Calldata, EtherValue, FunctionCallStep, Method,
+		RepeatStep, Step, StepAddress, StepIdx, StepPath, StorageEmptyAssertionStep,
+	},
+	traits::{ResolutionContext, ResolverApi},
+};
+use tokio::sync::{Mutex, mpsc::UnboundedSender};
+use tracing::{Instrument, Span, debug, error, field::display, info, info_span, instrument};
+
+use crate::{
+	differential_benchmarks::{ExecutionState, WatcherEvent},
+	helpers::{CachedCompiler, TestDefinition, TestPlatformInformation},
+};
+
+static DRIVER_COUNT: AtomicUsize = AtomicUsize::new(0);
+
+/// The differential tests driver for a single platform.
+pub struct Driver<'a, I> {
+	/// The id of the driver.
+	driver_id: usize,
+
+	/// The information of the platform that this driver is for.
+	platform_information: &'a TestPlatformInformation<'a>,
+
+	/// The resolver of the platform.
+	resolver: Arc<dyn ResolverApi + 'a>,
+
+	/// The definition of the test that the driver is instructed to execute.
+	test_definition: &'a TestDefinition<'a>,
+
+	/// The private key allocator used by this driver and other drivers when account allocations
+	/// are needed.
+	private_key_allocator: Arc<Mutex<PrivateKeyAllocator>>,
+
+	/// The execution state associated with the platform.
+	execution_state: ExecutionState,
+
+	/// The send side of the watcher's unbounded channel associated with this driver.
+	watcher_tx: UnboundedSender<WatcherEvent>,
+
+	/// The number of steps that were executed on the driver.
+	steps_executed: usize,
+
+	/// This is the queue of steps that are to be executed by the driver for this test case. Each
+	/// time `execute_step` is called one of the steps is executed.
+	steps_iterator: I,
+}
+
+impl<'a, I> Driver<'a, I>
+where
+	I: Iterator<Item = (StepPath, Step)>,
+{
+	// region:Constructors & Initialization
+	pub async fn new(
+		platform_information: &'a TestPlatformInformation<'a>,
+		test_definition: &'a TestDefinition<'a>,
+		private_key_allocator: Arc<Mutex<PrivateKeyAllocator>>,
+		cached_compiler: &CachedCompiler<'a>,
+		watcher_tx: UnboundedSender<WatcherEvent>,
+		steps: I,
+	) -> Result<Self> {
+		let mut this = Driver {
+			driver_id: DRIVER_COUNT.fetch_add(1, Ordering::SeqCst),
+			platform_information,
+			resolver: platform_information
+				.node
+				.resolver()
+				.await
+				.context("Failed to create resolver")?,
+			test_definition,
+			private_key_allocator,
+			execution_state: ExecutionState::empty(),
+			steps_executed: 0,
+			steps_iterator: steps,
+			watcher_tx,
+		};
+		this.init_execution_state(cached_compiler)
+			.await
+			.context("Failed to initialize the execution state of the platform")?;
+		Ok(this)
+	}
+
+	async fn init_execution_state(&mut self, cached_compiler: &CachedCompiler<'a>) -> Result<()> {
+		let compiler_output = cached_compiler
+			.compile_contracts(
+				self.test_definition.metadata,
+				self.test_definition.metadata_file_path,
+				self.test_definition.mode.clone(),
+				None,
+				self.platform_information.compiler.as_ref(),
+				self.platform_information.platform,
+				&self.platform_information.reporter,
+			)
+			.await
+			.inspect_err(|err| {
+				error!(
+					?err,
+					platform_identifier = %self.platform_information.platform.platform_identifier(),
+					"Pre-linking compilation failed"
+				)
+			})
+			.context("Failed to produce the pre-linking compiled contracts")?;
+
+		let mut deployed_libraries = None::<HashMap<_, _>>;
+		let mut contract_sources = self
+			.test_definition
+			.metadata
+			.contract_sources()
+			.inspect_err(|err| {
+				error!(
+					?err,
+					platform_identifier = %self.platform_information.platform.platform_identifier(),
+					"Failed to retrieve contract sources from metadata"
+				)
+			})
+			.context("Failed to get the contract instances from the metadata file")?;
+		for library_instance in self
+			.test_definition
+			.metadata
+			.libraries
+			.iter()
+			.flatten()
+			.flat_map(|(_, map)| map.values())
+		{
+			debug!(%library_instance, "Deploying Library Instance");
+
+			let ContractPathAndIdent {
+				contract_source_path: library_source_path,
+				contract_ident: library_ident,
+			} = contract_sources
+				.remove(library_instance)
+				.context("Failed to get the contract sources of the contract instance")?;
+
+			let (code, abi) = compiler_output
+				.contracts
+				.get(&library_source_path)
+				.and_then(|contracts| contracts.get(library_ident.as_str()))
+				.context("Failed to get the code and abi for the instance")?;
+
+			let code = alloy::hex::decode(code)?;
+
+			// 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 = self
+				.test_definition
+				.case
+				.steps
+				.iter()
+				.filter_map(|step| match step {
+					Step::FunctionCall(input) => input.caller.as_address().copied(),
+					Step::BalanceAssertion(..) => None,
+					Step::StorageEmptyAssertion(..) => None,
+					Step::Repeat(..) => None,
+					Step::AllocateAccount(..) => None,
+				})
+				.next()
+				.unwrap_or(FunctionCallStep::default_caller_address());
+			let tx = TransactionBuilder::<Ethereum>::with_deploy_code(
+				TransactionRequest::default().from(deployer_address),
+				code,
+			);
+			let receipt = self.execute_transaction(tx).await.inspect_err(|err| {
+				error!(
+					?err,
+					%library_instance,
+					platform_identifier = %self.platform_information.platform.platform_identifier(),
+					"Failed to deploy the library"
+				)
+			})?;
+
+			debug!(
+				?library_instance,
+				platform_identifier = %self.platform_information.platform.platform_identifier(),
+				"Deployed library"
+			);
+
+			let library_address = receipt.contract_address.expect("Failed to deploy the library");
+
+			deployed_libraries.get_or_insert_default().insert(
+				library_instance.clone(),
+				(library_ident.clone(), library_address, abi.clone()),
+			);
+		}
+
+		let compiler_output = cached_compiler
+			.compile_contracts(
+				self.test_definition.metadata,
+				self.test_definition.metadata_file_path,
+				self.test_definition.mode.clone(),
+				deployed_libraries.as_ref(),
+				self.platform_information.compiler.as_ref(),
+				self.platform_information.platform,
+				&self.platform_information.reporter,
+			)
+			.await
+			.inspect_err(|err| {
+				error!(
+					?err,
+					platform_identifier = %self.platform_information.platform.platform_identifier(),
+					"Post-linking compilation failed"
+				)
+			})
+			.context("Failed to compile the post-link contracts")?;
+
+		self.execution_state =
+			ExecutionState::new(compiler_output.contracts, deployed_libraries.unwrap_or_default());
+
+		Ok(())
+	}
+	// endregion:Constructors & Initialization
+
+	// region:Step Handling
+	pub async fn execute_all(mut self) -> Result<usize> {
+		while let Some(result) = self.execute_next_step().await {
+			result?
+		}
+		Ok(self.steps_executed)
+	}
+
+	pub async fn execute_next_step(&mut self) -> Option<Result<()>> {
+		let (step_path, step) = self.steps_iterator.next()?;
+		info!(%step_path, "Executing Step");
+		Some(
+			self.execute_step(&step_path, &step)
+				.await
+				.inspect(|_| info!(%step_path, "Step execution succeeded"))
+				.inspect_err(|err| error!(%step_path, ?err, "Step execution failed")),
+		)
+	}
+
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(
+            driver_id = self.driver_id,
+            platform_identifier = %self.platform_information.platform.platform_identifier(),
+            %step_path,
+        ),
+        err(Debug),
+    )]
+	async fn execute_step(&mut self, step_path: &StepPath, step: &Step) -> Result<()> {
+		let steps_executed = match step {
+			Step::FunctionCall(step) => self
+				.execute_function_call(step_path, step.as_ref())
+				.await
+				.context("Function call step Failed"),
+			Step::Repeat(step) => self
+				.execute_repeat_step(step_path, step.as_ref())
+				.await
+				.context("Repetition Step Failed"),
+			Step::AllocateAccount(step) => self
+				.execute_account_allocation(step_path, step.as_ref())
+				.await
+				.context("Account Allocation Step Failed"),
+			// The following steps are disabled in the benchmarking driver.
+			Step::BalanceAssertion(..) | Step::StorageEmptyAssertion(..) => Ok(0),
+		}?;
+		self.steps_executed += steps_executed;
+		Ok(())
+	}
+
+	#[instrument(level = "info", skip_all, fields(driver_id = self.driver_id))]
+	pub async fn execute_function_call(
+		&mut self,
+		_: &StepPath,
+		step: &FunctionCallStep,
+	) -> Result<usize> {
+		let deployment_receipts = self
+			.handle_function_call_contract_deployment(step)
+			.await
+			.context("Failed to deploy contracts for the function call step")?;
+		let execution_receipt = self
+			.handle_function_call_execution(step, deployment_receipts)
+			.await
+			.context("Failed to handle the function call execution")?;
+		let tracing_result = self
+			.handle_function_call_call_frame_tracing(execution_receipt.transaction_hash)
+			.await
+			.context("Failed to handle the function call call frame tracing")?;
+		self.handle_function_call_variable_assignment(step, &tracing_result)
+			.await
+			.context("Failed to handle function call variable assignment")?;
+		Ok(1)
+	}
+
+	async fn handle_function_call_contract_deployment(
+		&mut self,
+		step: &FunctionCallStep,
+	) -> Result<HashMap<ContractInstance, TransactionReceipt>> {
+		let mut instances_we_must_deploy = IndexMap::<ContractInstance, bool>::new();
+		for instance in step.find_all_contract_instances().into_iter() {
+			if !self.execution_state.deployed_contracts.contains_key(&instance) {
+				instances_we_must_deploy.entry(instance).or_insert(false);
+			}
+		}
+		if let Method::Deployer = step.method {
+			instances_we_must_deploy.swap_remove(&step.instance);
+			instances_we_must_deploy.insert(step.instance.clone(), true);
+		}
+
+		let mut receipts = HashMap::new();
+		for (instance, deploy_with_constructor_arguments) in instances_we_must_deploy.into_iter() {
+			let calldata = deploy_with_constructor_arguments.then_some(&step.calldata);
+			let value = deploy_with_constructor_arguments.then_some(step.value).flatten();
+
+			let caller = {
+				let context = self.default_resolution_context();
+				step.caller.resolve_address(self.resolver.as_ref(), context).await?
+			};
+			if let (_, _, Some(receipt)) = self
+				.get_or_deploy_contract_instance(&instance, caller, calldata, value)
+				.await
+				.context("Failed to get or deploy contract instance during input execution")?
+			{
+				receipts.insert(instance.clone(), receipt);
+			}
+		}
+
+		Ok(receipts)
+	}
+
+	async fn handle_function_call_execution(
+		&mut self,
+		step: &FunctionCallStep,
+		mut deployment_receipts: HashMap<ContractInstance, TransactionReceipt>,
+	) -> Result<TransactionReceipt> {
+		match step.method {
+			// This step was already executed when `handle_step` was called. We just need to
+			// lookup the transaction receipt in this case and continue on.
+			Method::Deployer => deployment_receipts
+				.remove(&step.instance)
+				.context("Failed to find deployment receipt for constructor call"),
+			Method::Fallback | Method::FunctionName(_) => {
+				let tx = step
+					.as_transaction(self.resolver.as_ref(), self.default_resolution_context())
+					.await?;
+				self.execute_transaction(tx).await
+			},
+		}
+	}
+
+	async fn handle_function_call_call_frame_tracing(
+		&mut self,
+		tx_hash: TxHash,
+	) -> Result<CallFrame> {
+		self.platform_information
+			.node
+			.trace_transaction(
+				tx_hash,
+				GethDebugTracingOptions {
+					tracer: Some(GethDebugTracerType::BuiltInTracer(
+						GethDebugBuiltInTracerType::CallTracer,
+					)),
+					tracer_config: GethDebugTracerConfig(serde_json::json! {{
+						"onlyTopCall": true,
+						"withLog": false,
+						"withStorage": false,
+						"withMemory": false,
+						"withStack": false,
+						"withReturnData": true
+					}}),
+					..Default::default()
+				},
+			)
+			.await
+			.map(|trace| {
+				trace
+					.try_into_call_frame()
+					.expect("Impossible - we requested a callframe trace so we must get it back")
+			})
+	}
+
+	async fn handle_function_call_variable_assignment(
+		&mut self,
+		step: &FunctionCallStep,
+		tracing_result: &CallFrame,
+	) -> Result<()> {
+		let Some(ref assignments) = step.variable_assignments else {
+			return Ok(());
+		};
+
+		// Handling the return data variable assignments.
+		for (variable_name, output_word) in assignments
+			.return_data
+			.iter()
+			.zip(tracing_result.output.as_ref().unwrap_or_default().to_vec().chunks(32))
+		{
+			let value = U256::from_be_slice(output_word);
+			self.execution_state.variables.insert(variable_name.clone(), value);
+			tracing::info!(
+				variable_name,
+				variable_value = hex::encode(value.to_be_bytes::<32>()),
+				"Assigned variable"
+			);
+		}
+
+		Ok(())
+	}
+
+	#[instrument(level = "info", skip_all, fields(driver_id = self.driver_id))]
+	pub async fn execute_balance_assertion(
+		&mut self,
+		_: &StepPath,
+		_: &BalanceAssertionStep,
+	) -> anyhow::Result<usize> {
+		// Kept empty intentionally for the benchmark driver.
+		Ok(1)
+	}
+
+	#[instrument(level = "info", skip_all, fields(driver_id = self.driver_id), err(Debug))]
+	async fn execute_storage_empty_assertion_step(
+		&mut self,
+		_: &StepPath,
+		_: &StorageEmptyAssertionStep,
+	) -> Result<usize> {
+		// Kept empty intentionally for the benchmark driver.
+		Ok(1)
+	}
+
+	#[instrument(level = "info", skip_all, fields(driver_id = self.driver_id), err(Debug))]
+	async fn execute_repeat_step(
+		&mut self,
+		step_path: &StepPath,
+		step: &RepeatStep,
+	) -> Result<usize> {
+		let tasks = (0..step.repeat)
+			.map(|_| Driver {
+				driver_id: DRIVER_COUNT.fetch_add(1, Ordering::SeqCst),
+				platform_information: self.platform_information,
+				resolver: self.resolver.clone(),
+				test_definition: self.test_definition,
+				private_key_allocator: self.private_key_allocator.clone(),
+				execution_state: self.execution_state.clone(),
+				steps_executed: 0,
+				steps_iterator: {
+					let steps = step
+						.steps
+						.iter()
+						.cloned()
+						.enumerate()
+						.map(|(step_idx, step)| {
+							let step_idx = StepIdx::new(step_idx);
+							let step_path = step_path.append(step_idx);
+							(step_path, step)
+						})
+						.collect::<Vec<_>>();
+					steps.into_iter()
+				},
+				watcher_tx: self.watcher_tx.clone(),
+			})
+			.map(|driver| driver.execute_all());
+
+		// TODO: Determine how we want to know the `ignore_block_before` and if it's through the
+		// receipt and how this would impact the architecture and the possibility of us not waiting
+		// for receipts in the future.
+		self.watcher_tx
+			.send(WatcherEvent::RepetitionStartEvent { ignore_block_before: 0 })
+			.context("Failed to send message on the watcher's tx")?;
+
+		let res = futures::future::try_join_all(tasks)
+			.await
+			.context("Repetition execution failed")?;
+		Ok(res.into_iter().sum())
+	}
+
+	#[instrument(level = "info", fields(driver_id = self.driver_id), skip_all, err(Debug))]
+	pub async fn execute_account_allocation(
+		&mut self,
+		_: &StepPath,
+		step: &AllocateAccountStep,
+	) -> Result<usize> {
+		let Some(variable_name) = step.variable_name.strip_prefix("$VARIABLE:") else {
+			bail!("Account allocation must start with $VARIABLE:");
+		};
+
+		let private_key = self
+			.private_key_allocator
+			.lock()
+			.await
+			.allocate()
+			.context("Account allocation through the private key allocator failed")?;
+		let account = private_key.address();
+		let variable = U256::from_be_slice(account.0.as_slice());
+
+		self.execution_state.variables.insert(variable_name.to_string(), variable);
+
+		Ok(1)
+	}
+	// endregion:Step Handling
+
+	// region:Contract Deployment
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(
+            driver_id = self.driver_id,
+            platform_identifier = %self.platform_information.platform.platform_identifier(),
+            %contract_instance,
+            %deployer
+        ),
+        err(Debug),
+    )]
+	async fn get_or_deploy_contract_instance(
+		&mut self,
+		contract_instance: &ContractInstance,
+		deployer: Address,
+		calldata: Option<&Calldata>,
+		value: Option<EtherValue>,
+	) -> Result<(Address, JsonAbi, Option<TransactionReceipt>)> {
+		if let Some((_, address, abi)) =
+			self.execution_state.deployed_contracts.get(contract_instance)
+		{
+			info!(
+
+				%address,
+				"Contract instance already deployed."
+			);
+			Ok((*address, abi.clone(), None))
+		} else {
+			info!("Contract instance requires deployment.");
+			let (address, abi, receipt) = self
+				.deploy_contract(contract_instance, deployer, calldata, value)
+				.await
+				.context("Failed to deploy contract")?;
+			info!(
+				%address,
+				"Contract instance has been deployed."
+			);
+			Ok((address, abi, Some(receipt)))
+		}
+	}
+
+	#[instrument(
+    level = "info",
+    skip_all,
+        fields(
+            driver_id = self.driver_id,
+            platform_identifier = %self.platform_information.platform.platform_identifier(),
+            %contract_instance,
+            %deployer
+        ),
+        err(Debug),
+    )]
+	async fn deploy_contract(
+		&mut self,
+		contract_instance: &ContractInstance,
+		deployer: Address,
+		calldata: Option<&Calldata>,
+		value: Option<EtherValue>,
+	) -> Result<(Address, JsonAbi, TransactionReceipt)> {
+		let Some(ContractPathAndIdent { contract_source_path, contract_ident }) =
+			self.test_definition.metadata.contract_sources()?.remove(contract_instance)
+		else {
+			anyhow::bail!("Contract source not found for instance {:?}", contract_instance)
+		};
+
+		let Some((code, abi)) = self
+			.execution_state
+			.compiled_contracts
+			.get(&contract_source_path)
+			.and_then(|source_file_contracts| source_file_contracts.get(contract_ident.as_ref()))
+			.cloned()
+		else {
+			anyhow::bail!("Failed to find information for contract {:?}", contract_instance)
+		};
+
+		let mut code = match alloy::hex::decode(&code) {
+			Ok(code) => code,
+			Err(error) => {
+				tracing::error!(
+					?error,
+					contract_source_path = contract_source_path.display().to_string(),
+					contract_ident = contract_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)
+			},
+		};
+
+		if let Some(calldata) = calldata {
+			let calldata = calldata
+				.calldata(self.resolver.as_ref(), self.default_resolution_context())
+				.await?;
+			code.extend(calldata);
+		}
+
+		let tx = {
+			let tx = TransactionRequest::default().from(deployer);
+			let tx = match value {
+				Some(ref value) => tx.value(value.into_inner()),
+				_ => tx,
+			};
+			TransactionBuilder::<Ethereum>::with_deploy_code(tx, code)
+		};
+
+		let receipt = match self.execute_transaction(tx).await {
+			Ok(receipt) => receipt,
+			Err(error) => {
+				tracing::error!(?error, "Contract deployment transaction failed.");
+				return Err(error);
+			},
+		};
+
+		let Some(address) = receipt.contract_address else {
+			anyhow::bail!("Contract deployment didn't return an address");
+		};
+		tracing::info!(
+			instance_name = ?contract_instance,
+			instance_address = ?address,
+			"Deployed contract"
+		);
+		self.platform_information
+			.reporter
+			.report_contract_deployed_event(contract_instance.clone(), address)?;
+
+		self.execution_state
+			.deployed_contracts
+			.insert(contract_instance.clone(), (contract_ident, address, abi.clone()));
+
+		Ok((address, abi, receipt))
+	}
+
+	#[instrument(level = "info", fields(driver_id = self.driver_id), skip_all)]
+	async fn step_address_auto_deployment(
+		&mut self,
+		step_address: &StepAddress,
+	) -> Result<Address> {
+		match step_address {
+			StepAddress::Address(address) => Ok(*address),
+			StepAddress::ResolvableAddress(resolvable) => {
+				let Some(instance) = resolvable.strip_suffix(".address").map(ContractInstance::new)
+				else {
+					bail!("Not an address variable");
+				};
+
+				self.get_or_deploy_contract_instance(
+					&instance,
+					FunctionCallStep::default_caller_address(),
+					None,
+					None,
+				)
+				.await
+				.map(|v| v.0)
+			},
+		}
+	}
+	// endregion:Contract Deployment
+
+	// region:Resolution & Resolver
+	fn default_resolution_context(&self) -> ResolutionContext<'_> {
+		ResolutionContext::default()
+			.with_deployed_contracts(&self.execution_state.deployed_contracts)
+			.with_variables(&self.execution_state.variables)
+	}
+	// endregion:Resolution & Resolver
+
+	// region:Transaction Execution
+	/// Executes the transaction on the driver's node with some custom waiting logic for the receipt
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(driver_id = self.driver_id, transaction_hash = tracing::field::Empty)
+    )]
+	async fn execute_transaction(
+		&self,
+		transaction: TransactionRequest,
+	) -> anyhow::Result<TransactionReceipt> {
+		let node = self.platform_information.node;
+		let transaction_hash = node
+			.submit_transaction(transaction)
+			.await
+			.context("Failed to submit transaction")?;
+		Span::current().record("transaction_hash", display(transaction_hash));
+
+		info!("Submitted transaction");
+		self.watcher_tx
+			.send(WatcherEvent::SubmittedTransaction { transaction_hash })
+			.context("Failed to send the transaction hash to the watcher")?;
+
+		info!("Starting to poll for transaction receipt");
+		poll(
+			Duration::from_secs(30 * 60),
+			PollingWaitBehavior::Constant(Duration::from_secs(1)),
+			|| {
+				async move {
+					match node.get_receipt(transaction_hash).await {
+						Ok(receipt) => {
+							info!("Polling succeeded, receipt found");
+							Ok(ControlFlow::Break(receipt))
+						},
+						Err(_) => Ok(ControlFlow::Continue(())),
+					}
+				}
+				.instrument(info_span!("Polling for receipt"))
+			},
+		)
+		.await
+	}
+	// endregion:Transaction Execution
+}

crates/core/src/differential_benchmarks/entry_point.rs

@@ -0,0 +1,170 @@
+//! The main entry point for differential benchmarking.
+
+use std::{collections::BTreeMap, sync::Arc};
+
+use anyhow::Context as _;
+use futures::{FutureExt, StreamExt};
+use revive_dt_common::types::PrivateKeyAllocator;
+use revive_dt_core::Platform;
+use revive_dt_format::steps::{Step, StepIdx, StepPath};
+use tokio::sync::Mutex;
+use tracing::{error, info, info_span, instrument, warn};
+
+use revive_dt_config::{BenchmarkingContext, Context};
+use revive_dt_report::Reporter;
+
+use crate::{
+	differential_benchmarks::{Driver, Watcher, WatcherEvent},
+	helpers::{CachedCompiler, NodePool, collect_metadata_files, create_test_definitions_stream},
+};
+
+/// Handles the differential testing executing it according to the information defined in the
+/// context
+#[instrument(level = "info", err(Debug), skip_all)]
+pub async fn handle_differential_benchmarks(
+	mut context: BenchmarkingContext,
+	reporter: Reporter,
+) -> anyhow::Result<()> {
+	// A bit of a hack but we need to override the number of nodes specified through the CLI since
+	// benchmarks can only be run on a single node. Perhaps in the future we'd have a cleaner way to
+	// do this. But, for the time being, we need to override the cli arguments.
+	if context.concurrency_configuration.number_of_nodes != 1 {
+		warn!(
+			specified_number_of_nodes = context.concurrency_configuration.number_of_nodes,
+			updated_number_of_nodes = 1,
+			"Invalid number of nodes specified through the CLI. Benchmarks can only be run on a single node. Updated the arguments."
+		);
+		context.concurrency_configuration.number_of_nodes = 1;
+	};
+	let full_context = Context::Benchmark(Box::new(context.clone()));
+
+	// Discover all of the metadata files that are defined in the context.
+	let metadata_files = collect_metadata_files(&context)
+		.context("Failed to collect metadata files for differential testing")?;
+	info!(len = metadata_files.len(), "Discovered metadata files");
+
+	// Discover the list of platforms that the tests should run on based on the context.
+	let platforms = context
+		.platforms
+		.iter()
+		.copied()
+		.map(Into::<&dyn Platform>::into)
+		.collect::<Vec<_>>();
+
+	// Starting the nodes of the various platforms specified in the context. Note that we use the
+	// node pool since it contains all of the code needed to spawn nodes from A to Z and therefore
+	// it's the preferred way for us to start nodes even when we're starting just a single node. The
+	// added overhead from it is quite small (performance wise) since it's involved only when we're
+	// creating the test definitions, but it might have other maintenance overhead as it obscures
+	// the fact that only a single node is spawned.
+	let platforms_and_nodes = {
+		let mut map = BTreeMap::new();
+
+		for platform in platforms.iter() {
+			let platform_identifier = platform.platform_identifier();
+
+			let node_pool = NodePool::new(full_context.clone(), *platform)
+				.await
+				.inspect_err(|err| {
+					error!(
+						?err,
+						%platform_identifier,
+						"Failed to initialize the node pool for the platform."
+					)
+				})
+				.context("Failed to initialize the node pool")?;
+
+			map.insert(platform_identifier, (*platform, node_pool));
+		}
+
+		map
+	};
+	info!("Spawned the platform nodes");
+
+	// Preparing test definitions for the execution.
+	let test_definitions = create_test_definitions_stream(
+		&full_context,
+		metadata_files.iter(),
+		&platforms_and_nodes,
+		reporter.clone(),
+	)
+	.await
+	.collect::<Vec<_>>()
+	.await;
+	info!(len = test_definitions.len(), "Created test definitions");
+
+	// Creating the objects that will be shared between the various runs. The cached compiler is the
+	// only one at the current moment of time that's safe to share between runs.
+	let cached_compiler = CachedCompiler::new(
+		context.working_directory.as_path().join("compilation_cache"),
+		context.compilation_configuration.invalidate_compilation_cache,
+	)
+	.await
+	.map(Arc::new)
+	.context("Failed to initialize cached compiler")?;
+
+	// Note: we do not want to run all of the workloads concurrently on all platforms. Rather, we'd
+	// like to run all of the workloads for one platform, and then the next sequentially as we'd
+	// like for the effect of concurrency to be minimized when we're doing the benchmarking.
+	for platform in platforms.iter() {
+		let platform_identifier = platform.platform_identifier();
+
+		let span = info_span!("Benchmarking for the platform", %platform_identifier);
+		let _guard = span.enter();
+
+		for test_definition in test_definitions.iter() {
+			let platform_information = &test_definition.platforms[&platform_identifier];
+
+			let span = info_span!(
+				"Executing workload",
+				metadata_file_path = %test_definition.metadata_file_path.display(),
+				case_idx = %test_definition.case_idx,
+				mode = %test_definition.mode,
+			);
+			let _guard = span.enter();
+
+			// Initializing all of the components requires to execute this particular workload.
+			let private_key_allocator = Arc::new(Mutex::new(PrivateKeyAllocator::new(
+				context.wallet_configuration.highest_private_key_exclusive(),
+			)));
+			let (watcher, watcher_tx) = Watcher::new(
+				platform_identifier,
+				platform_information
+					.node
+					.subscribe_to_full_blocks_information()
+					.await
+					.context("Failed to subscribe to full blocks information from the node")?,
+			);
+			let driver = Driver::new(
+				platform_information,
+				test_definition,
+				private_key_allocator,
+				cached_compiler.as_ref(),
+				watcher_tx.clone(),
+				test_definition
+					.case
+					.steps_iterator_for_benchmarks(context.default_repetition_count)
+					.enumerate()
+					.map(|(step_idx, step)| -> (StepPath, Step) {
+						(StepPath::new(vec![StepIdx::new(step_idx)]), step)
+					}),
+			)
+			.await
+			.context("Failed to create the benchmarks driver")?;
+
+			futures::future::try_join(
+				watcher.run(),
+				driver.execute_all().inspect(|_| {
+					info!("All transactions submitted - driver completed execution");
+					watcher_tx.send(WatcherEvent::AllTransactionsSubmitted).unwrap()
+				}),
+			)
+			.await
+			.context("Failed to run the driver and executor")
+			.inspect(|(_, steps_executed)| info!(steps_executed, "Workload Execution Succeeded"))
+			.inspect_err(|err| error!(?err, "Workload Execution Failed"))?;
+		}
+	}
+
+	Ok(())
+}

crates/core/src/differential_benchmarks/execution_state.rs

@@ -0,0 +1,40 @@
+use std::{collections::HashMap, path::PathBuf};
+
+use alloy::{
+	json_abi::JsonAbi,
+	primitives::{Address, U256},
+};
+
+use revive_dt_format::metadata::{ContractIdent, ContractInstance};
+
+#[derive(Clone)]
+/// The state associated with the test execution of one of the workloads.
+pub struct ExecutionState {
+	/// The compiled contracts, these contracts have been compiled and have had the libraries
+	/// linked against them and therefore they're ready to be deployed on-demand.
+	pub compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+
+	/// A map of all of the deployed contracts and information about them.
+	pub deployed_contracts: HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>,
+
+	/// This map stores the variables used for each one of the cases contained in the metadata
+	/// file.
+	pub variables: HashMap<String, U256>,
+}
+
+impl ExecutionState {
+	pub fn new(
+		compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+		deployed_contracts: HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>,
+	) -> Self {
+		Self { compiled_contracts, deployed_contracts, variables: Default::default() }
+	}
+
+	pub fn empty() -> Self {
+		Self {
+			compiled_contracts: Default::default(),
+			deployed_contracts: Default::default(),
+			variables: Default::default(),
+		}
+	}
+}

crates/core/src/differential_benchmarks/mod.rs

@@ -0,0 +1,9 @@
+mod driver;
+mod entry_point;
+mod execution_state;
+mod watcher;
+
+pub use driver::*;
+pub use entry_point::*;
+pub use execution_state::*;
+pub use watcher::*;

crates/core/src/differential_benchmarks/watcher.rs

@@ -0,0 +1,189 @@
+use std::{collections::HashSet, pin::Pin, sync::Arc};
+
+use alloy::primitives::{BlockNumber, TxHash};
+use anyhow::Result;
+use futures::{Stream, StreamExt};
+use revive_dt_common::types::PlatformIdentifier;
+use revive_dt_node_interaction::MinedBlockInformation;
+use tokio::sync::{
+	RwLock,
+	mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel},
+};
+use tracing::{info, instrument};
+
+/// This struct defines the watcher used in the benchmarks. A watcher is only valid for 1 workload
+/// and MUST NOT be re-used between workloads since it holds important internal state for a given
+/// workload and is not designed for reuse.
+pub struct Watcher {
+	/// The identifier of the platform that this watcher is for.
+	platform_identifier: PlatformIdentifier,
+
+	/// The receive side of the channel that all of the drivers and various other parts of the code
+	/// send events to the watcher on.
+	rx: UnboundedReceiver<WatcherEvent>,
+
+	/// This is a stream of the blocks that were mined by the node. This is for a single platform
+	/// and a single node from that platform.
+	blocks_stream: Pin<Box<dyn Stream<Item = MinedBlockInformation>>>,
+}
+
+impl Watcher {
+	pub fn new(
+		platform_identifier: PlatformIdentifier,
+		blocks_stream: Pin<Box<dyn Stream<Item = MinedBlockInformation>>>,
+	) -> (Self, UnboundedSender<WatcherEvent>) {
+		let (tx, rx) = unbounded_channel::<WatcherEvent>();
+		(Self { platform_identifier, rx, blocks_stream }, tx)
+	}
+
+	#[instrument(level = "info", skip_all)]
+	pub async fn run(mut self) -> Result<()> {
+		// The first event that the watcher receives must be a `RepetitionStartEvent` that informs
+		// the watcher of the last block number that it should ignore and what the block number is
+		// for the first important block that it should look for.
+		let ignore_block_before = loop {
+			let Some(WatcherEvent::RepetitionStartEvent { ignore_block_before }) =
+				self.rx.recv().await
+			else {
+				continue;
+			};
+			break ignore_block_before;
+		};
+
+		// This is the set of the transaction hashes that the watcher should be looking for and
+		// watch for them in the blocks. The watcher will keep watching for blocks until it sees
+		// that all of the transactions that it was watching for has been seen in the mined blocks.
+		let watch_for_transaction_hashes = Arc::new(RwLock::new(HashSet::<TxHash>::new()));
+
+		// A boolean that keeps track of whether all of the transactions were submitted or if more
+		// txs are expected to come through the receive side of the channel. We do not want to rely
+		// on the channel closing alone for the watcher to know that all of the transactions were
+		// submitted and for there to be an explicit event sent by the core orchestrator that
+		// informs the watcher that no further transactions are to be expected and that it can
+		// safely ignore the channel.
+		let all_transactions_submitted = Arc::new(RwLock::new(false));
+
+		let watcher_event_watching_task = {
+			let watch_for_transaction_hashes = watch_for_transaction_hashes.clone();
+			let all_transactions_submitted = all_transactions_submitted.clone();
+			async move {
+				while let Some(watcher_event) = self.rx.recv().await {
+					match watcher_event {
+						// Subsequent repetition starts are ignored since certain workloads can
+						// contain nested repetitions and therefore there's no use in doing any
+						// action if the repetitions are nested.
+						WatcherEvent::RepetitionStartEvent { .. } => {},
+						WatcherEvent::SubmittedTransaction { transaction_hash } => {
+							watch_for_transaction_hashes.write().await.insert(transaction_hash);
+						},
+						WatcherEvent::AllTransactionsSubmitted => {
+							*all_transactions_submitted.write().await = true;
+							self.rx.close();
+							info!("Watcher's Events Watching Task Finished");
+							break;
+						},
+					}
+				}
+			}
+		};
+		let block_information_watching_task = {
+			let watch_for_transaction_hashes = watch_for_transaction_hashes.clone();
+			let all_transactions_submitted = all_transactions_submitted.clone();
+			let mut blocks_information_stream = self.blocks_stream;
+			async move {
+				let mut mined_blocks_information = Vec::new();
+
+				while let Some(block) = blocks_information_stream.next().await {
+					// If the block number is equal to or less than the last block before the
+					// repetition then we ignore it and continue on to the next block.
+					if block.block_number <= ignore_block_before {
+						continue;
+					}
+
+					if *all_transactions_submitted.read().await &&
+						watch_for_transaction_hashes.read().await.is_empty()
+					{
+						break;
+					}
+
+					info!(
+						remaining_transactions = watch_for_transaction_hashes.read().await.len(),
+						block_tx_count = block.transaction_hashes.len(),
+						"Observed a block"
+					);
+
+					// Remove all of the transaction hashes observed in this block from the txs we
+					// are currently watching for.
+					let mut watch_for_transaction_hashes =
+						watch_for_transaction_hashes.write().await;
+					for tx_hash in block.transaction_hashes.iter() {
+						watch_for_transaction_hashes.remove(tx_hash);
+					}
+
+					mined_blocks_information.push(block);
+				}
+
+				info!("Watcher's Block Watching Task Finished");
+				mined_blocks_information
+			}
+		};
+
+		let (_, mined_blocks_information) =
+			futures::future::join(watcher_event_watching_task, block_information_watching_task)
+				.await;
+
+		// region:TEMPORARY
+		{
+			// TODO: The following core is TEMPORARY and will be removed once we have proper
+			// reporting in place and then it can be removed. This serves as as way of doing some
+			// very simple reporting for the time being.
+			use std::io::Write;
+
+			let mut stderr = std::io::stderr().lock();
+			writeln!(stderr, "Watcher information for {}", self.platform_identifier)?;
+			writeln!(stderr, "block_number,block_timestamp,mined_gas,block_gas_limit,tx_count")?;
+			for block in mined_blocks_information {
+				writeln!(
+					stderr,
+					"{},{},{},{},{}",
+					block.block_number,
+					block.block_timestamp,
+					block.mined_gas,
+					block.block_gas_limit,
+					block.transaction_hashes.len()
+				)?
+			}
+		}
+		// endregion:TEMPORARY
+
+		Ok(())
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum WatcherEvent {
+	/// Informs the watcher that it should begin watching for the blocks mined by the platforms.
+	/// Before the watcher receives this event it will not be watching for the mined blocks. The
+	/// reason behind this is that we do not want the initialization transactions (e.g., contract
+	/// deployments) to be included in the overall TPS and GPS measurements since these blocks will
+	/// most likely only contain a single transaction since they're just being used for
+	/// initialization.
+	RepetitionStartEvent {
+		/// This is the block number of the last block seen before the repetition started. This is
+		/// used to instruct the watcher to ignore all block prior to this block when it starts
+		/// streaming the blocks.
+		ignore_block_before: BlockNumber,
+	},
+
+	/// Informs the watcher that a transaction was submitted and that the watcher should watch for a
+	/// transaction with this hash in the blocks that it watches.
+	SubmittedTransaction {
+		/// The hash of the submitted transaction.
+		transaction_hash: TxHash,
+	},
+
+	/// Informs the watcher that all of the transactions of this benchmark have been submitted and
+	/// that it can expect to receive no further transaction hashes and not even watch the channel
+	/// any longer.
+	AllTransactionsSubmitted,
+}

crates/core/src/differential_tests/entry_point.rs

@@ -0,0 +1,266 @@
+//! The main entry point into differential testing.
+
+use std::{
+	collections::{BTreeMap, BTreeSet},
+	io::{BufWriter, Write, stderr},
+	sync::Arc,
+	time::{Duration, Instant},
+};
+
+use crate::Platform;
+use anyhow::Context as _;
+use futures::{FutureExt, StreamExt};
+use revive_dt_common::types::PrivateKeyAllocator;
+use tokio::sync::{Mutex, RwLock, Semaphore};
+use tracing::{Instrument, error, info, info_span, instrument};
+
+use revive_dt_config::{Context, TestExecutionContext};
+use revive_dt_report::{Reporter, ReporterEvent, TestCaseStatus};
+
+use crate::{
+	differential_tests::Driver,
+	helpers::{CachedCompiler, NodePool, collect_metadata_files, create_test_definitions_stream},
+};
+
+/// Handles the differential testing executing it according to the information defined in the
+/// context
+#[instrument(level = "info", err(Debug), skip_all)]
+pub async fn handle_differential_tests(
+	context: TestExecutionContext,
+	reporter: Reporter,
+) -> anyhow::Result<()> {
+	let reporter_clone = reporter.clone();
+
+	// Discover all of the metadata files that are defined in the context.
+	let metadata_files = collect_metadata_files(&context)
+		.context("Failed to collect metadata files for differential testing")?;
+	info!(len = metadata_files.len(), "Discovered metadata files");
+
+	// Discover the list of platforms that the tests should run on based on the context.
+	let platforms = context
+		.platforms
+		.iter()
+		.copied()
+		.map(Into::<&dyn Platform>::into)
+		.collect::<Vec<_>>();
+
+	// Starting the nodes of the various platforms specified in the context.
+	let platforms_and_nodes = {
+		let mut map = BTreeMap::new();
+
+		for platform in platforms.iter() {
+			let platform_identifier = platform.platform_identifier();
+
+			let context = Context::Test(Box::new(context.clone()));
+			let node_pool = NodePool::new(context, *platform)
+				.await
+				.inspect_err(|err| {
+					error!(
+						?err,
+						%platform_identifier,
+						"Failed to initialize the node pool for the platform."
+					)
+				})
+				.context("Failed to initialize the node pool")?;
+
+			map.insert(platform_identifier, (*platform, node_pool));
+		}
+
+		map
+	};
+	info!("Spawned the platform nodes");
+
+	// Preparing test definitions.
+	let full_context = Context::Test(Box::new(context.clone()));
+	let test_definitions = create_test_definitions_stream(
+		&full_context,
+		metadata_files.iter(),
+		&platforms_and_nodes,
+		reporter.clone(),
+	)
+	.await
+	.collect::<Vec<_>>()
+	.await;
+	info!(len = test_definitions.len(), "Created test definitions");
+
+	// Creating everything else required for the driver to run.
+	let cached_compiler = CachedCompiler::new(
+		context.working_directory.as_path().join("compilation_cache"),
+		context.compilation_configuration.invalidate_compilation_cache,
+	)
+	.await
+	.map(Arc::new)
+	.context("Failed to initialize cached compiler")?;
+	let private_key_allocator = Arc::new(Mutex::new(PrivateKeyAllocator::new(
+		context.wallet_configuration.highest_private_key_exclusive(),
+	)));
+
+	// Creating the driver and executing all of the steps.
+	let semaphore = context
+		.concurrency_configuration
+		.concurrency_limit()
+		.map(Semaphore::new)
+		.map(Arc::new);
+	let running_task_list = Arc::new(RwLock::new(BTreeSet::<usize>::new()));
+	let driver_task = futures::future::join_all(test_definitions.iter().enumerate().map(
+		|(test_id, test_definition)| {
+			let running_task_list = running_task_list.clone();
+			let semaphore = semaphore.clone();
+
+			let private_key_allocator = private_key_allocator.clone();
+			let cached_compiler = cached_compiler.clone();
+			let mode = test_definition.mode.clone();
+			let span = info_span!(
+				"Executing Test Case",
+				test_id,
+				metadata_file_path = %test_definition.metadata_file_path.display(),
+				case_idx = %test_definition.case_idx,
+				mode = %mode,
+			);
+			async move {
+				let permit = match semaphore.as_ref() {
+					Some(semaphore) => Some(semaphore.acquire().await.expect("Can't fail")),
+					None => None,
+				};
+
+				running_task_list.write().await.insert(test_id);
+				let driver = match Driver::new_root(
+					test_definition,
+					private_key_allocator,
+					&cached_compiler,
+				)
+				.await
+				{
+					Ok(driver) => driver,
+					Err(error) => {
+						test_definition
+							.reporter
+							.report_test_failed_event(format!("{error:#}"))
+							.expect("Can't fail");
+						error!("Test Case Failed");
+						drop(permit);
+						running_task_list.write().await.remove(&test_id);
+						return;
+					},
+				};
+				info!("Created the driver for the test case");
+
+				match driver.execute_all().await {
+					Ok(steps_executed) => test_definition
+						.reporter
+						.report_test_succeeded_event(steps_executed)
+						.expect("Can't fail"),
+					Err(error) => {
+						test_definition
+							.reporter
+							.report_test_failed_event(format!("{error:#}"))
+							.expect("Can't fail");
+						error!("Test Case Failed");
+					},
+				};
+				info!("Finished the execution of the test case");
+				drop(permit);
+				running_task_list.write().await.remove(&test_id);
+			}
+			.instrument(span)
+		},
+	))
+	.inspect(|_| {
+		info!("Finished executing all test cases");
+		reporter_clone.report_completion_event().expect("Can't fail")
+	});
+	let cli_reporting_task = start_cli_reporting_task(reporter);
+
+	tokio::task::spawn(async move {
+		loop {
+			let remaining_tasks = running_task_list.read().await;
+			info!(count = remaining_tasks.len(), ?remaining_tasks, "Remaining Tests");
+			tokio::time::sleep(Duration::from_secs(10)).await
+		}
+	});
+
+	futures::future::join(driver_task, cli_reporting_task).await;
+
+	Ok(())
+}
+
+#[allow(irrefutable_let_patterns, clippy::uninlined_format_args)]
+async fn start_cli_reporting_task(reporter: Reporter) {
+	let mut aggregator_events_rx = reporter.subscribe().await.expect("Can't fail");
+	drop(reporter);
+
+	let start = Instant::now();
+
+	const GREEN: &str = "\x1B[32m";
+	const RED: &str = "\x1B[31m";
+	const GREY: &str = "\x1B[90m";
+	const COLOR_RESET: &str = "\x1B[0m";
+	const BOLD: &str = "\x1B[1m";
+	const BOLD_RESET: &str = "\x1B[22m";
+
+	let mut number_of_successes = 0;
+	let mut number_of_failures = 0;
+
+	let mut buf = BufWriter::new(stderr());
+	while let Ok(event) = aggregator_events_rx.recv().await {
+		let ReporterEvent::MetadataFileSolcModeCombinationExecutionCompleted {
+			metadata_file_path,
+			mode,
+			case_status,
+		} = event
+		else {
+			continue;
+		};
+
+		let _ = writeln!(buf, "{} - {}", mode, metadata_file_path.display());
+		for (case_idx, case_status) in case_status.into_iter() {
+			let _ = write!(buf, "\tCase Index {case_idx:>3}: ");
+			let _ = match case_status {
+				TestCaseStatus::Succeeded { steps_executed } => {
+					number_of_successes += 1;
+					writeln!(
+						buf,
+						"{}{}Case Succeeded{} - Steps Executed: {}{}",
+						GREEN, BOLD, BOLD_RESET, steps_executed, COLOR_RESET
+					)
+				},
+				TestCaseStatus::Failed { reason } => {
+					number_of_failures += 1;
+					writeln!(
+						buf,
+						"{}{}Case Failed{} - Reason: {}{}",
+						RED,
+						BOLD,
+						BOLD_RESET,
+						reason.trim(),
+						COLOR_RESET,
+					)
+				},
+				TestCaseStatus::Ignored { reason, .. } => writeln!(
+					buf,
+					"{}{}Case Ignored{} - Reason: {}{}",
+					GREY,
+					BOLD,
+					BOLD_RESET,
+					reason.trim(),
+					COLOR_RESET,
+				),
+			};
+		}
+		let _ = writeln!(buf);
+	}
+
+	// Summary at the end.
+	let _ = writeln!(
+		buf,
+		"{} cases: {}{}{} cases succeeded, {}{}{} cases failed in {} seconds",
+		number_of_successes + number_of_failures,
+		GREEN,
+		number_of_successes,
+		COLOR_RESET,
+		RED,
+		number_of_failures,
+		COLOR_RESET,
+		start.elapsed().as_secs()
+	);
+}

crates/core/src/differential_tests/execution_state.rs

@@ -0,0 +1,32 @@
+use std::{collections::HashMap, path::PathBuf};
+
+use alloy::{
+	json_abi::JsonAbi,
+	primitives::{Address, U256},
+};
+
+use revive_dt_format::metadata::{ContractIdent, ContractInstance};
+
+#[derive(Clone)]
+/// The state associated with the test execution of one of the tests.
+pub struct ExecutionState {
+	/// The compiled contracts, these contracts have been compiled and have had the libraries
+	/// linked against them and therefore they're ready to be deployed on-demand.
+	pub compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+
+	/// A map of all of the deployed contracts and information about them.
+	pub deployed_contracts: HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>,
+
+	/// This map stores the variables used for each one of the cases contained in the metadata
+	/// file.
+	pub variables: HashMap<String, U256>,
+}
+
+impl ExecutionState {
+	pub fn new(
+		compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+		deployed_contracts: HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>,
+	) -> Self {
+		Self { compiled_contracts, deployed_contracts, variables: Default::default() }
+	}
+}

crates/core/src/differential_tests/mod.rs

@@ -0,0 +1,11 @@
+//! This module contains all of the code responsible for performing differential tests including the
+//! driver implementation, state implementation, and the core logic that allows for tests to be
+//! executed.
+
+mod driver;
+mod entry_point;
+mod execution_state;
+
+pub use driver::*;
+pub use entry_point::*;
+pub use execution_state::*;

crates/core/src/driver/mod.rs

@@ -1,890 +0,0 @@
-//! The test driver handles the compilation and execution of the test cases.
-
-use std::collections::HashMap;
-use std::marker::PhantomData;
-use std::path::PathBuf;
-
-use alloy::consensus::EMPTY_ROOT_HASH;
-use alloy::hex;
-use alloy::json_abi::JsonAbi;
-use alloy::network::{Ethereum, TransactionBuilder};
-use alloy::primitives::U256;
-use alloy::rpc::types::TransactionReceipt;
-use alloy::rpc::types::trace::geth::{
-    CallFrame, GethDebugBuiltInTracerType, GethDebugTracerConfig, GethDebugTracerType,
-    GethDebugTracingOptions, GethTrace, PreStateConfig,
-};
-use alloy::{
-    primitives::Address,
-    rpc::types::{
-        TransactionRequest,
-        trace::geth::{AccountState, DiffMode},
-    },
-};
-use anyhow::Context;
-use indexmap::IndexMap;
-use revive_dt_format::traits::{ResolutionContext, ResolverApi};
-use semver::Version;
-
-use revive_dt_format::case::{Case, CaseIdx};
-use revive_dt_format::input::{
-    BalanceAssertion, Calldata, EtherValue, Expected, ExpectedOutput, Input, Method,
-    StorageEmptyAssertion,
-};
-use revive_dt_format::metadata::{ContractInstance, ContractPathAndIdent};
-use revive_dt_format::{input::Step, metadata::Metadata};
-use revive_dt_node::Node;
-use revive_dt_node_interaction::EthereumNode;
-use tracing::Instrument;
-
-use crate::Platform;
-
-pub struct CaseState<T: Platform> {
-    /// A map of all of the compiled contracts for the given metadata file.
-    compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
-
-    /// This map stores the contracts deployments for this case.
-    deployed_contracts: HashMap<ContractInstance, (Address, JsonAbi)>,
-
-    /// This map stores the variables used for each one of the cases contained in the metadata
-    /// file.
-    variables: HashMap<String, U256>,
-
-    /// Stores the version used for the current case.
-    compiler_version: Version,
-
-    phantom: PhantomData<T>,
-}
-
-impl<T> CaseState<T>
-where
-    T: Platform,
-{
-    pub fn new(
-        compiler_version: Version,
-        compiled_contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
-        deployed_contracts: HashMap<ContractInstance, (Address, JsonAbi)>,
-    ) -> Self {
-        Self {
-            compiled_contracts,
-            deployed_contracts,
-            variables: Default::default(),
-            compiler_version,
-            phantom: PhantomData,
-        }
-    }
-
-    pub async fn handle_step(
-        &mut self,
-        metadata: &Metadata,
-        case_idx: CaseIdx,
-        step: &Step,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<StepOutput> {
-        match step {
-            Step::FunctionCall(input) => {
-                let (receipt, geth_trace, diff_mode) =
-                    self.handle_input(metadata, case_idx, input, node).await?;
-                Ok(StepOutput::FunctionCall(receipt, geth_trace, diff_mode))
-            }
-            Step::BalanceAssertion(balance_assertion) => {
-                self.handle_balance_assertion(metadata, case_idx, balance_assertion, node)
-                    .await?;
-                Ok(StepOutput::BalanceAssertion)
-            }
-            Step::StorageEmptyAssertion(storage_empty) => {
-                self.handle_storage_empty(metadata, case_idx, storage_empty, node)
-                    .await?;
-                Ok(StepOutput::StorageEmptyAssertion)
-            }
-        }
-    }
-
-    pub async fn handle_input(
-        &mut self,
-        metadata: &Metadata,
-        case_idx: CaseIdx,
-        input: &Input,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
-        let deployment_receipts = self
-            .handle_input_contract_deployment(metadata, case_idx, input, node)
-            .await?;
-        let execution_receipt = self
-            .handle_input_execution(input, deployment_receipts, node)
-            .await?;
-        let tracing_result = self
-            .handle_input_call_frame_tracing(&execution_receipt, node)
-            .await?;
-        self.handle_input_variable_assignment(input, &tracing_result)?;
-        self.handle_input_expectations(input, &execution_receipt, node, &tracing_result)
-            .await?;
-        self.handle_input_diff(case_idx, execution_receipt, node)
-            .await
-    }
-
-    pub async fn handle_balance_assertion(
-        &mut self,
-        metadata: &Metadata,
-        _: CaseIdx,
-        balance_assertion: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        self.handle_balance_assertion_contract_deployment(metadata, balance_assertion, node)
-            .await?;
-        self.handle_balance_assertion_execution(balance_assertion, node)
-            .await?;
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty(
-        &mut self,
-        metadata: &Metadata,
-        _: CaseIdx,
-        storage_empty: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        self.handle_storage_empty_assertion_contract_deployment(metadata, storage_empty, node)
-            .await?;
-        self.handle_storage_empty_assertion_execution(storage_empty, node)
-            .await?;
-        Ok(())
-    }
-
-    /// Handles the contract deployment for a given input performing it if it needs to be performed.
-    async fn handle_input_contract_deployment(
-        &mut self,
-        metadata: &Metadata,
-        case_idx: CaseIdx,
-        input: &Input,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<HashMap<ContractInstance, TransactionReceipt>> {
-        let span = tracing::debug_span!(
-            "Handling contract deployment",
-            ?case_idx,
-            instance = ?input.instance
-        );
-        let _guard = span.enter();
-
-        let mut instances_we_must_deploy = IndexMap::<ContractInstance, bool>::new();
-        for instance in input.find_all_contract_instances().into_iter() {
-            if !self.deployed_contracts.contains_key(&instance) {
-                instances_we_must_deploy.entry(instance).or_insert(false);
-            }
-        }
-        if let Method::Deployer = input.method {
-            instances_we_must_deploy.swap_remove(&input.instance);
-            instances_we_must_deploy.insert(input.instance.clone(), true);
-        }
-
-        tracing::debug!(
-            instances_to_deploy = instances_we_must_deploy.len(),
-            "Computed the number of required deployments for input"
-        );
-
-        let mut receipts = HashMap::new();
-        for (instance, deploy_with_constructor_arguments) in instances_we_must_deploy.into_iter() {
-            let calldata = deploy_with_constructor_arguments.then_some(&input.calldata);
-            let value = deploy_with_constructor_arguments
-                .then_some(input.value)
-                .flatten();
-
-            if let (_, _, Some(receipt)) = self
-                .get_or_deploy_contract_instance(
-                    &instance,
-                    metadata,
-                    input.caller,
-                    calldata,
-                    value,
-                    node,
-                )
-                .await?
-            {
-                receipts.insert(instance.clone(), receipt);
-            }
-        }
-
-        Ok(receipts)
-    }
-
-    /// Handles the execution of the input in terms of the calls that need to be made.
-    async fn handle_input_execution(
-        &mut self,
-        input: &Input,
-        mut deployment_receipts: HashMap<ContractInstance, TransactionReceipt>,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<TransactionReceipt> {
-        match input.method {
-            // This input was already executed when `handle_input` was called. We just need to
-            // lookup the transaction receipt in this case and continue on.
-            Method::Deployer => deployment_receipts
-                .remove(&input.instance)
-                .context("Failed to find deployment receipt"),
-            Method::Fallback | Method::FunctionName(_) => {
-                let tx = match input
-                    .legacy_transaction(node, self.default_resolution_context())
-                    .await
-                {
-                    Ok(tx) => {
-                        tracing::debug!("Legacy transaction data: {tx:#?}");
-                        tx
-                    }
-                    Err(err) => {
-                        tracing::error!("Failed to construct legacy transaction: {err:?}");
-                        return Err(err);
-                    }
-                };
-
-                tracing::trace!("Executing transaction for input: {input:?}");
-
-                match node.execute_transaction(tx).await {
-                    Ok(receipt) => Ok(receipt),
-                    Err(err) => {
-                        tracing::error!(
-                            "Failed to execute transaction when executing the contract: {}, {:?}",
-                            &*input.instance,
-                            err
-                        );
-                        Err(err)
-                    }
-                }
-            }
-        }
-    }
-
-    async fn handle_input_call_frame_tracing(
-        &self,
-        execution_receipt: &TransactionReceipt,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<CallFrame> {
-        node.trace_transaction(
-            execution_receipt,
-            GethDebugTracingOptions {
-                tracer: Some(GethDebugTracerType::BuiltInTracer(
-                    GethDebugBuiltInTracerType::CallTracer,
-                )),
-                tracer_config: GethDebugTracerConfig(serde_json::json! {{
-                    "onlyTopCall": true,
-                    "withLog": false,
-                    "withReturnData": false
-                }}),
-                ..Default::default()
-            },
-        )
-        .await
-        .map(|trace| {
-            trace
-                .try_into_call_frame()
-                .expect("Impossible - we requested a callframe trace so we must get it back")
-        })
-    }
-
-    fn handle_input_variable_assignment(
-        &mut self,
-        input: &Input,
-        tracing_result: &CallFrame,
-    ) -> anyhow::Result<()> {
-        let Some(ref assignments) = input.variable_assignments else {
-            return Ok(());
-        };
-
-        // Handling the return data variable assignments.
-        for (variable_name, output_word) in assignments.return_data.iter().zip(
-            tracing_result
-                .output
-                .as_ref()
-                .unwrap_or_default()
-                .to_vec()
-                .chunks(32),
-        ) {
-            let value = U256::from_be_slice(output_word);
-            self.variables.insert(variable_name.clone(), value);
-            tracing::info!(
-                variable_name,
-                variable_value = hex::encode(value.to_be_bytes::<32>()),
-                "Assigned variable"
-            );
-        }
-
-        Ok(())
-    }
-
-    async fn handle_input_expectations(
-        &mut self,
-        input: &Input,
-        execution_receipt: &TransactionReceipt,
-        resolver: &impl ResolverApi,
-        tracing_result: &CallFrame,
-    ) -> anyhow::Result<()> {
-        let span = tracing::info_span!("Handling input expectations");
-        let _guard = span.enter();
-
-        // Resolving the `input.expected` into a series of expectations that we can then assert on.
-        let mut expectations = match input {
-            Input {
-                expected: Some(Expected::Calldata(calldata)),
-                ..
-            } => vec![ExpectedOutput::new().with_calldata(calldata.clone())],
-            Input {
-                expected: Some(Expected::Expected(expected)),
-                ..
-            } => vec![expected.clone()],
-            Input {
-                expected: Some(Expected::ExpectedMany(expected)),
-                ..
-            } => expected.clone(),
-            Input { expected: None, .. } => vec![ExpectedOutput::new().with_success()],
-        };
-
-        // This is a bit of a special case and we have to support it separately on it's own. If it's
-        // a call to the deployer method, then the tests will assert that it "returns" the address
-        // of the contract. Deployments do not return the address of the contract but the runtime
-        // code of the contracts. Therefore, this assertion would always fail. So, we replace it
-        // with an assertion of "check if it succeeded"
-        if let Method::Deployer = &input.method {
-            for expectation in expectations.iter_mut() {
-                expectation.return_data = None;
-            }
-        }
-
-        for expectation in expectations.iter() {
-            self.handle_input_expectation_item(
-                execution_receipt,
-                resolver,
-                expectation,
-                tracing_result,
-            )
-            .await?;
-        }
-
-        Ok(())
-    }
-
-    async fn handle_input_expectation_item(
-        &mut self,
-        execution_receipt: &TransactionReceipt,
-        resolver: &impl ResolverApi,
-        expectation: &ExpectedOutput,
-        tracing_result: &CallFrame,
-    ) -> anyhow::Result<()> {
-        if let Some(ref version_requirement) = expectation.compiler_version {
-            if !version_requirement.matches(&self.compiler_version) {
-                return Ok(());
-            }
-        }
-
-        let resolution_context = self
-            .default_resolution_context()
-            .with_block_number(execution_receipt.block_number.as_ref())
-            .with_transaction_hash(&execution_receipt.transaction_hash);
-
-        // Handling the receipt state assertion.
-        let expected = !expectation.exception;
-        let actual = execution_receipt.status();
-        if actual != expected {
-            tracing::error!(
-                expected,
-                actual,
-                ?execution_receipt,
-                ?tracing_result,
-                "Transaction status assertion failed"
-            );
-            anyhow::bail!(
-                "Transaction status assertion failed - Expected {expected} but got {actual}",
-            );
-        }
-
-        // Handling the calldata assertion
-        if let Some(ref expected_calldata) = expectation.return_data {
-            let expected = expected_calldata;
-            let actual = &tracing_result.output.as_ref().unwrap_or_default();
-            if !expected
-                .is_equivalent(actual, resolver, resolution_context)
-                .await?
-            {
-                tracing::error!(
-                    ?execution_receipt,
-                    ?expected,
-                    %actual,
-                    "Calldata assertion failed"
-                );
-                anyhow::bail!("Calldata assertion failed - Expected {expected:?} but got {actual}",);
-            }
-        }
-
-        // Handling the events assertion
-        if let Some(ref expected_events) = expectation.events {
-            // Handling the events length assertion.
-            let expected = expected_events.len();
-            let actual = execution_receipt.logs().len();
-            if actual != expected {
-                tracing::error!(expected, actual, "Event count assertion failed",);
-                anyhow::bail!(
-                    "Event count assertion failed - Expected {expected} but got {actual}",
-                );
-            }
-
-            // Handling the events assertion.
-            for (event_idx, (expected_event, actual_event)) in expected_events
-                .iter()
-                .zip(execution_receipt.logs())
-                .enumerate()
-            {
-                // Handling the emitter assertion.
-                if let Some(ref expected_address) = expected_event.address {
-                    let expected = Address::from_slice(
-                        Calldata::new_compound([expected_address])
-                            .calldata(resolver, resolution_context)
-                            .await?
-                            .get(12..32)
-                            .expect("Can't fail"),
-                    );
-                    let actual = actual_event.address();
-                    if actual != expected {
-                        tracing::error!(
-                            event_idx,
-                            %expected,
-                            %actual,
-                            "Event emitter assertion failed",
-                        );
-                        anyhow::bail!(
-                            "Event emitter assertion failed - Expected {expected} but got {actual}",
-                        );
-                    }
-                }
-
-                // Handling the topics assertion.
-                for (expected, actual) in expected_event
-                    .topics
-                    .as_slice()
-                    .iter()
-                    .zip(actual_event.topics())
-                {
-                    let expected = Calldata::new_compound([expected]);
-                    if !expected
-                        .is_equivalent(&actual.0, resolver, resolution_context)
-                        .await?
-                    {
-                        tracing::error!(
-                            event_idx,
-                            ?execution_receipt,
-                            ?expected,
-                            ?actual,
-                            "Event topics assertion failed",
-                        );
-                        anyhow::bail!(
-                            "Event topics assertion failed - Expected {expected:?} but got {actual:?}",
-                        );
-                    }
-                }
-
-                // Handling the values assertion.
-                let expected = &expected_event.values;
-                let actual = &actual_event.data().data;
-                if !expected
-                    .is_equivalent(&actual.0, resolver, resolution_context)
-                    .await?
-                {
-                    tracing::error!(
-                        event_idx,
-                        ?execution_receipt,
-                        ?expected,
-                        ?actual,
-                        "Event value assertion failed",
-                    );
-                    anyhow::bail!(
-                        "Event value assertion failed - Expected {expected:?} but got {actual:?}",
-                    );
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn handle_input_diff(
-        &mut self,
-        _: CaseIdx,
-        execution_receipt: TransactionReceipt,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
-        let span = tracing::info_span!("Handling input diff");
-        let _guard = span.enter();
-
-        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
-            diff_mode: Some(true),
-            disable_code: None,
-            disable_storage: None,
-        });
-
-        let trace = node
-            .trace_transaction(&execution_receipt, trace_options)
-            .await?;
-        let diff = node.state_diff(&execution_receipt).await?;
-
-        Ok((execution_receipt, trace, diff))
-    }
-
-    pub async fn handle_balance_assertion_contract_deployment(
-        &mut self,
-        metadata: &Metadata,
-        balance_assertion: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let Some(instance) = balance_assertion
-            .address
-            .strip_suffix(".address")
-            .map(ContractInstance::new)
-        else {
-            return Ok(());
-        };
-        self.get_or_deploy_contract_instance(
-            &instance,
-            metadata,
-            Input::default_caller(),
-            None,
-            None,
-            node,
-        )
-        .await?;
-        Ok(())
-    }
-
-    pub async fn handle_balance_assertion_execution(
-        &mut self,
-        BalanceAssertion {
-            address: address_string,
-            expected_balance: amount,
-            ..
-        }: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let address = Address::from_slice(
-            Calldata::new_compound([address_string])
-                .calldata(node, self.default_resolution_context())
-                .await?
-                .get(12..32)
-                .expect("Can't fail"),
-        );
-
-        let balance = node.balance_of(address).await?;
-
-        let expected = *amount;
-        let actual = balance;
-        if expected != actual {
-            tracing::error!(%expected, %actual, %address, "Balance assertion failed");
-            anyhow::bail!(
-                "Balance assertion failed - Expected {} but got {} for {} resolved to {}",
-                expected,
-                actual,
-                address_string,
-                address,
-            )
-        }
-
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty_assertion_contract_deployment(
-        &mut self,
-        metadata: &Metadata,
-        storage_empty_assertion: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let Some(instance) = storage_empty_assertion
-            .address
-            .strip_suffix(".address")
-            .map(ContractInstance::new)
-        else {
-            return Ok(());
-        };
-        self.get_or_deploy_contract_instance(
-            &instance,
-            metadata,
-            Input::default_caller(),
-            None,
-            None,
-            node,
-        )
-        .await?;
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty_assertion_execution(
-        &mut self,
-        StorageEmptyAssertion {
-            address: address_string,
-            is_storage_empty,
-            ..
-        }: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let address = Address::from_slice(
-            Calldata::new_compound([address_string])
-                .calldata(node, self.default_resolution_context())
-                .await?
-                .get(12..32)
-                .expect("Can't fail"),
-        );
-
-        let storage = node.latest_state_proof(address, Default::default()).await?;
-        let is_empty = storage.storage_hash == EMPTY_ROOT_HASH;
-
-        let expected = is_storage_empty;
-        let actual = is_empty;
-
-        if *expected != actual {
-            tracing::error!(%expected, %actual, %address, "Storage Empty Assertion failed");
-            anyhow::bail!(
-                "Storage Empty Assertion failed - Expected {} but got {} for {} resolved to {}",
-                expected,
-                actual,
-                address_string,
-                address,
-            )
-        };
-
-        Ok(())
-    }
-
-    /// Gets the information of a deployed contract or library from the state. If it's found to not
-    /// be deployed then it will be deployed.
-    ///
-    /// If a [`CaseIdx`] is not specified then this contact instance address will be stored in the
-    /// cross-case deployed contracts address mapping.
-    #[allow(clippy::too_many_arguments)]
-    pub async fn get_or_deploy_contract_instance(
-        &mut self,
-        contract_instance: &ContractInstance,
-        metadata: &Metadata,
-        deployer: Address,
-        calldata: Option<&Calldata>,
-        value: Option<EtherValue>,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<(Address, JsonAbi, Option<TransactionReceipt>)> {
-        if let Some((address, abi)) = self.deployed_contracts.get(contract_instance) {
-            return Ok((*address, abi.clone(), None));
-        }
-
-        let Some(ContractPathAndIdent {
-            contract_source_path,
-            contract_ident,
-        }) = metadata.contract_sources()?.remove(contract_instance)
-        else {
-            tracing::error!("Contract source not found for instance");
-            anyhow::bail!(
-                "Contract source not found for instance {:?}",
-                contract_instance
-            )
-        };
-
-        let Some((code, abi)) = self
-            .compiled_contracts
-            .get(&contract_source_path)
-            .and_then(|source_file_contracts| source_file_contracts.get(contract_ident.as_ref()))
-            .cloned()
-        else {
-            tracing::error!(
-                contract_source_path = contract_source_path.display().to_string(),
-                contract_ident = contract_ident.as_ref(),
-                "Failed to find information for contract"
-            );
-            anyhow::bail!(
-                "Failed to find information for contract {:?}",
-                contract_instance
-            )
-        };
-
-        let mut code = match alloy::hex::decode(&code) {
-            Ok(code) => code,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    contract_source_path = contract_source_path.display().to_string(),
-                    contract_ident = contract_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)
-            }
-        };
-
-        if let Some(calldata) = calldata {
-            let calldata = calldata
-                .calldata(node, self.default_resolution_context())
-                .await?;
-            code.extend(calldata);
-        }
-
-        let tx = {
-            let tx = TransactionRequest::default().from(deployer);
-            let tx = match value {
-                Some(ref value) => tx.value(value.into_inner()),
-                _ => tx,
-            };
-            TransactionBuilder::<Ethereum>::with_deploy_code(tx, code)
-        };
-
-        let receipt = match node.execute_transaction(tx).await {
-            Ok(receipt) => receipt,
-            Err(error) => {
-                tracing::error!(
-                    node = std::any::type_name::<T>(),
-                    ?error,
-                    "Contract deployment transaction failed."
-                );
-                return Err(error);
-            }
-        };
-
-        let Some(address) = receipt.contract_address else {
-            tracing::error!("Contract deployment transaction didn't return an address");
-            anyhow::bail!("Contract deployment didn't return an address");
-        };
-        tracing::info!(
-            instance_name = ?contract_instance,
-            instance_address = ?address,
-            "Deployed contract"
-        );
-
-        self.deployed_contracts
-            .insert(contract_instance.clone(), (address, abi.clone()));
-
-        Ok((address, abi, Some(receipt)))
-    }
-
-    fn default_resolution_context(&self) -> ResolutionContext<'_> {
-        ResolutionContext::default()
-            .with_deployed_contracts(&self.deployed_contracts)
-            .with_variables(&self.variables)
-    }
-}
-
-pub struct CaseDriver<'a, Leader: Platform, Follower: Platform> {
-    metadata: &'a Metadata,
-    case: &'a Case,
-    case_idx: CaseIdx,
-    leader_node: &'a Leader::Blockchain,
-    follower_node: &'a Follower::Blockchain,
-    leader_state: CaseState<Leader>,
-    follower_state: CaseState<Follower>,
-}
-
-impl<'a, L, F> CaseDriver<'a, L, F>
-where
-    L: Platform,
-    F: Platform,
-{
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        metadata: &'a Metadata,
-        case: &'a Case,
-        case_idx: impl Into<CaseIdx>,
-        leader_node: &'a L::Blockchain,
-        follower_node: &'a F::Blockchain,
-        leader_state: CaseState<L>,
-        follower_state: CaseState<F>,
-    ) -> CaseDriver<'a, L, F> {
-        Self {
-            metadata,
-            case,
-            case_idx: case_idx.into(),
-            leader_node,
-            follower_node,
-            leader_state,
-            follower_state,
-        }
-    }
-
-    pub fn trace_diff_mode(label: &str, diff: &DiffMode) {
-        tracing::trace!("{label} - PRE STATE:");
-        for (addr, state) in &diff.pre {
-            Self::trace_account_state("  [pre]", addr, state);
-        }
-
-        tracing::trace!("{label} - POST STATE:");
-        for (addr, state) in &diff.post {
-            Self::trace_account_state("  [post]", addr, state);
-        }
-    }
-
-    fn trace_account_state(prefix: &str, addr: &Address, state: &AccountState) {
-        tracing::trace!("{prefix} 0x{addr:x}");
-
-        if let Some(balance) = &state.balance {
-            tracing::trace!("{prefix}   balance: {balance}");
-        }
-        if let Some(nonce) = &state.nonce {
-            tracing::trace!("{prefix}   nonce: {nonce}");
-        }
-        if let Some(code) = &state.code {
-            tracing::trace!("{prefix}   code: {code}");
-        }
-    }
-
-    pub async fn execute(&mut self) -> anyhow::Result<usize> {
-        if !self
-            .leader_node
-            .matches_target(self.metadata.targets.as_deref())
-            || !self
-                .follower_node
-                .matches_target(self.metadata.targets.as_deref())
-        {
-            tracing::warn!(
-                targets = ?self.metadata.targets,
-                "Either the leader or follower node do not support the targets of the file"
-            );
-            return Ok(0);
-        }
-
-        let mut steps_executed = 0;
-        for (step_idx, step) in self.case.steps_iterator().enumerate() {
-            let tracing_span = tracing::info_span!("Handling input", step_idx);
-
-            let leader_step_output = self
-                .leader_state
-                .handle_step(self.metadata, self.case_idx, &step, self.leader_node)
-                .instrument(tracing_span.clone())
-                .await?;
-            let follower_step_output = self
-                .follower_state
-                .handle_step(self.metadata, self.case_idx, &step, self.follower_node)
-                .instrument(tracing_span)
-                .await?;
-            match (leader_step_output, follower_step_output) {
-                (
-                    StepOutput::FunctionCall(leader_receipt, _, leader_diff),
-                    StepOutput::FunctionCall(follower_receipt, _, follower_diff),
-                ) => {
-                    if leader_diff == follower_diff {
-                        tracing::debug!("State diffs match between leader and follower.");
-                    } else {
-                        tracing::debug!("State diffs mismatch between leader and follower.");
-                        Self::trace_diff_mode("Leader", &leader_diff);
-                        Self::trace_diff_mode("Follower", &follower_diff);
-                    }
-
-                    if leader_receipt.logs() != follower_receipt.logs() {
-                        tracing::debug!("Log/event mismatch between leader and follower.");
-                        tracing::trace!("Leader logs: {:?}", leader_receipt.logs());
-                        tracing::trace!("Follower logs: {:?}", follower_receipt.logs());
-                    }
-                }
-                (StepOutput::BalanceAssertion, StepOutput::BalanceAssertion) => {}
-                (StepOutput::StorageEmptyAssertion, StepOutput::StorageEmptyAssertion) => {}
-                _ => unreachable!("The two step outputs can not be of a different kind"),
-            }
-
-            steps_executed += 1;
-        }
-
-        Ok(steps_executed)
-    }
-}
-
-#[derive(Clone, Debug)]
-#[allow(clippy::large_enum_variant)]
-pub enum StepOutput {
-    FunctionCall(TransactionReceipt, GethTrace, DiffMode),
-    BalanceAssertion,
-    StorageEmptyAssertion,
-}

crates/core/src/helpers/cached_compiler.rs

@@ -0,0 +1,364 @@
+//! A wrapper around the compiler which allows for caching of compilation artifacts so that they can
+//! be reused between runs.
+
+use std::{
+	borrow::Cow,
+	collections::HashMap,
+	path::{Path, PathBuf},
+	sync::{Arc, LazyLock},
+};
+
+use crate::Platform;
+use futures::FutureExt;
+use revive_dt_common::{iterators::FilesWithExtensionIterator, types::CompilerIdentifier};
+use revive_dt_compiler::{Compiler, CompilerOutput, Mode, SolidityCompiler};
+use revive_dt_format::metadata::{ContractIdent, ContractInstance, Metadata};
+
+use alloy::{hex::ToHexExt, json_abi::JsonAbi, primitives::Address};
+use anyhow::{Context as _, Error, Result};
+use revive_dt_report::ExecutionSpecificReporter;
+use semver::Version;
+use serde::{Deserialize, Serialize};
+use tokio::sync::{Mutex, RwLock, Semaphore};
+use tracing::{Instrument, debug, debug_span, instrument};
+
+pub struct CachedCompiler<'a> {
+	/// The cache that stores the compiled contracts.
+	artifacts_cache: ArtifactsCache,
+
+	/// This is a mechanism that the cached compiler uses so that if multiple compilation requests
+	/// come in for the same contract we never compile all of them and only compile it once and all
+	/// other tasks that request this same compilation concurrently get the cached version.
+	cache_key_lock: RwLock<HashMap<CacheKey<'a>, Arc<Mutex<()>>>>,
+}
+
+impl<'a> CachedCompiler<'a> {
+	pub async fn new(path: impl AsRef<Path>, invalidate_cache: bool) -> Result<Self> {
+		let mut cache = ArtifactsCache::new(path);
+		if invalidate_cache {
+			cache = cache
+				.with_invalidated_cache()
+				.await
+				.context("Failed to invalidate compilation cache directory")?;
+		}
+		Ok(Self { artifacts_cache: cache, cache_key_lock: Default::default() })
+	}
+
+	/// Compiles or gets the compilation artifacts from the cache.
+	#[allow(clippy::too_many_arguments)]
+	#[instrument(
+        level = "debug",
+        skip_all,
+        fields(
+            metadata_file_path = %metadata_file_path.display(),
+            %mode,
+            platform = %platform.platform_identifier()
+        ),
+        err
+    )]
+	pub async fn compile_contracts(
+		&self,
+		metadata: &'a Metadata,
+		metadata_file_path: &'a Path,
+		mode: Cow<'a, Mode>,
+		deployed_libraries: Option<&HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
+		compiler: &dyn SolidityCompiler,
+		platform: &dyn Platform,
+		reporter: &ExecutionSpecificReporter,
+	) -> Result<CompilerOutput> {
+		let cache_key = CacheKey {
+			compiler_identifier: platform.compiler_identifier(),
+			compiler_version: compiler.version().clone(),
+			metadata_file_path,
+			solc_mode: mode.clone(),
+		};
+
+		let compilation_callback = || {
+			async move {
+				compile_contracts(
+					metadata
+						.directory()
+						.context("Failed to get metadata directory while preparing compilation")?,
+					metadata
+						.files_to_compile()
+						.context("Failed to enumerate files to compile from metadata")?,
+					&mode,
+					deployed_libraries,
+					compiler,
+					reporter,
+				)
+				.map(|compilation_result| compilation_result.map(CacheValue::new))
+				.await
+			}
+			.instrument(debug_span!(
+				"Running compilation for the cache key",
+				cache_key.compiler_identifier = %cache_key.compiler_identifier,
+				cache_key.compiler_version = %cache_key.compiler_version,
+				cache_key.metadata_file_path = %cache_key.metadata_file_path.display(),
+				cache_key.solc_mode = %cache_key.solc_mode,
+			))
+		};
+
+		let compiled_contracts = match deployed_libraries {
+			// If deployed libraries have been specified then we will re-compile the contract as it
+			// means that linking is required in this case.
+			Some(_) => {
+				debug!("Deployed libraries defined, recompilation must take place");
+				debug!("Cache miss");
+				compilation_callback()
+					.await
+					.context("Compilation callback for deployed libraries failed")?
+					.compiler_output
+			},
+			// If no deployed libraries are specified then we can follow the cached flow and attempt
+			// to lookup the compilation artifacts in the cache.
+			None => {
+				debug!("Deployed libraries undefined, attempting to make use of cache");
+
+				// Lock this specific cache key such that we do not get inconsistent state. We want
+				// that when multiple cases come in asking for the compilation artifacts then they
+				// don't all trigger a compilation if there's a cache miss. Hence, the lock here.
+				let read_guard = self.cache_key_lock.read().await;
+				let mutex = match read_guard.get(&cache_key).cloned() {
+					Some(value) => {
+						drop(read_guard);
+						value
+					},
+					None => {
+						drop(read_guard);
+						self.cache_key_lock
+							.write()
+							.await
+							.entry(cache_key.clone())
+							.or_default()
+							.clone()
+					},
+				};
+				let _guard = mutex.lock().await;
+
+				match self.artifacts_cache.get(&cache_key).await {
+					Some(cache_value) => {
+						if deployed_libraries.is_some() {
+							reporter
+								.report_post_link_contracts_compilation_succeeded_event(
+									compiler.version().clone(),
+									compiler.path(),
+									true,
+									None,
+									cache_value.compiler_output.clone(),
+								)
+								.expect("Can't happen");
+						} else {
+							reporter
+								.report_pre_link_contracts_compilation_succeeded_event(
+									compiler.version().clone(),
+									compiler.path(),
+									true,
+									None,
+									cache_value.compiler_output.clone(),
+								)
+								.expect("Can't happen");
+						}
+						cache_value.compiler_output
+					},
+					None => {
+						let compiler_output = compilation_callback()
+							.await
+							.context("Compilation callback failed (cache miss path)")?
+							.compiler_output;
+						self.artifacts_cache
+							.insert(
+								&cache_key,
+								&CacheValue { compiler_output: compiler_output.clone() },
+							)
+							.await
+							.context(
+								"Failed to write the cached value of the compilation artifacts",
+							)?;
+						compiler_output
+					},
+				}
+			},
+		};
+
+		Ok(compiled_contracts)
+	}
+}
+
+async fn compile_contracts(
+	metadata_directory: impl AsRef<Path>,
+	mut files_to_compile: impl Iterator<Item = PathBuf>,
+	mode: &Mode,
+	deployed_libraries: Option<&HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
+	compiler: &dyn SolidityCompiler,
+	reporter: &ExecutionSpecificReporter,
+) -> Result<CompilerOutput> {
+	// Puts a limit on how many compilations we can perform at any given instance which helps us
+	// with some of the errors we've been seeing with high concurrency on MacOS (we have not tried
+	// it on Linux so we don't know if these issues also persist there or not.)
+	static SPAWN_GATE: LazyLock<Semaphore> = LazyLock::new(|| Semaphore::new(5));
+	let _permit = SPAWN_GATE.acquire().await?;
+
+	let all_sources_in_dir = FilesWithExtensionIterator::new(metadata_directory.as_ref())
+		.with_allowed_extension("sol")
+		.with_use_cached_fs(true)
+		.collect::<Vec<_>>();
+
+	let compilation = Compiler::new()
+		.with_allow_path(metadata_directory)
+		// Handling the modes
+		.with_optimization(mode.optimize_setting)
+		.with_pipeline(mode.pipeline)
+		// Adding the contract sources to the compiler.
+		.try_then(|compiler| {
+			files_to_compile.try_fold(compiler, |compiler, path| compiler.with_source(path))
+		})?
+		// Adding the deployed libraries to the compiler.
+		.then(|compiler| {
+			deployed_libraries
+				.iter()
+				.flat_map(|value| value.iter())
+				.map(|(instance, (ident, address, abi))| (instance, ident, address, abi))
+				.flat_map(|(_, ident, address, _)| {
+					all_sources_in_dir.iter().map(move |path| (ident, address, path))
+				})
+				.fold(compiler, |compiler, (ident, address, path)| {
+					compiler.with_library(path, ident.as_str(), *address)
+				})
+		});
+
+	let input = compilation.input().clone();
+	let output = compilation.try_build(compiler).await;
+
+	match (output.as_ref(), deployed_libraries.is_some()) {
+		(Ok(output), true) => {
+			reporter
+				.report_post_link_contracts_compilation_succeeded_event(
+					compiler.version().clone(),
+					compiler.path(),
+					false,
+					input,
+					output.clone(),
+				)
+				.expect("Can't happen");
+		},
+		(Ok(output), false) => {
+			reporter
+				.report_pre_link_contracts_compilation_succeeded_event(
+					compiler.version().clone(),
+					compiler.path(),
+					false,
+					input,
+					output.clone(),
+				)
+				.expect("Can't happen");
+		},
+		(Err(err), true) => {
+			reporter
+				.report_post_link_contracts_compilation_failed_event(
+					compiler.version().clone(),
+					compiler.path().to_path_buf(),
+					input,
+					format!("{err:#}"),
+				)
+				.expect("Can't happen");
+		},
+		(Err(err), false) => {
+			reporter
+				.report_pre_link_contracts_compilation_failed_event(
+					compiler.version().clone(),
+					compiler.path().to_path_buf(),
+					input,
+					format!("{err:#}"),
+				)
+				.expect("Can't happen");
+		},
+	}
+
+	output
+}
+
+struct ArtifactsCache {
+	path: PathBuf,
+}
+
+impl ArtifactsCache {
+	pub fn new(path: impl AsRef<Path>) -> Self {
+		Self { path: path.as_ref().to_path_buf() }
+	}
+
+	#[instrument(level = "debug", skip_all, err)]
+	pub async fn with_invalidated_cache(self) -> Result<Self> {
+		cacache::clear(self.path.as_path())
+			.await
+			.map_err(Into::<Error>::into)
+			.with_context(|| format!("Failed to clear cache at {}", self.path.display()))?;
+		Ok(self)
+	}
+
+	#[instrument(level = "debug", skip_all, err)]
+	pub async fn insert(&self, key: &CacheKey<'_>, value: &CacheValue) -> Result<()> {
+		let key = bson::to_vec(key).context("Failed to serialize cache key (bson)")?;
+		let value = bson::to_vec(value).context("Failed to serialize cache value (bson)")?;
+		cacache::write(self.path.as_path(), key.encode_hex(), value)
+			.await
+			.with_context(|| {
+				format!("Failed to write cache entry under {}", self.path.display())
+			})?;
+		Ok(())
+	}
+
+	pub async fn get(&self, key: &CacheKey<'_>) -> Option<CacheValue> {
+		let key = bson::to_vec(key).ok()?;
+		let value = cacache::read(self.path.as_path(), key.encode_hex()).await.ok()?;
+		let value = bson::from_slice::<CacheValue>(&value).ok()?;
+		Some(value)
+	}
+
+	#[instrument(level = "debug", skip_all, err)]
+	pub async fn get_or_insert_with(
+		&self,
+		key: &CacheKey<'_>,
+		callback: impl AsyncFnOnce() -> Result<CacheValue>,
+	) -> Result<CacheValue> {
+		match self.get(key).await {
+			Some(value) => {
+				debug!("Cache hit");
+				Ok(value)
+			},
+			None => {
+				debug!("Cache miss");
+				let value = callback().await?;
+				self.insert(key, &value).await?;
+				Ok(value)
+			},
+		}
+	}
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize)]
+struct CacheKey<'a> {
+	/// The identifier of the used compiler.
+	compiler_identifier: CompilerIdentifier,
+
+	/// The version of the compiler that was used to compile the artifacts.
+	compiler_version: Version,
+
+	/// The path of the metadata file that the compilation artifacts are for.
+	metadata_file_path: &'a Path,
+
+	/// The mode that the compilation artifacts where compiled with.
+	solc_mode: Cow<'a, Mode>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+struct CacheValue {
+	/// The compiler output from the compilation run.
+	compiler_output: CompilerOutput,
+}
+
+impl CacheValue {
+	pub fn new(compiler_output: CompilerOutput) -> Self {
+		Self { compiler_output }
+	}
+}

crates/core/src/helpers/metadata.rs

@@ -0,0 +1,33 @@
+use revive_dt_config::CorpusConfiguration;
+use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
+use tracing::{info, info_span, instrument};
+
+/// Given an object that implements [`AsRef<CorpusConfiguration>`], this function finds all of the
+/// corpus files and produces a map containing all of the [`MetadataFile`]s discovered.
+#[instrument(level = "debug", name = "Collecting Corpora", skip_all)]
+pub fn collect_metadata_files(
+	context: impl AsRef<CorpusConfiguration>,
+) -> anyhow::Result<Vec<MetadataFile>> {
+	let mut metadata_files = Vec::new();
+
+	let corpus_configuration = AsRef::<CorpusConfiguration>::as_ref(&context);
+	for path in &corpus_configuration.paths {
+		let span = info_span!("Processing corpus file", path = %path.display());
+		let _guard = span.enter();
+
+		let corpus = Corpus::try_from_path(path)?;
+		info!(
+			name = corpus.name(),
+			number_of_contained_paths = corpus.path_count(),
+			"Deserialized corpus file"
+		);
+		metadata_files.extend(corpus.enumerate_tests());
+	}
+
+	// There's a possibility that there are certain paths that all lead to the same metadata files
+	// and therefore it's important that we sort them and then deduplicate them.
+	metadata_files.sort_by(|a, b| a.metadata_file_path.cmp(&b.metadata_file_path));
+	metadata_files.dedup_by(|a, b| a.metadata_file_path == b.metadata_file_path);
+
+	Ok(metadata_files)
+}

crates/core/src/helpers/mod.rs

@@ -0,0 +1,9 @@
+mod cached_compiler;
+mod metadata;
+mod pool;
+mod test;
+
+pub use cached_compiler::*;
+pub use metadata::*;
+pub use pool::*;
+pub use test::*;

crates/core/src/helpers/pool.rs

@@ -0,0 +1,54 @@
+//! This crate implements concurrent handling of testing node.
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use crate::Platform;
+use anyhow::Context as _;
+use revive_dt_config::*;
+use revive_dt_node_interaction::EthereumNode;
+
+/// The node pool starts one or more [Node] which then can be accessed
+/// in a round robbin fashion.
+pub struct NodePool {
+	next: AtomicUsize,
+	nodes: Vec<Box<dyn EthereumNode + Send + Sync>>,
+}
+
+impl NodePool {
+	/// Create a new Pool. This will start as many nodes as there are workers in `config`.
+	pub async fn new(context: Context, platform: &dyn Platform) -> anyhow::Result<Self> {
+		let concurrency_configuration = AsRef::<ConcurrencyConfiguration>::as_ref(&context);
+		let nodes = concurrency_configuration.number_of_nodes;
+
+		let mut handles = Vec::with_capacity(nodes);
+		for _ in 0..nodes {
+			let context = context.clone();
+			handles.push(platform.new_node(context)?);
+		}
+
+		let mut nodes = Vec::with_capacity(nodes);
+		for handle in handles {
+			nodes.push(
+				handle
+					.join()
+					.map_err(|error| anyhow::anyhow!("failed to spawn node: {:?}", error))
+					.context("Failed to join node spawn thread")?
+					.context("Node failed to spawn")?,
+			);
+		}
+
+		let pre_transactions_tasks =
+			nodes.iter_mut().map(|node| node.pre_transactions()).collect::<Vec<_>>();
+		futures::future::try_join_all(pre_transactions_tasks)
+			.await
+			.context("Failed to run the pre-transactions task")?;
+
+		Ok(Self { nodes, next: Default::default() })
+	}
+
+	/// Get a handle to the next node.
+	pub fn round_robbin(&self) -> &dyn EthereumNode {
+		let current = self.next.fetch_add(1, Ordering::SeqCst) % self.nodes.len();
+		self.nodes.get(current).unwrap().as_ref()
+	}
+}

crates/core/src/helpers/test.rs

@@ -0,0 +1,306 @@
+use std::{borrow::Cow, collections::BTreeMap, path::Path, sync::Arc};
+
+use futures::{Stream, StreamExt, stream};
+use indexmap::{IndexMap, indexmap};
+use revive_dt_common::{iterators::EitherIter, types::PlatformIdentifier};
+use revive_dt_config::Context;
+use revive_dt_format::mode::ParsedMode;
+use serde_json::{Value, json};
+
+use revive_dt_compiler::{Mode, SolidityCompiler};
+use revive_dt_format::{
+	case::{Case, CaseIdx},
+	metadata::MetadataFile,
+};
+use revive_dt_node_interaction::EthereumNode;
+use revive_dt_report::{ExecutionSpecificReporter, Reporter, TestSpecificReporter, TestSpecifier};
+use tracing::{debug, error, info};
+
+use crate::{Platform, helpers::NodePool};
+
+pub async fn create_test_definitions_stream<'a>(
+	// This is only required for creating the compiler objects and is not used anywhere else in the
+	// function.
+	context: &Context,
+	metadata_files: impl IntoIterator<Item = &'a MetadataFile>,
+	platforms_and_nodes: &'a BTreeMap<PlatformIdentifier, (&dyn Platform, NodePool)>,
+	reporter: Reporter,
+) -> impl Stream<Item = TestDefinition<'a>> {
+	stream::iter(
+		metadata_files
+			.into_iter()
+			// Flatten over the cases.
+			.flat_map(|metadata_file| {
+				metadata_file
+					.cases
+					.iter()
+					.enumerate()
+					.map(move |(case_idx, case)| (metadata_file, case_idx, case))
+			})
+			// Flatten over the modes, prefer the case modes over the metadata file modes.
+			.flat_map(move |(metadata_file, case_idx, case)| {
+				let reporter = reporter.clone();
+
+				let modes = case.modes.as_ref().or(metadata_file.modes.as_ref());
+				let modes = match modes {
+					Some(modes) => EitherIter::A(
+						ParsedMode::many_to_modes(modes.iter()).map(Cow::<'static, _>::Owned),
+					),
+					None => EitherIter::B(Mode::all().map(Cow::<'static, _>::Borrowed)),
+				};
+
+				modes.into_iter().map(move |mode| {
+					(
+						metadata_file,
+						case_idx,
+						case,
+						mode.clone(),
+						reporter.test_specific_reporter(Arc::new(TestSpecifier {
+							solc_mode: mode.as_ref().clone(),
+							metadata_file_path: metadata_file.metadata_file_path.clone(),
+							case_idx: CaseIdx::new(case_idx),
+						})),
+					)
+				})
+			})
+			// Inform the reporter of each one of the test cases that were discovered which we
+			// expect to run.
+			.inspect(|(_, _, _, _, reporter)| {
+				reporter.report_test_case_discovery_event().expect("Can't fail");
+			}),
+	)
+	// Creating the Test Definition objects from all of the various objects we have and creating
+	// their required dependencies (e.g., compiler).
+	.filter_map(move |(metadata_file, case_idx, case, mode, reporter)| async move {
+		let mut platforms = BTreeMap::new();
+		for (platform, node_pool) in platforms_and_nodes.values() {
+			let node = node_pool.round_robbin();
+			let compiler = platform
+				.new_compiler(context.clone(), mode.version.clone().map(Into::into))
+				.await
+				.inspect_err(|err| {
+					error!(
+						?err,
+						platform_identifier = %platform.platform_identifier(),
+						"Failed to instantiate the compiler"
+					)
+				})
+				.ok()?;
+
+			reporter
+				.report_node_assigned_event(
+					node.id(),
+					platform.platform_identifier(),
+					node.connection_string(),
+				)
+				.expect("Can't fail");
+
+			let reporter =
+				reporter.execution_specific_reporter(node.id(), platform.platform_identifier());
+
+			platforms.insert(
+				platform.platform_identifier(),
+				TestPlatformInformation { platform: *platform, node, compiler, reporter },
+			);
+		}
+
+		Some(TestDefinition {
+			/* Metadata file information */
+			metadata: metadata_file,
+			metadata_file_path: metadata_file.metadata_file_path.as_path(),
+
+			/* Mode Information */
+			mode: mode.clone(),
+
+			/* Case Information */
+			case_idx: CaseIdx::new(case_idx),
+			case,
+
+			/* Platform and Node Assignment Information */
+			platforms,
+
+			/* Reporter */
+			reporter,
+		})
+	})
+	// Filter out the test cases which are incompatible or that can't run in the current setup.
+	.filter_map(move |test| async move {
+		match test.check_compatibility() {
+			Ok(()) => Some(test),
+			Err((reason, additional_information)) => {
+				debug!(
+					metadata_file_path = %test.metadata.metadata_file_path.display(),
+					case_idx = %test.case_idx,
+					mode = %test.mode,
+					reason,
+					additional_information =
+						serde_json::to_string(&additional_information).unwrap(),
+					"Ignoring Test Case"
+				);
+				test.reporter
+					.report_test_ignored_event(
+						reason.to_string(),
+						additional_information
+							.into_iter()
+							.map(|(k, v)| (k.into(), v))
+							.collect::<IndexMap<_, _>>(),
+					)
+					.expect("Can't fail");
+				None
+			},
+		}
+	})
+	.inspect(|test| {
+		info!(
+			metadata_file_path = %test.metadata_file_path.display(),
+			case_idx = %test.case_idx,
+			mode = %test.mode,
+			"Created a test case definition"
+		);
+	})
+}
+
+/// This is a full description of a differential test to run alongside the full metadata file, the
+/// specific case to be tested, the platforms that the tests should run on, the specific nodes of
+/// these platforms that they should run on, the compilers to use, and everything else needed making
+/// it a complete description.
+pub struct TestDefinition<'a> {
+	/* Metadata file information */
+	pub metadata: &'a MetadataFile,
+	pub metadata_file_path: &'a Path,
+
+	/* Mode Information */
+	pub mode: Cow<'a, Mode>,
+
+	/* Case Information */
+	pub case_idx: CaseIdx,
+	pub case: &'a Case,
+
+	/* Platform and Node Assignment Information */
+	pub platforms: BTreeMap<PlatformIdentifier, TestPlatformInformation<'a>>,
+
+	/* Reporter */
+	pub reporter: TestSpecificReporter,
+}
+
+impl<'a> TestDefinition<'a> {
+	/// Checks if this test can be ran with the current configuration.
+	pub fn check_compatibility(&self) -> TestCheckFunctionResult {
+		self.check_metadata_file_ignored()?;
+		self.check_case_file_ignored()?;
+		self.check_target_compatibility()?;
+		self.check_evm_version_compatibility()?;
+		self.check_compiler_compatibility()?;
+		Ok(())
+	}
+
+	/// Checks if the metadata file is ignored or not.
+	fn check_metadata_file_ignored(&self) -> TestCheckFunctionResult {
+		if self.metadata.ignore.is_some_and(|ignore| ignore) {
+			Err(("Metadata file is ignored.", indexmap! {}))
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Checks if the case file is ignored or not.
+	fn check_case_file_ignored(&self) -> TestCheckFunctionResult {
+		if self.case.ignore.is_some_and(|ignore| ignore) {
+			Err(("Case is ignored.", indexmap! {}))
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Checks if the platforms all support the desired targets in the metadata file.
+	fn check_target_compatibility(&self) -> TestCheckFunctionResult {
+		let mut error_map = indexmap! {
+			"test_desired_targets" => json!(self.metadata.targets.as_ref()),
+		};
+		let mut is_allowed = true;
+		for (_, platform_information) in self.platforms.iter() {
+			let is_allowed_for_platform = match self.metadata.targets.as_ref() {
+				None => true,
+				Some(required_vm_identifiers) =>
+					required_vm_identifiers.contains(&platform_information.platform.vm_identifier()),
+			};
+			is_allowed &= is_allowed_for_platform;
+			error_map.insert(
+				platform_information.platform.platform_identifier().into(),
+				json!(is_allowed_for_platform),
+			);
+		}
+
+		if is_allowed {
+			Ok(())
+		} else {
+			Err((
+				"One of the platforms do do not support the targets allowed by the test.",
+				error_map,
+			))
+		}
+	}
+
+	// Checks for the compatibility of the EVM version with the platforms specified.
+	fn check_evm_version_compatibility(&self) -> TestCheckFunctionResult {
+		let Some(evm_version_requirement) = self.metadata.required_evm_version else {
+			return Ok(());
+		};
+
+		let mut error_map = indexmap! {
+			"test_desired_evm_version" => json!(self.metadata.required_evm_version),
+		};
+		let mut is_allowed = true;
+		for (_, platform_information) in self.platforms.iter() {
+			let is_allowed_for_platform =
+				evm_version_requirement.matches(&platform_information.node.evm_version());
+			is_allowed &= is_allowed_for_platform;
+			error_map.insert(
+				platform_information.platform.platform_identifier().into(),
+				json!(is_allowed_for_platform),
+			);
+		}
+
+		if is_allowed {
+			Ok(())
+		} else {
+			Err(("EVM version is incompatible for the platforms specified", error_map))
+		}
+	}
+
+	/// Checks if the platforms compilers support the mode that the test is for.
+	fn check_compiler_compatibility(&self) -> TestCheckFunctionResult {
+		let mut error_map = indexmap! {
+			"test_desired_evm_version" => json!(self.metadata.required_evm_version),
+		};
+		let mut is_allowed = true;
+		for (_, platform_information) in self.platforms.iter() {
+			let is_allowed_for_platform = platform_information
+				.compiler
+				.supports_mode(self.mode.optimize_setting, self.mode.pipeline);
+			is_allowed &= is_allowed_for_platform;
+			error_map.insert(
+				platform_information.platform.platform_identifier().into(),
+				json!(is_allowed_for_platform),
+			);
+		}
+
+		if is_allowed {
+			Ok(())
+		} else {
+			Err((
+				"Compilers do not support this mode either for the provided platforms.",
+				error_map,
+			))
+		}
+	}
+}
+
+pub struct TestPlatformInformation<'a> {
+	pub platform: &'a dyn Platform,
+	pub node: &'a dyn EthereumNode,
+	pub compiler: Box<dyn SolidityCompiler>,
+	pub reporter: ExecutionSpecificReporter,
+}
+
+type TestCheckFunctionResult = Result<(), (&'static str, IndexMap<&'static str, Value>)>;

crates/core/src/lib.rs

@@ -3,45 +3,501 @@
 //! This crate defines the testing configuration and
 //! provides a helper utility to execute tests.
 
-use revive_dt_compiler::{SolidityCompiler, revive_resolc, solc};
+pub mod differential_tests;
-use revive_dt_config::TestingPlatform;
+pub mod helpers;
-use revive_dt_format::traits::ResolverApi;
+
-use revive_dt_node::{Node, geth, kitchensink::KitchensinkNode};
+use std::{
+	pin::Pin,
+	thread::{self, JoinHandle},
+};
+
+use alloy::genesis::Genesis;
+use anyhow::Context as _;
+use revive_dt_common::types::*;
+use revive_dt_compiler::{SolidityCompiler, revive_resolc::Resolc, solc::Solc};
+use revive_dt_config::*;
+use revive_dt_node::{
+	Node,
+	node_implementations::{
+		geth::GethNode, lighthouse_geth::LighthouseGethNode, substrate::SubstrateNode,
+		zombienet::ZombieNode,
+	},
+};
 use revive_dt_node_interaction::EthereumNode;
+use tracing::info;
 
-pub mod driver;
+pub use helpers::CachedCompiler;
 
-/// One platform can be tested differentially against another.
+/// A trait that describes the interface for the platforms that are supported by the tool.
-///
+#[allow(clippy::type_complexity)]
-/// For this we need a blockchain node implementation and a compiler.
 pub trait Platform {
-    type Blockchain: EthereumNode + Node + ResolverApi;
+	/// Returns the identifier of this platform. This is a combination of the node and the compiler
-    type Compiler: SolidityCompiler;
+	/// used.
+	fn platform_identifier(&self) -> PlatformIdentifier;
 
-    /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].
+	/// Returns a full identifier for the platform.
-    fn config_id() -> TestingPlatform;
+	fn full_identifier(&self) -> (NodeIdentifier, VmIdentifier, CompilerIdentifier) {
+		(self.node_identifier(), self.vm_identifier(), self.compiler_identifier())
+	}
+
+	/// Returns the identifier of the node used.
+	fn node_identifier(&self) -> NodeIdentifier;
+
+	/// Returns the identifier of the vm used.
+	fn vm_identifier(&self) -> VmIdentifier;
+
+	/// Returns the identifier of the compiler used.
+	fn compiler_identifier(&self) -> CompilerIdentifier;
+
+	/// Creates a new node for the platform by spawning a new thread, creating the node object,
+	/// initializing it, spawning it, and waiting for it to start up.
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>>;
+
+	/// Creates a new compiler for the provided platform
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>>;
 }
 
-#[derive(Default)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
-pub struct Geth;
+pub struct GethEvmSolcPlatform;
 
-impl Platform for Geth {
+impl Platform for GethEvmSolcPlatform {
-    type Blockchain = geth::GethNode;
+	fn platform_identifier(&self) -> PlatformIdentifier {
-    type Compiler = solc::Solc;
+		PlatformIdentifier::GethEvmSolc
+	}
 
-    fn config_id() -> TestingPlatform {
+	fn node_identifier(&self) -> NodeIdentifier {
-        TestingPlatform::Geth
+		NodeIdentifier::Geth
-    }
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::Evm
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Solc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = GethNode::new(context);
+			let node = spawn_node::<GethNode>(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
 }
 
-#[derive(Default)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
-pub struct Kitchensink;
+pub struct LighthouseGethEvmSolcPlatform;
 
-impl Platform for Kitchensink {
+impl Platform for LighthouseGethEvmSolcPlatform {
-    type Blockchain = KitchensinkNode;
+	fn platform_identifier(&self) -> PlatformIdentifier {
-    type Compiler = revive_resolc::Resolc;
+		PlatformIdentifier::LighthouseGethEvmSolc
+	}
 
-    fn config_id() -> TestingPlatform {
+	fn node_identifier(&self) -> NodeIdentifier {
-        TestingPlatform::Kitchensink
+		NodeIdentifier::LighthouseGeth
-    }
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::Evm
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Solc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = LighthouseGethNode::new(context);
+			let node = spawn_node::<LighthouseGethNode>(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct KitchensinkPolkavmResolcPlatform;
+
+impl Platform for KitchensinkPolkavmResolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::KitchensinkPolkavmResolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::Kitchensink
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::PolkaVM
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Resolc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let kitchensink_path = AsRef::<KitchensinkConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = SubstrateNode::new(
+				kitchensink_path,
+				SubstrateNode::KITCHENSINK_EXPORT_CHAINSPEC_COMMAND,
+				context,
+			);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Resolc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct KitchensinkRevmSolcPlatform;
+
+impl Platform for KitchensinkRevmSolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::KitchensinkRevmSolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::Kitchensink
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::Evm
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Solc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let kitchensink_path = AsRef::<KitchensinkConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = SubstrateNode::new(
+				kitchensink_path,
+				SubstrateNode::KITCHENSINK_EXPORT_CHAINSPEC_COMMAND,
+				context,
+			);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct ReviveDevNodePolkavmResolcPlatform;
+
+impl Platform for ReviveDevNodePolkavmResolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::ReviveDevNodePolkavmResolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::ReviveDevNode
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::PolkaVM
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Resolc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let revive_dev_node_path =
+			AsRef::<ReviveDevNodeConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = SubstrateNode::new(
+				revive_dev_node_path,
+				SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND,
+				context,
+			);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Resolc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct ReviveDevNodeRevmSolcPlatform;
+
+impl Platform for ReviveDevNodeRevmSolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::ReviveDevNodeRevmSolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::ReviveDevNode
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::Evm
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Solc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let revive_dev_node_path =
+			AsRef::<ReviveDevNodeConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = SubstrateNode::new(
+				revive_dev_node_path,
+				SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND,
+				context,
+			);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct ZombienetPolkavmResolcPlatform;
+
+impl Platform for ZombienetPolkavmResolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::ZombienetPolkavmResolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::Zombienet
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::PolkaVM
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Resolc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let polkadot_parachain_path =
+			AsRef::<PolkadotParachainConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = ZombieNode::new(polkadot_parachain_path, context);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub struct ZombienetRevmSolcPlatform;
+
+impl Platform for ZombienetRevmSolcPlatform {
+	fn platform_identifier(&self) -> PlatformIdentifier {
+		PlatformIdentifier::ZombienetRevmSolc
+	}
+
+	fn node_identifier(&self) -> NodeIdentifier {
+		NodeIdentifier::Zombienet
+	}
+
+	fn vm_identifier(&self) -> VmIdentifier {
+		VmIdentifier::Evm
+	}
+
+	fn compiler_identifier(&self) -> CompilerIdentifier {
+		CompilerIdentifier::Solc
+	}
+
+	fn new_node(
+		&self,
+		context: Context,
+	) -> anyhow::Result<JoinHandle<anyhow::Result<Box<dyn EthereumNode + Send + Sync>>>> {
+		let genesis_configuration = AsRef::<GenesisConfiguration>::as_ref(&context);
+		let polkadot_parachain_path =
+			AsRef::<PolkadotParachainConfiguration>::as_ref(&context).path.clone();
+		let genesis = genesis_configuration.genesis()?.clone();
+		Ok(thread::spawn(move || {
+			let node = ZombieNode::new(polkadot_parachain_path, context);
+			let node = spawn_node(node, genesis)?;
+			Ok(Box::new(node) as Box<_>)
+		}))
+	}
+
+	fn new_compiler(
+		&self,
+		context: Context,
+		version: Option<VersionOrRequirement>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Box<dyn SolidityCompiler>>>>> {
+		Box::pin(async move {
+			let compiler = Solc::new(context, version).await;
+			compiler.map(|compiler| Box::new(compiler) as Box<dyn SolidityCompiler>)
+		})
+	}
+}
+
+impl From<PlatformIdentifier> for Box<dyn Platform> {
+	fn from(value: PlatformIdentifier) -> Self {
+		match value {
+			PlatformIdentifier::GethEvmSolc => Box::new(GethEvmSolcPlatform) as Box<_>,
+			PlatformIdentifier::LighthouseGethEvmSolc =>
+				Box::new(LighthouseGethEvmSolcPlatform) as Box<_>,
+			PlatformIdentifier::KitchensinkPolkavmResolc =>
+				Box::new(KitchensinkPolkavmResolcPlatform) as Box<_>,
+			PlatformIdentifier::KitchensinkRevmSolc =>
+				Box::new(KitchensinkRevmSolcPlatform) as Box<_>,
+			PlatformIdentifier::ReviveDevNodePolkavmResolc =>
+				Box::new(ReviveDevNodePolkavmResolcPlatform) as Box<_>,
+			PlatformIdentifier::ReviveDevNodeRevmSolc =>
+				Box::new(ReviveDevNodeRevmSolcPlatform) as Box<_>,
+			PlatformIdentifier::ZombienetPolkavmResolc =>
+				Box::new(ZombienetPolkavmResolcPlatform) as Box<_>,
+			PlatformIdentifier::ZombienetRevmSolc => Box::new(ZombienetRevmSolcPlatform) as Box<_>,
+		}
+	}
+}
+
+impl From<PlatformIdentifier> for &dyn Platform {
+	fn from(value: PlatformIdentifier) -> Self {
+		match value {
+			PlatformIdentifier::GethEvmSolc => &GethEvmSolcPlatform as &dyn Platform,
+			PlatformIdentifier::LighthouseGethEvmSolc =>
+				&LighthouseGethEvmSolcPlatform as &dyn Platform,
+			PlatformIdentifier::KitchensinkPolkavmResolc =>
+				&KitchensinkPolkavmResolcPlatform as &dyn Platform,
+			PlatformIdentifier::KitchensinkRevmSolc =>
+				&KitchensinkRevmSolcPlatform as &dyn Platform,
+			PlatformIdentifier::ReviveDevNodePolkavmResolc =>
+				&ReviveDevNodePolkavmResolcPlatform as &dyn Platform,
+			PlatformIdentifier::ReviveDevNodeRevmSolc =>
+				&ReviveDevNodeRevmSolcPlatform as &dyn Platform,
+			PlatformIdentifier::ZombienetPolkavmResolc =>
+				&ZombienetPolkavmResolcPlatform as &dyn Platform,
+			PlatformIdentifier::ZombienetRevmSolc => &ZombienetRevmSolcPlatform as &dyn Platform,
+		}
+	}
+}
+
+fn spawn_node<T: Node + EthereumNode + Send + Sync>(
+	mut node: T,
+	genesis: Genesis,
+) -> anyhow::Result<T> {
+	info!(id = node.id(), connection_string = node.connection_string(), "Spawning node");
+	node.spawn(genesis).context("Failed to spawn node process")?;
+	info!(id = node.id(), connection_string = node.connection_string(), "Spawned node");
+	Ok(node)
 }

crates/core/src/main.rs

@@ -1,829 +1,81 @@
-use std::{
+mod differential_benchmarks;
-    collections::HashMap,
+mod differential_tests;
-    path::{Path, PathBuf},
+mod helpers;
-    sync::{Arc, LazyLock},
-    time::Instant,
-};
 
-use alloy::{
-    json_abi::JsonAbi,
-    network::{Ethereum, TransactionBuilder},
-    primitives::Address,
-    rpc::types::TransactionRequest,
-};
-use anyhow::Context;
 use clap::Parser;
-use futures::stream::futures_unordered::FuturesUnordered;
+use revive_dt_report::ReportAggregator;
-use futures::{Stream, StreamExt};
+use schemars::schema_for;
-use revive_dt_common::iterators::FilesWithExtensionIterator;
+use tracing::info;
-use revive_dt_node_interaction::EthereumNode;
-use semver::Version;
-use temp_dir::TempDir;
-use tokio::sync::{Mutex, RwLock, mpsc};
-use tracing::{Instrument, Level};
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 
-use revive_dt_common::types::Mode;
+use revive_dt_config::Context;
-use revive_dt_compiler::SolidityCompiler;
+use revive_dt_core::Platform;
-use revive_dt_compiler::{Compiler, CompilerOutput};
+use revive_dt_format::metadata::Metadata;
-use revive_dt_config::*;
+
-use revive_dt_core::{
+use crate::{
-    Geth, Kitchensink, Platform,
+	differential_benchmarks::handle_differential_benchmarks,
-    driver::{CaseDriver, CaseState},
+	differential_tests::handle_differential_tests,
 };
-use revive_dt_format::{
-    case::{Case, CaseIdx},
-    corpus::Corpus,
-    input::{Input, Step},
-    metadata::{ContractInstance, ContractPathAndIdent, Metadata, MetadataFile},
-};
-use revive_dt_node::pool::NodePool;
-use revive_dt_report::reporter::{Report, Span};
-
-static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
-
-type CompilationCache = Arc<
-    RwLock<
-        HashMap<
-            (PathBuf, Mode, TestingPlatform),
-            Arc<Mutex<Option<Arc<(Version, CompilerOutput)>>>>,
-        >,
-    >,
->;
-
-/// this represents a single "test"; a mode, path and collection of cases.
-#[derive(Clone)]
-struct Test {
-    metadata: Metadata,
-    path: PathBuf,
-    mode: Mode,
-    case_idx: CaseIdx,
-    case: Case,
-}
-
-/// This represents the results that we gather from running test cases.
-type CaseResult = Result<usize, anyhow::Error>;
 
 fn main() -> anyhow::Result<()> {
-    let args = init_cli()?;
+	let (writer, _guard) = tracing_appender::non_blocking::NonBlockingBuilder::default()
+		.lossy(false)
+		// Assuming that each line contains 255 characters and that each character is one byte, then
+		// this means that our buffer is about 4GBs large.
+		.buffered_lines_limit(0x1000000)
+		.thread_name("buffered writer")
+		.finish(std::io::stdout());
 
-    let body = async {
+	let subscriber = FmtSubscriber::builder()
-        for (corpus, tests) in collect_corpora(&args)? {
+		.with_writer(writer)
-            let span = Span::new(corpus, args.clone())?;
+		.with_thread_ids(false)
-            match &args.compile_only {
+		.with_thread_names(false)
-                Some(platform) => compile_corpus(&args, &tests, platform, span).await,
+		.with_env_filter(EnvFilter::from_default_env())
-                None => execute_corpus(&args, &tests, span).await?,
+		.with_ansi(false)
-            }
+		.pretty()
-            Report::save()?;
+		.finish();
-        }
+	tracing::subscriber::set_global_default(subscriber)?;
-        Ok(())
+	info!("Differential testing tool is starting");
-    };
 
-    tokio::runtime::Builder::new_multi_thread()
+	let context = Context::try_parse()?;
-        .worker_threads(args.number_of_threads)
+	let (reporter, report_aggregator_task) = ReportAggregator::new(context.clone()).into_task();
-        .enable_all()
+
-        .build()
+	match context {
-        .expect("Failed building the Runtime")
+		Context::Test(context) => tokio::runtime::Builder::new_multi_thread()
-        .block_on(body)
+			.worker_threads(context.concurrency_configuration.number_of_threads)
-}
+			.enable_all()
-
+			.build()
-fn init_cli() -> anyhow::Result<Arguments> {
+			.expect("Failed building the Runtime")
-    let subscriber = FmtSubscriber::builder()
+			.block_on(async move {
-        .with_thread_ids(true)
+				let differential_tests_handling_task =
-        .with_thread_names(true)
+					handle_differential_tests(*context, reporter);
-        .with_env_filter(EnvFilter::from_default_env())
+
-        .with_ansi(false)
+				futures::future::try_join(differential_tests_handling_task, report_aggregator_task)
-        .pretty()
+					.await?;
-        .finish();
+
-    tracing::subscriber::set_global_default(subscriber)?;
+				Ok(())
-
+			}),
-    let mut args = Arguments::parse();
+		Context::Benchmark(context) => tokio::runtime::Builder::new_multi_thread()
-
+			.worker_threads(context.concurrency_configuration.number_of_threads)
-    if args.corpus.is_empty() {
+			.enable_all()
-        anyhow::bail!("no test corpus specified");
+			.build()
-    }
+			.expect("Failed building the Runtime")
-
+			.block_on(async move {
-    match args.working_directory.as_ref() {
+				let differential_benchmarks_handling_task =
-        Some(dir) => {
+					handle_differential_benchmarks(*context, reporter);
-            if !dir.exists() {
+
-                anyhow::bail!("workdir {} does not exist", dir.display());
+				futures::future::try_join(
-            }
+					differential_benchmarks_handling_task,
-        }
+					report_aggregator_task,
-        None => {
+				)
-            args.temp_dir = Some(&TEMP_DIR);
+				.await?;
-        }
+
-    }
+				Ok(())
-    tracing::info!("workdir: {}", args.directory().display());
+			}),
-
+		Context::ExportJsonSchema => {
-    Ok(args)
+			let schema = schema_for!(Metadata);
-}
+			println!("{}", serde_json::to_string_pretty(&schema).unwrap());
-
+			Ok(())
-fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<MetadataFile>>> {
+		},
-    let mut corpora = HashMap::new();
+	}
-
-    for path in &args.corpus {
-        let corpus = Corpus::try_from_path(path)?;
-        tracing::info!("found corpus: {}", path.display());
-        let tests = corpus.enumerate_tests();
-        tracing::info!("corpus '{}' contains {} tests", &corpus.name, tests.len());
-        corpora.insert(corpus, tests);
-    }
-
-    Ok(corpora)
-}
-
-async fn run_driver<L, F>(
-    args: &Arguments,
-    metadata_files: &[MetadataFile],
-    span: Span,
-) -> anyhow::Result<()>
-where
-    L: Platform,
-    F: Platform,
-    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-{
-    let (report_tx, report_rx) = mpsc::unbounded_channel::<(Test, CaseResult)>();
-
-    let tests = prepare_tests::<L, F>(args, metadata_files);
-    let driver_task = start_driver_task::<L, F>(args, tests, span, report_tx)?;
-    let status_reporter_task = start_reporter_task(report_rx);
-
-    tokio::join!(status_reporter_task, driver_task);
-
-    Ok(())
-}
-
-fn prepare_tests<L, F>(
-    args: &Arguments,
-    metadata_files: &[MetadataFile],
-) -> impl Stream<Item = Test>
-where
-    L: Platform,
-    F: Platform,
-    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-{
-    metadata_files
-        .iter()
-        .flat_map(
-            |MetadataFile {
-                 path,
-                 content: metadata,
-             }| {
-                metadata
-                    .cases
-                    .iter()
-                    .enumerate()
-                    .flat_map(move |(case_idx, case)| {
-                        metadata
-                            .solc_modes()
-                            .into_iter()
-                            .map(move |solc_mode| (path, metadata, case_idx, case, solc_mode))
-                    })
-            },
-        )
-        .filter(
-            |(metadata_file_path, metadata, _, _, _)| match metadata.ignore {
-                Some(true) => {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        "Ignoring metadata file"
-                    );
-                    false
-                }
-                Some(false) | None => true,
-            },
-        )
-        .filter(
-            |(metadata_file_path, _, case_idx, case, _)| match case.ignore {
-                Some(true) => {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        case_idx,
-                        case_name = ?case.name,
-                        "Ignoring case"
-                    );
-                    false
-                }
-                Some(false) | None => true,
-            },
-        )
-        .filter(|(metadata_file_path, metadata, ..)| match metadata.required_evm_version {
-            Some(evm_version_requirement) => {
-                let is_allowed = evm_version_requirement
-                    .matches(&<L::Blockchain as revive_dt_node::Node>::evm_version())
-                    && evm_version_requirement
-                        .matches(&<F::Blockchain as revive_dt_node::Node>::evm_version());
-
-                if !is_allowed {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        leader_evm_version = %<L::Blockchain as revive_dt_node::Node>::evm_version(),
-                        follower_evm_version = %<F::Blockchain as revive_dt_node::Node>::evm_version(),
-                        version_requirement = %evm_version_requirement,
-                        "Skipped test since the EVM version requirement was not fulfilled."
-                    );
-                }
-
-                is_allowed
-            }
-            None => true,
-        })
-        .map(|(metadata_file_path, metadata, case_idx, case, solc_mode)| {
-            Test {
-                metadata: metadata.clone(),
-                path: metadata_file_path.to_path_buf(),
-                mode: solc_mode,
-                case_idx: case_idx.into(),
-                case: case.clone(),
-            }
-        })
-        .map(async |test| test)
-        .collect::<FuturesUnordered<_>>()
-        .filter_map(async move |test| {
-            // Check that both compilers support this test, else we skip it
-            let is_supported = does_compiler_support_mode::<L>(args, &test.mode).await.ok().unwrap_or(false) &&
-                does_compiler_support_mode::<F>(args, &test.mode).await.ok().unwrap_or(false);
-
-            tracing::warn!(
-                metadata_file_path = %test.path.display(),
-                case_idx = %test.case_idx,
-                case_name = ?test.case.name,
-                mode = %test.mode,
-                "Skipping test as one or both of the compilers don't support it"
-            );
-
-            // We filter_map to avoid needing to clone `test`, but return it as-is.
-            if is_supported {
-                Some(test)
-            } else {
-                None
-            }
-        })
-}
-
-async fn does_compiler_support_mode<P: Platform>(
-    args: &Arguments,
-    mode: &Mode,
-) -> anyhow::Result<bool> {
-    let compiler_version_or_requirement = mode.compiler_version_to_use(args.solc.clone());
-    let compiler_path =
-        P::Compiler::get_compiler_executable(args, compiler_version_or_requirement).await?;
-    let compiler_version = P::Compiler::new(compiler_path.clone()).version()?;
-
-    Ok(P::Compiler::supports_mode(
-        &compiler_version,
-        mode.optimize_setting,
-        mode.pipeline,
-    ))
-}
-
-fn start_driver_task<L, F>(
-    args: &Arguments,
-    tests: impl Stream<Item = Test>,
-    span: Span,
-    report_tx: mpsc::UnboundedSender<(Test, CaseResult)>,
-) -> anyhow::Result<impl Future<Output = ()>>
-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_nodes = Arc::new(NodePool::<L::Blockchain>::new(args)?);
-    let follower_nodes = Arc::new(NodePool::<F::Blockchain>::new(args)?);
-    let compilation_cache = Arc::new(RwLock::new(HashMap::new()));
-    let number_concurrent_tasks = args.number_of_concurrent_tasks();
-
-    Ok(tests.for_each_concurrent(
-        // We want to limit the concurrent tasks here because:
-        //
-        // 1. We don't want to overwhelm the nodes with too many requests, leading to responses timing out.
-        // 2. We don't want to open too many files at once, leading to the OS running out of file descriptors.
-        //
-        // By default, we allow maximum of 10 ongoing requests per node in order to limit (1), and assume that
-        // this number will automatically be low enough to address (2). The user can override this.
-        Some(number_concurrent_tasks),
-        move |test| {
-            let leader_nodes = leader_nodes.clone();
-            let follower_nodes = follower_nodes.clone();
-            let compilation_cache = compilation_cache.clone();
-            let report_tx = report_tx.clone();
-
-            async move {
-                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 = %test.path.display(),
-                    case_idx = ?test.case_idx,
-                    solc_mode = ?test.mode,
-                );
-
-                let result = handle_case_driver::<L, F>(
-                    &test.path,
-                    &test.metadata,
-                    test.case_idx,
-                    &test.case,
-                    test.mode.clone(),
-                    args,
-                    compilation_cache.clone(),
-                    leader_node,
-                    follower_node,
-                    span,
-                )
-                .instrument(tracing_span)
-                .await;
-
-                report_tx
-                    .send((test, result))
-                    .expect("Failed to send report");
-            }
-        },
-    ))
-}
-
-async fn start_reporter_task(mut report_rx: mpsc::UnboundedReceiver<(Test, CaseResult)>) {
-    let start = Instant::now();
-
-    const GREEN: &str = "\x1B[32m";
-    const RED: &str = "\x1B[31m";
-    const COLOUR_RESET: &str = "\x1B[0m";
-    const BOLD: &str = "\x1B[1m";
-    const BOLD_RESET: &str = "\x1B[22m";
-
-    let mut number_of_successes = 0;
-    let mut number_of_failures = 0;
-    let mut failures = vec![];
-
-    // Wait for reports to come from our test runner. When the channel closes, this ends.
-    while let Some((test, case_result)) = report_rx.recv().await {
-        let case_name = test.case.name.as_deref().unwrap_or("unnamed_case");
-        let case_idx = test.case_idx;
-        let test_path = test.path.display();
-        let test_mode = test.mode.clone();
-
-        match case_result {
-            Ok(_inputs) => {
-                number_of_successes += 1;
-                eprintln!(
-                    "{GREEN}Case Succeeded:{COLOUR_RESET} {test_path} -> {case_name}:{case_idx} (mode: {test_mode})"
-                );
-            }
-            Err(err) => {
-                number_of_failures += 1;
-                eprintln!(
-                    "{RED}Case Failed:{COLOUR_RESET} {test_path} -> {case_name}:{case_idx} (mode: {test_mode})"
-                );
-                failures.push((test, err));
-            }
-        }
-    }
-
-    eprintln!();
-    let elapsed = start.elapsed();
-
-    // Now, log the failures with more complete errors at the bottom, like `cargo test` does, so
-    // that we don't have to scroll through the entire output to find them.
-    if !failures.is_empty() {
-        eprintln!("{BOLD}Failures:{BOLD_RESET}\n");
-
-        for failure in failures {
-            let (test, err) = failure;
-            let case_name = test.case.name.as_deref().unwrap_or("unnamed_case");
-            let case_idx = test.case_idx;
-            let test_path = test.path.display();
-            let test_mode = test.mode.clone();
-
-            eprintln!(
-                "---- {RED}Case Failed:{COLOUR_RESET} {test_path} -> {case_name}:{case_idx} (mode: {test_mode}) ----\n\n{err}\n"
-            );
-        }
-    }
-
-    // Summary at the end.
-    eprintln!(
-        "{} cases: {GREEN}{number_of_successes}{COLOUR_RESET} cases succeeded, {RED}{number_of_failures}{COLOUR_RESET} cases failed in {} seconds",
-        number_of_successes + number_of_failures,
-        elapsed.as_secs()
-    );
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn handle_case_driver<L, F>(
-    metadata_file_path: &Path,
-    metadata: &Metadata,
-    case_idx: CaseIdx,
-    case: &Case,
-    mode: Mode,
-    config: &Arguments,
-    compilation_cache: CompilationCache,
-    leader_node: &L::Blockchain,
-    follower_node: &F::Blockchain,
-    _: Span,
-) -> anyhow::Result<usize>
-where
-    L: Platform,
-    F: Platform,
-    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-{
-    let leader_pre_link_contracts = get_or_build_contracts::<L>(
-        metadata,
-        metadata_file_path,
-        mode.clone(),
-        config,
-        compilation_cache.clone(),
-        &HashMap::new(),
-    )
-    .await?;
-    let follower_pre_link_contracts = get_or_build_contracts::<F>(
-        metadata,
-        metadata_file_path,
-        mode.clone(),
-        config,
-        compilation_cache.clone(),
-        &HashMap::new(),
-    )
-    .await?;
-
-    let mut leader_deployed_libraries = HashMap::new();
-    let mut follower_deployed_libraries = HashMap::new();
-    let mut contract_sources = metadata.contract_sources()?;
-    for library_instance in metadata
-        .libraries
-        .iter()
-        .flatten()
-        .flat_map(|(_, map)| map.values())
-    {
-        let ContractPathAndIdent {
-            contract_source_path: library_source_path,
-            contract_ident: library_ident,
-        } = contract_sources
-            .remove(library_instance)
-            .context("Failed to find the contract source")?;
-
-        let (leader_code, leader_abi) = leader_pre_link_contracts
-            .1
-            .contracts
-            .get(&library_source_path)
-            .and_then(|contracts| contracts.get(library_ident.as_str()))
-            .context("Declared library was not compiled")?;
-        let (follower_code, follower_abi) = follower_pre_link_contracts
-            .1
-            .contracts
-            .get(&library_source_path)
-            .and_then(|contracts| contracts.get(library_ident.as_str()))
-            .context("Declared library was not compiled")?;
-
-        let leader_code = match alloy::hex::decode(leader_code) {
-            Ok(code) => code,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    contract_source_path = library_source_path.display().to_string(),
-                    contract_ident = library_ident.as_ref(),
-                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
-                );
-                anyhow::bail!("Failed to hex-decode the byte code {}", error)
-            }
-        };
-        let follower_code = match alloy::hex::decode(follower_code) {
-            Ok(code) => code,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    contract_source_path = library_source_path.display().to_string(),
-                    contract_ident = library_ident.as_ref(),
-                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
-                );
-                anyhow::bail!("Failed to hex-decode the byte code {}", error)
-            }
-        };
-
-        // Getting the deployer address from the cases themselves. This is to ensure that we're
-        // doing the deployments from different accounts and therefore we're not slowed down by
-        // the nonce.
-        let deployer_address = case
-            .steps
-            .iter()
-            .filter_map(|step| match step {
-                Step::FunctionCall(input) => Some(input.caller),
-                Step::BalanceAssertion(..) => None,
-                Step::StorageEmptyAssertion(..) => None,
-            })
-            .next()
-            .unwrap_or(Input::default_caller());
-        let leader_tx = TransactionBuilder::<Ethereum>::with_deploy_code(
-            TransactionRequest::default().from(deployer_address),
-            leader_code,
-        );
-        let follower_tx = TransactionBuilder::<Ethereum>::with_deploy_code(
-            TransactionRequest::default().from(deployer_address),
-            follower_code,
-        );
-
-        let leader_receipt = match leader_node.execute_transaction(leader_tx).await {
-            Ok(receipt) => receipt,
-            Err(error) => {
-                tracing::error!(
-                    node = std::any::type_name::<L>(),
-                    ?error,
-                    "Contract deployment transaction failed."
-                );
-                return Err(error);
-            }
-        };
-        let follower_receipt = match follower_node.execute_transaction(follower_tx).await {
-            Ok(receipt) => receipt,
-            Err(error) => {
-                tracing::error!(
-                    node = std::any::type_name::<F>(),
-                    ?error,
-                    "Contract deployment transaction failed."
-                );
-                return Err(error);
-            }
-        };
-
-        tracing::info!(
-            ?library_instance,
-            library_address = ?leader_receipt.contract_address,
-            "Deployed library to leader"
-        );
-        tracing::info!(
-            ?library_instance,
-            library_address = ?follower_receipt.contract_address,
-            "Deployed library to follower"
-        );
-
-        let Some(leader_library_address) = leader_receipt.contract_address else {
-            anyhow::bail!("Contract deployment didn't return an address");
-        };
-        let Some(follower_library_address) = follower_receipt.contract_address else {
-            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.to_path_buf(),
-                mode.clone(),
-                L::config_id(),
-            );
-            let follower_key = (
-                metadata_file_path.to_path_buf(),
-                mode.clone(),
-                F::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<P: Platform>(
-    metadata: &Metadata,
-    metadata_file_path: &Path,
-    mode: Mode,
-    config: &Arguments,
-    compilation_cache: CompilationCache,
-    deployed_libraries: &HashMap<ContractInstance, (Address, JsonAbi)>,
-) -> anyhow::Result<Arc<(Version, CompilerOutput)>> {
-    let key = (
-        metadata_file_path.to_path_buf(),
-        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 = compile_contracts::<P>(
-                    metadata,
-                    metadata_file_path,
-                    &mode,
-                    config,
-                    deployed_libraries,
-                )
-                .await?;
-                let compiled_contracts = Arc::new(compiled_contracts);
-
-                *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 = compile_contracts::<P>(
-        metadata,
-        metadata_file_path,
-        &mode,
-        config,
-        deployed_libraries,
-    )
-    .await?;
-    let compiled_contracts = Arc::new(compiled_contracts);
-
-    *compilation_artifact = Some(compiled_contracts.clone());
-    Ok(compiled_contracts.clone())
-}
-
-async fn compile_contracts<P: Platform>(
-    metadata: &Metadata,
-    metadata_file_path: &Path,
-    mode: &Mode,
-    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.optimize_setting)
-        .with_pipeline(mode.pipeline);
-    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")
-            .with_use_cached_fs(true)
-            .fold(compiler, |compiler, path| {
-                compiler.with_library(&path, library_ident.as_str(), *library_address)
-            });
-    }
-
-    let compiler_output = compiler.try_build(compiler_path).await?;
-
-    Ok((compiler_version, compiler_output))
-}
-
-async fn execute_corpus(
-    args: &Arguments,
-    tests: &[MetadataFile],
-    span: Span,
-) -> anyhow::Result<()> {
-    match (&args.leader, &args.follower) {
-        (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, span).await?
-        }
-        (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span).await?
-        }
-        _ => unimplemented!(),
-    }
-
-    Ok(())
-}
-
-async fn compile_corpus(
-    config: &Arguments,
-    tests: &[MetadataFile],
-    platform: &TestingPlatform,
-    _: Span,
-) {
-    let tests = tests.iter().flat_map(|metadata| {
-        metadata
-            .solc_modes()
-            .into_iter()
-            .map(move |solc_mode| (metadata, solc_mode))
-    });
-
-    futures::stream::iter(tests)
-        .for_each_concurrent(None, |(metadata, mode)| async move {
-            match platform {
-                TestingPlatform::Geth => {
-                    let _ = compile_contracts::<Geth>(
-                        &metadata.content,
-                        &metadata.path,
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
-                }
-                TestingPlatform::Kitchensink => {
-                    let _ = compile_contracts::<Geth>(
-                        &metadata.content,
-                        &metadata.path,
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
-                }
-            }
-        })
-        .await;
 }

crates/format/Cargo.toml

@@ -14,14 +14,17 @@ revive-dt-common = { workspace = true }
 revive-common = { workspace = true }
 
 alloy = { workspace = true }
-alloy-primitives = { workspace = true }
-alloy-sol-types = { workspace = true }
 anyhow = { workspace = true }
+futures = { workspace = true }
 regex = { workspace = true }
 tracing = { workspace = true }
+schemars = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }
+
+[lints]
+workspace = true

crates/format/src/case.rs

@@ -1,75 +1,108 @@
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use revive_dt_common::macros::define_wrapper_type;
+use revive_dt_common::{macros::define_wrapper_type, types::Mode};
 
-use crate::{
+use crate::{mode::ParsedMode, steps::*};
-    input::{Expected, Step},
-    mode::ParsedMode,
-};
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq, JsonSchema)]
 pub struct Case {
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional name of the test case.
-    pub name: Option<String>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub name: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional comment on the case which has no impact on the execution in any way.
-    pub comment: Option<String>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub comment: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// This represents a mode that has been parsed from test metadata.
-    pub modes: Option<Vec<ParsedMode>>,
+	///
+	/// Mode strings can take the following form (in pseudo-regex):
+	///
+	/// ```text
+	/// [YEILV][+-]? (M[0123sz])? <semver>?
+	/// ```
+	///
+	/// If this is provided then it takes higher priority than the modes specified in the metadata
+	/// file.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub modes: Option<Vec<ParsedMode>>,
 
-    #[serde(rename = "inputs")]
+	/// The set of steps to run as part of this test case.
-    pub steps: Vec<Step>,
+	#[serde(rename = "inputs")]
+	pub steps: Vec<Step>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional name of the group of tests that this test belongs to.
-    pub group: Option<String>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub group: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional set of expectations and assertions to make about the transaction after it ran.
-    pub expected: Option<Expected>,
+	///
+	/// If this is not specified then the only assertion that will be ran is that the transaction
+	/// was successful.
+	///
+	/// This expectation that's on the case itself will be attached to the final step of the case.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub expected: Option<Expected>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional boolean which defines if the case as a whole should be ignored. If null then
-    pub ignore: Option<bool>,
+	/// the case will not be ignored.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub ignore: Option<bool>,
 }
 
 impl Case {
-    #[allow(irrefutable_let_patterns)]
+	pub fn steps_iterator(&self) -> impl Iterator<Item = Step> {
-    pub fn steps_iterator(&self) -> impl Iterator<Item = Step> {
+		let steps_len = self.steps.len();
-        let steps_len = self.steps.len();
+		self.steps.clone().into_iter().enumerate().map(move |(idx, mut step)| {
-        self.steps
+			let Step::FunctionCall(ref mut input) = step else {
-            .clone()
+				return step;
-            .into_iter()
+			};
-            .enumerate()
-            .map(move |(idx, mut step)| {
-                let Step::FunctionCall(ref mut input) = step else {
-                    return step;
-                };
 
-                if idx + 1 == steps_len {
+			if idx + 1 == steps_len {
-                    if input.expected.is_none() {
+				if input.expected.is_none() {
-                        input.expected = self.expected.clone();
+					input.expected = self.expected.clone();
-                    }
+				}
 
-                    // TODO: What does it mean for us to have an `expected` field on the case itself
+				// TODO: What does it mean for us to have an `expected` field on the case itself
-                    // but the final input also has an expected field that doesn't match the one on
+				// but the final input also has an expected field that doesn't match the one on
-                    // the case? What are we supposed to do with that final expected field on the
+				// the case? What are we supposed to do with that final expected field on the
-                    // case?
+				// case?
 
-                    step
+				step
-                } else {
+			} else {
-                    step
+				step
-                }
+			}
-            })
+		})
-    }
+	}
+
+	pub fn steps_iterator_for_benchmarks(
+		&self,
+		default_repeat_count: usize,
+	) -> Box<dyn Iterator<Item = Step> + '_> {
+		let contains_repeat = self.steps_iterator().any(|step| matches!(&step, Step::Repeat(..)));
+		if contains_repeat {
+			Box::new(self.steps_iterator()) as Box<_>
+		} else {
+			Box::new(std::iter::once(Step::Repeat(Box::new(RepeatStep {
+				comment: None,
+				repeat: default_repeat_count,
+				steps: self.steps_iterator().collect(),
+			})))) as Box<_>
+		}
+	}
+
+	pub fn solc_modes(&self) -> Vec<Mode> {
+		match &self.modes {
+			Some(modes) => ParsedMode::many_to_modes(modes.iter()).collect(),
+			None => Mode::all().cloned().collect(),
+		}
+	}
 }
 
 define_wrapper_type!(
-    /// A wrapper type for the index of test cases found in metadata file.
+	/// A wrapper type for the index of test cases found in metadata file.
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+	#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-    pub struct CaseIdx(usize);
+	#[serde(transparent)]
+	pub struct CaseIdx(usize) impl Display, FromStr;
 );
-
-impl std::fmt::Display for CaseIdx {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}

crates/format/src/corpus.rs

@@ -1,99 +1,123 @@
 use std::{
-    fs::File,
+	fs::File,
-    path::{Path, PathBuf},
+	path::{Path, PathBuf},
 };
 
-use revive_dt_common::cached_fs::read_dir;
+use revive_dt_common::iterators::FilesWithExtensionIterator;
 use serde::{Deserialize, Serialize};
+use tracing::{debug, info};
 
-use crate::metadata::MetadataFile;
+use crate::metadata::{Metadata, MetadataFile};
+use anyhow::Context as _;
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Corpus {
+#[serde(untagged)]
-    pub name: String,
+pub enum Corpus {
-    pub path: PathBuf,
+	SinglePath { name: String, path: PathBuf },
+	MultiplePaths { name: String, paths: Vec<PathBuf> },
 }
 
 impl Corpus {
-    /// Try to read and parse the corpus definition file at given `path`.
+	pub fn try_from_path(file_path: impl AsRef<Path>) -> anyhow::Result<Self> {
-    pub fn try_from_path(path: &Path) -> anyhow::Result<Self> {
+		let mut corpus = File::open(file_path.as_ref())
-        let file = File::open(path)?;
+			.map_err(anyhow::Error::from)
-        let mut corpus: Corpus = serde_json::from_reader(file)?;
+			.and_then(|file| serde_json::from_reader::<_, Corpus>(file).map_err(Into::into))
+			.with_context(|| {
+				format!(
+					"Failed to open and deserialize corpus file at {}",
+					file_path.as_ref().display()
+				)
+			})?;
 
-        // Ensure that the path mentioned in the corpus is relative to the corpus file.
+		let corpus_directory = file_path
-        // Canonicalizing also helps make the path in any errors unambiguous.
+			.as_ref()
-        corpus.path = path
+			.canonicalize()
-            .parent()
+			.context("Failed to canonicalize the path to the corpus file")?
-            .ok_or_else(|| {
+			.parent()
-                anyhow::anyhow!("Corpus path '{}' does not point to a file", path.display())
+			.context("Corpus file has no parent")?
-            })?
+			.to_path_buf();
-            .canonicalize()
-            .map_err(|error| {
-                anyhow::anyhow!(
-                    "Failed to canonicalize path to corpus '{}': {error}",
-                    path.display()
-                )
-            })?
-            .join(corpus.path);
 
-        Ok(corpus)
+		for path in corpus.paths_iter_mut() {
-    }
+			*path = corpus_directory.join(path.as_path())
+		}
 
-    /// Scan the corpus base directory and return all tests found.
+		Ok(corpus)
-    pub fn enumerate_tests(&self) -> Vec<MetadataFile> {
+	}
-        let mut tests = Vec::new();
+
-        collect_metadata(&self.path, &mut tests);
+	pub fn enumerate_tests(&self) -> Vec<MetadataFile> {
-        tests
+		let mut tests = self
-    }
+			.paths_iter()
-}
+			.flat_map(|root_path| {
-
+				if !root_path.is_dir() {
-/// Recursively walks `path` and parses any JSON or Solidity file into a test
+					Box::new(std::iter::once(root_path.to_path_buf()))
-/// definition [Metadata].
+						as Box<dyn Iterator<Item = _>>
-///
+				} else {
-/// Found tests are inserted into `tests`.
+					Box::new(
-///
+						FilesWithExtensionIterator::new(root_path)
-/// `path` is expected to be a directory.
+							.with_use_cached_fs(true)
-pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
+							.with_allowed_extension("sol")
-    if path.is_dir() {
+							.with_allowed_extension("json"),
-        let dir_entry = match read_dir(path) {
+					)
-            Ok(dir_entry) => dir_entry,
+				}
-            Err(error) => {
+				.map(move |metadata_file_path| (root_path, metadata_file_path))
-                tracing::error!("failed to read dir '{}': {error}", path.display());
+			})
-                return;
+			.filter_map(|(root_path, metadata_file_path)| {
-            }
+				Metadata::try_from_file(&metadata_file_path)
-        };
+					.or_else(|| {
-
+						debug!(
-        for path in dir_entry {
+							discovered_from = %root_path.display(),
-            let path = match path {
+							metadata_file_path = %metadata_file_path.display(),
-                Ok(entry) => entry,
+							"Skipping file since it doesn't contain valid metadata"
-                Err(error) => {
+						);
-                    tracing::error!("error reading dir entry: {error}");
+						None
-                    continue;
+					})
-                }
+					.map(|metadata| MetadataFile {
-            };
+						metadata_file_path,
-
+						corpus_file_path: root_path.to_path_buf(),
-            if path.is_dir() {
+						content: metadata,
-                collect_metadata(&path, tests);
+					})
-                continue;
+					.inspect(|metadata_file| {
-            }
+						debug!(
-
+							metadata_file_path = %metadata_file.relative_path().display(),
-            if path.is_file() {
+							"Loaded metadata file"
-                if let Some(metadata) = MetadataFile::try_from_file(&path) {
+						)
-                    tests.push(metadata)
+					})
-                }
+			})
-            }
+			.collect::<Vec<_>>();
-        }
+		tests.sort_by(|a, b| a.metadata_file_path.cmp(&b.metadata_file_path));
-    } else {
+		tests.dedup_by(|a, b| a.metadata_file_path == b.metadata_file_path);
-        let Some(extension) = path.extension() else {
+		info!(len = tests.len(), corpus_name = self.name(), "Found tests in Corpus");
-            tracing::error!("Failed to get file extension");
+		tests
-            return;
+	}
-        };
+
-        if extension.eq_ignore_ascii_case("sol") || extension.eq_ignore_ascii_case("json") {
+	pub fn name(&self) -> &str {
-            if let Some(metadata) = MetadataFile::try_from_file(path) {
+		match self {
-                tests.push(metadata)
+			Corpus::SinglePath { name, .. } | Corpus::MultiplePaths { name, .. } => name.as_str(),
-            }
+		}
-        } else {
+	}
-            tracing::error!(?extension, "Unsupported file extension");
+
-        }
+	pub fn paths_iter(&self) -> impl Iterator<Item = &Path> {
-    }
+		match self {
+			Corpus::SinglePath { path, .. } =>
+				Box::new(std::iter::once(path.as_path())) as Box<dyn Iterator<Item = _>>,
+			Corpus::MultiplePaths { paths, .. } =>
+				Box::new(paths.iter().map(|path| path.as_path())) as Box<dyn Iterator<Item = _>>,
+		}
+	}
+
+	pub fn paths_iter_mut(&mut self) -> impl Iterator<Item = &mut PathBuf> {
+		match self {
+			Corpus::SinglePath { path, .. } =>
+				Box::new(std::iter::once(path)) as Box<dyn Iterator<Item = _>>,
+			Corpus::MultiplePaths { paths, .. } =>
+				Box::new(paths.iter_mut()) as Box<dyn Iterator<Item = _>>,
+		}
+	}
+
+	pub fn path_count(&self) -> usize {
+		match self {
+			Corpus::SinglePath { .. } => 1,
+			Corpus::MultiplePaths { paths, .. } => paths.len(),
+		}
+	}
 }

crates/format/src/lib.rs

@@ -2,7 +2,7 @@
 
 pub mod case;
 pub mod corpus;
-pub mod input;
 pub mod metadata;
 pub mod mode;
+pub mod steps;
 pub mod traits;

crates/format/src/metadata.rs

@@ -1,20 +1,24 @@
 use std::{
-    cmp::Ordering,
+	cmp::Ordering,
-    collections::BTreeMap,
+	collections::BTreeMap,
-    fmt::Display,
+	fmt::Display,
-    fs::File,
+	fs::File,
-    ops::Deref,
+	ops::Deref,
-    path::{Path, PathBuf},
+	path::{Path, PathBuf},
-    str::FromStr,
+	str::FromStr,
 };
 
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use revive_common::EVMVersion;
 use revive_dt_common::{
-    cached_fs::read_to_string, iterators::FilesWithExtensionIterator, macros::define_wrapper_type,
+	cached_fs::read_to_string,
-    types::Mode,
+	iterators::FilesWithExtensionIterator,
+	macros::define_wrapper_type,
+	types::{Mode, VmIdentifier},
 };
+use tracing::error;
 
 use crate::{case::Case, mode::ParsedMode};
 
@@ -24,260 +28,277 @@ pub const SOLIDITY_CASE_COMMENT_MARKER: &str = "//!";
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct MetadataFile {
-    pub path: PathBuf,
+	/// The path of the metadata file. This will either be a JSON or solidity file.
-    pub content: Metadata,
+	pub metadata_file_path: PathBuf,
+
+	/// This is the path contained within the corpus file. This could either be the path of some
+	/// dir or could be the actual metadata file path.
+	pub corpus_file_path: PathBuf,
+
+	/// The metadata contained within the file.
+	pub content: Metadata,
 }
 
 impl MetadataFile {
-    pub fn try_from_file(path: &Path) -> Option<Self> {
+	pub fn relative_path(&self) -> &Path {
-        Metadata::try_from_file(path).map(|metadata| Self {
+		if self.corpus_file_path.is_file() {
-            path: path.to_owned(),
+			&self.corpus_file_path
-            content: metadata,
+		} else {
-        })
+			self.metadata_file_path.strip_prefix(&self.corpus_file_path).unwrap()
-    }
+		}
+	}
 }
 
 impl Deref for MetadataFile {
-    type Target = Metadata;
+	type Target = Metadata;
 
-    fn deref(&self) -> &Self::Target {
+	fn deref(&self) -> &Self::Target {
-        &self.content
+		&self.content
-    }
+	}
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+/// A MatterLabs metadata file.
+///
+/// This defines the structure that the MatterLabs metadata files follow for defining the tests or
+/// the workloads.
+///
+/// Each metadata file is composed of multiple test cases where each test case is isolated from the
+/// others and runs in a completely different address space. Each test case is composed of a number
+/// of steps and assertions that should be performed as part of the test case.
+#[derive(Debug, Default, Serialize, Deserialize, JsonSchema, Clone, Eq, PartialEq)]
 pub struct Metadata {
-    /// A comment on the test case that's added for human-readability.
+	/// This is an optional comment on the metadata file which has no impact on the execution in
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// any way.
-    pub comment: Option<String>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub comment: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional boolean which defines if the metadata file as a whole should be ignored. If
-    pub ignore: Option<bool>,
+	/// null then the metadata file will not be ignored.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub ignore: Option<bool>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// An optional vector of targets that this Metadata file's cases can be executed on. As an
-    pub targets: Option<Vec<String>>,
+	/// example, if we wish for the metadata file's cases to only be run on PolkaVM then we'd
+	/// specify a target of "PolkaVM" in here.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub targets: Option<Vec<VmIdentifier>>,
 
-    pub cases: Vec<Case>,
+	/// A vector of the test cases and workloads contained within the metadata file. This is their
+	/// primary description.
+	pub cases: Vec<Case>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// A map of all of the contracts that the test requires to run.
-    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
+	///
+	/// This is a map where the key is the name of the contract instance and the value is the
+	/// contract's path and ident in the file.
+	///
+	/// If any contract is to be used by the test then it must be included in here first so that
+	/// the framework is aware of its path, compiles it, and prepares it.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// The set of libraries that this metadata file requires.
-    pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// This represents a mode that has been parsed from test metadata.
-    pub modes: Option<Vec<ParsedMode>>,
+	///
+	/// Mode strings can take the following form (in pseudo-regex):
+	///
+	/// ```text
+	/// [YEILV][+-]? (M[0123sz])? <semver>?
+	/// ```
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub modes: Option<Vec<ParsedMode>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
+	#[serde(skip_serializing_if = "Option::is_none")]
-    pub file_path: Option<PathBuf>,
+	#[schemars(skip)]
+	pub file_path: Option<PathBuf>,
 
-    /// This field specifies an EVM version requirement that the test case has where the test might
+	/// This field specifies an EVM version requirement that the test case has where the test might
-    /// be run of the evm version of the nodes match the evm version specified here.
+	/// be run of the evm version of the nodes match the evm version specified here.
-    #[serde(skip_serializing_if = "Option::is_none")]
+	#[serde(skip_serializing_if = "Option::is_none")]
-    pub required_evm_version: Option<EvmVersionRequirement>,
+	pub required_evm_version: Option<EvmVersionRequirement>,
 
-    /// A set of compilation directives that will be passed to the compiler whenever the contracts for
+	/// A set of compilation directives that will be passed to the compiler whenever the contracts
-    /// the test are being compiled. Note that this differs from the [`Mode`]s in that a [`Mode`] is
+	/// for the test are being compiled. Note that this differs from the [`Mode`]s in that a
-    /// just a filter for when a test can run whereas this is an instruction to the compiler.
+	/// [`Mode`] is just a filter for when a test can run whereas this is an instruction to the
-    #[serde(skip_serializing_if = "Option::is_none")]
+	/// compiler.
-    pub compiler_directives: Option<CompilationDirectives>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub compiler_directives: Option<CompilationDirectives>,
 }
 
 impl Metadata {
-    /// Returns the modes that we should test from this metadata.
+	/// Returns the modes that we should test from this metadata.
-    pub fn solc_modes(&self) -> Vec<Mode> {
+	pub fn solc_modes(&self) -> Vec<Mode> {
-        match &self.modes {
+		match &self.modes {
-            Some(modes) => ParsedMode::many_to_modes(modes.iter()).collect(),
+			Some(modes) => ParsedMode::many_to_modes(modes.iter()).collect(),
-            None => Mode::all().collect(),
+			None => Mode::all().cloned().collect(),
-        }
+		}
-    }
+	}
 
-    /// Returns the base directory of this metadata.
+	/// Returns the base directory of this metadata.
-    pub fn directory(&self) -> anyhow::Result<PathBuf> {
+	pub fn directory(&self) -> anyhow::Result<PathBuf> {
-        Ok(self
+		Ok(self
-            .file_path
+			.file_path
-            .as_ref()
+			.as_ref()
-            .and_then(|path| path.parent())
+			.and_then(|path| path.parent())
-            .ok_or_else(|| anyhow::anyhow!("metadata invalid file path: {:?}", self.file_path))?
+			.ok_or_else(|| anyhow::anyhow!("metadata invalid file path: {:?}", self.file_path))?
-            .to_path_buf())
+			.to_path_buf())
-    }
+	}
 
-    /// Returns the contract sources with canonicalized paths for the files
+	/// Returns the contract sources with canonicalized paths for the files
-    pub fn contract_sources(
+	pub fn contract_sources(
-        &self,
+		&self,
-    ) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdent>> {
+	) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdent>> {
-        let directory = self.directory()?;
+		let directory = self.directory()?;
-        let mut sources = BTreeMap::new();
+		let mut sources = BTreeMap::new();
-        let Some(contracts) = &self.contracts else {
+		let Some(contracts) = &self.contracts else {
-            return Ok(sources);
+			return Ok(sources);
-        };
+		};
 
-        for (
+		for (alias, ContractPathAndIdent { contract_source_path, contract_ident }) in contracts {
-            alias,
+			let alias = alias.clone();
-            ContractPathAndIdent {
+			let absolute_path =
-                contract_source_path,
+				directory.join(contract_source_path).canonicalize().map_err(|error| {
-                contract_ident,
+					anyhow::anyhow!(
-            },
+						"Failed to canonicalize contract source path '{}': {error}",
-        ) in contracts
+						directory.join(contract_source_path).display()
-        {
+					)
-            let alias = alias.clone();
+				})?;
-            let absolute_path = directory.join(contract_source_path).canonicalize()?;
+			let contract_ident = contract_ident.clone();
-            let contract_ident = contract_ident.clone();
 
-            sources.insert(
+			sources.insert(
-                alias,
+				alias,
-                ContractPathAndIdent {
+				ContractPathAndIdent { contract_source_path: absolute_path, contract_ident },
-                    contract_source_path: absolute_path,
+			);
-                    contract_ident,
+		}
-                },
-            );
-        }
 
-        Ok(sources)
+		Ok(sources)
-    }
+	}
 
-    /// Try to parse the test metadata struct from the given file at `path`.
+	/// Try to parse the test metadata struct from the given file at `path`.
-    ///
+	///
-    /// Returns `None` if `path` didn't contain a test metadata or case definition.
+	/// Returns `None` if `path` didn't contain a test metadata or case definition.
-    ///
+	///
-    /// # Panics
+	/// # Panics
-    /// Expects the supplied `path` to be a file.
+	/// Expects the supplied `path` to be a file.
-    pub fn try_from_file(path: &Path) -> Option<Self> {
+	pub fn try_from_file(path: &Path) -> Option<Self> {
-        assert!(path.is_file(), "not a file: {}", path.display());
+		assert!(path.is_file(), "not a file: {}", path.display());
 
-        let Some(file_extension) = path.extension() else {
+		let file_extension = path.extension()?;
-            tracing::debug!("skipping corpus file: {}", path.display());
-            return None;
-        };
 
-        if file_extension == METADATA_FILE_EXTENSION {
+		if file_extension == METADATA_FILE_EXTENSION {
-            return Self::try_from_json(path);
+			return Self::try_from_json(path);
-        }
+		}
 
-        if file_extension == SOLIDITY_CASE_FILE_EXTENSION {
+		if file_extension == SOLIDITY_CASE_FILE_EXTENSION {
-            return Self::try_from_solidity(path);
+			return Self::try_from_solidity(path);
-        }
+		}
 
-        tracing::debug!("ignoring invalid corpus file: {}", path.display());
+		None
-        None
+	}
-    }
 
-    fn try_from_json(path: &Path) -> Option<Self> {
+	fn try_from_json(path: &Path) -> Option<Self> {
-        let file = File::open(path)
+		let file = File::open(path)
-            .inspect_err(|error| {
+			.inspect_err(|err| error!(path = %path.display(), %err, "Failed to open file"))
-                tracing::error!(
+			.ok()?;
-                    "opening JSON test metadata file '{}' error: {error}",
-                    path.display()
-                );
-            })
-            .ok()?;
 
-        match serde_json::from_reader::<_, Metadata>(file) {
+		match serde_json::from_reader::<_, Metadata>(file) {
-            Ok(mut metadata) => {
+			Ok(mut metadata) => {
-                metadata.file_path = Some(path.to_path_buf());
+				metadata.file_path = Some(path.to_path_buf());
-                Some(metadata)
+				Some(metadata)
-            }
+			},
-            Err(error) => {
+			Err(err) => {
-                tracing::error!(
+				error!(path = %path.display(), %err, "Deserialization of metadata failed");
-                    "parsing JSON test metadata file '{}' error: {error}",
+				None
-                    path.display()
+			},
-                );
+		}
-                None
+	}
-            }
-        }
-    }
 
-    fn try_from_solidity(path: &Path) -> Option<Self> {
+	fn try_from_solidity(path: &Path) -> Option<Self> {
-        let spec = read_to_string(path)
+		let spec = read_to_string(path)
-            .inspect_err(|error| {
+			.inspect_err(|err| error!(path = %path.display(), %err, "Failed to read file content"))
-                tracing::error!(
+			.ok()?
-                    "opening JSON test metadata file '{}' error: {error}",
+			.lines()
-                    path.display()
+			.filter_map(|line| line.strip_prefix(SOLIDITY_CASE_COMMENT_MARKER))
-                );
+			.fold(String::new(), |mut buf, string| {
-            })
+				buf.push_str(string);
-            .ok()?
+				buf
-            .lines()
+			});
-            .filter_map(|line| line.strip_prefix(SOLIDITY_CASE_COMMENT_MARKER))
-            .fold(String::new(), |mut buf, string| {
-                buf.push_str(string);
-                buf
-            });
 
-        if spec.is_empty() {
+		if spec.is_empty() {
-            return None;
+			return None;
-        }
+		}
 
-        match serde_json::from_str::<Self>(&spec) {
+		match serde_json::from_str::<Self>(&spec) {
-            Ok(mut metadata) => {
+			Ok(mut metadata) => {
-                metadata.file_path = Some(path.to_path_buf());
+				metadata.file_path = Some(path.to_path_buf());
-                metadata.contracts = Some(
+				metadata.contracts = Some(
-                    [(
+					[(
-                        ContractInstance::new("Test"),
+						ContractInstance::new("Test"),
-                        ContractPathAndIdent {
+						ContractPathAndIdent {
-                            contract_source_path: path.to_path_buf(),
+							contract_source_path: path.to_path_buf(),
-                            contract_ident: ContractIdent::new("Test"),
+							contract_ident: ContractIdent::new("Test"),
-                        },
+						},
-                    )]
+					)]
-                    .into(),
+					.into(),
-                );
+				);
-                Some(metadata)
+				Some(metadata)
-            }
+			},
-            Err(error) => {
+			Err(err) => {
-                tracing::error!(
+				error!(path = %path.display(), %err, "Failed to deserialize metadata");
-                    "parsing Solidity test metadata file '{}' error: '{error}' from data: {spec}",
+				None
-                    path.display()
+			},
-                );
+		}
-                None
+	}
-            }
-        }
-    }
 
-    /// Returns an iterator over all of the solidity files that needs to be compiled for this
+	/// Returns an iterator over all of the solidity files that needs to be compiled for this
-    /// [`Metadata`] object
+	/// [`Metadata`] object
-    ///
+	///
-    /// Note: if the metadata is contained within a solidity file then this is the only file that
+	/// Note: if the metadata is contained within a solidity file then this is the only file that
-    /// we wish to compile since this is a self-contained test. Otherwise, if it's a JSON file
+	/// we wish to compile since this is a self-contained test. Otherwise, if it's a JSON file
-    /// then we need to compile all of the contracts that are in the directory since imports are
+	/// then we need to compile all of the contracts that are in the directory since imports are
-    /// allowed in there.
+	/// allowed in there.
-    pub fn files_to_compile(&self) -> anyhow::Result<Box<dyn Iterator<Item = PathBuf>>> {
+	pub fn files_to_compile(&self) -> anyhow::Result<Box<dyn Iterator<Item = PathBuf>>> {
-        let Some(ref metadata_file_path) = self.file_path else {
+		let Some(ref metadata_file_path) = self.file_path else {
-            anyhow::bail!("The metadata file path is not defined");
+			anyhow::bail!("The metadata file path is not defined");
-        };
+		};
-        if metadata_file_path
+		if metadata_file_path
-            .extension()
+			.extension()
-            .is_some_and(|extension| extension.eq_ignore_ascii_case("sol"))
+			.is_some_and(|extension| extension.eq_ignore_ascii_case("sol"))
-        {
+		{
-            Ok(Box::new(std::iter::once(metadata_file_path.clone())))
+			Ok(Box::new(std::iter::once(metadata_file_path.clone())))
-        } else {
+		} else {
-            Ok(Box::new(
+			Ok(Box::new(
-                FilesWithExtensionIterator::new(self.directory()?)
+				FilesWithExtensionIterator::new(self.directory()?)
-                    .with_allowed_extension("sol")
+					.with_allowed_extension("sol")
-                    .with_use_cached_fs(true),
+					.with_use_cached_fs(true),
-            ))
+			))
-        }
+		}
-    }
+	}
 }
 
 define_wrapper_type!(
-    /// Represents a contract instance found a metadata file.
+	/// Represents a contract instance found a metadata file.
-    ///
+	///
-    /// Typically, this is used as the key to the "contracts" field of metadata files.
+	/// Typically, this is used as the key to the "contracts" field of metadata files.
-    #[derive(
+	#[derive(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
+		Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema
-    )]
+	)]
-    #[serde(transparent)]
+	#[serde(transparent)]
-    pub struct ContractInstance(String);
+	pub struct ContractInstance(String) impl Display;
 );
 
 define_wrapper_type!(
-    /// Represents a contract identifier found a metadata file.
+	/// Represents a contract identifier found a metadata file.
-    ///
+	///
-    /// A contract identifier is the name of the contract in the source code.
+	/// A contract identifier is the name of the contract in the source code.
-    #[derive(
+	#[derive(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
+		Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema
-    )]
+	)]
-    #[serde(transparent)]
+	#[serde(transparent)]
-    pub struct ContractIdent(String);
+	pub struct ContractIdent(String) impl Display;
 );
 
 /// Represents an identifier used for contracts.
@@ -287,206 +308,186 @@ define_wrapper_type!(
 /// ```text
 /// ${path}:${contract_ident}
 /// ```
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[derive(
+	Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
 #[serde(try_from = "String", into = "String")]
 pub struct ContractPathAndIdent {
-    /// The path of the contract source code relative to the directory containing the metadata file.
+	/// The path of the contract source code relative to the directory containing the metadata
-    pub contract_source_path: PathBuf,
+	/// file.
+	pub contract_source_path: PathBuf,
 
-    /// The identifier of the contract.
+	/// The identifier of the contract.
-    pub contract_ident: ContractIdent,
+	pub contract_ident: ContractIdent,
 }
 
 impl Display for ContractPathAndIdent {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
+		write!(f, "{}:{}", self.contract_source_path.display(), self.contract_ident.as_ref())
-            f,
+	}
-            "{}:{}",
-            self.contract_source_path.display(),
-            self.contract_ident.as_ref()
-        )
-    }
 }
 
 impl FromStr for ContractPathAndIdent {
-    type Err = anyhow::Error;
+	type Err = anyhow::Error;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut splitted_string = s.split(":").peekable();
+		let mut splitted_string = s.split(":").peekable();
-        let mut path = None::<String>;
+		let mut path = None::<String>;
-        let mut identifier = None::<String>;
+		let mut identifier = None::<String>;
-        loop {
+		loop {
-            let Some(next_item) = splitted_string.next() else {
+			let Some(next_item) = splitted_string.next() else {
-                break;
+				break;
-            };
+			};
-            if splitted_string.peek().is_some() {
+			if splitted_string.peek().is_some() {
-                match path {
+				match path {
-                    Some(ref mut path) => {
+					Some(ref mut path) => {
-                        path.push(':');
+						path.push(':');
-                        path.push_str(next_item);
+						path.push_str(next_item);
-                    }
+					},
-                    None => path = Some(next_item.to_owned()),
+					None => path = Some(next_item.to_owned()),
-                }
+				}
-            } else {
+			} else {
-                identifier = Some(next_item.to_owned())
+				identifier = Some(next_item.to_owned())
-            }
+			}
-        }
+		}
-        match (path, identifier) {
+		match (path, identifier) {
-            (Some(path), Some(identifier)) => Ok(Self {
+			(Some(path), Some(identifier)) => Ok(Self {
-                contract_source_path: PathBuf::from(path),
+				contract_source_path: PathBuf::from(path),
-                contract_ident: ContractIdent::new(identifier),
+				contract_ident: ContractIdent::new(identifier),
-            }),
+			}),
-            (None, Some(path)) | (Some(path), None) => {
+			(None, Some(path)) | (Some(path), None) => {
-                let Some(identifier) = path.split(".").next().map(ToOwned::to_owned) else {
+				let Some(identifier) = path.split(".").next().map(ToOwned::to_owned) else {
-                    anyhow::bail!("Failed to find identifier");
+					anyhow::bail!("Failed to find identifier");
-                };
+				};
-                Ok(Self {
+				Ok(Self {
-                    contract_source_path: PathBuf::from(path),
+					contract_source_path: PathBuf::from(path),
-                    contract_ident: ContractIdent::new(identifier),
+					contract_ident: ContractIdent::new(identifier),
-                })
+				})
-            }
+			},
-            (None, None) => anyhow::bail!("Failed to find the path and identifier"),
+			(None, None) => anyhow::bail!("Failed to find the path and identifier"),
-        }
+		}
-    }
+	}
 }
 
 impl TryFrom<String> for ContractPathAndIdent {
-    type Error = anyhow::Error;
+	type Error = anyhow::Error;
 
-    fn try_from(value: String) -> Result<Self, Self::Error> {
+	fn try_from(value: String) -> Result<Self, Self::Error> {
-        Self::from_str(&value)
+		Self::from_str(&value)
-    }
+	}
 }
 
 impl From<ContractPathAndIdent> for String {
-    fn from(value: ContractPathAndIdent) -> Self {
+	fn from(value: ContractPathAndIdent) -> Self {
-        value.to_string()
+		value.to_string()
-    }
+	}
 }
 
-/// An EVM version requirement that the test case has. This gets serialized and
+/// An EVM version requirement that the test case has. This gets serialized and deserialized from
-/// deserialized from and into [`String`].
+/// and into [`String`]. This follows a simple format of (>=|<=|=|>|<) followed by a string of the
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+/// EVM version.
+///
+/// When specified, the framework will only run the test if the node's EVM version matches that
+/// required by the metadata file.
+#[derive(
+	Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
+)]
 #[serde(try_from = "String", into = "String")]
 pub struct EvmVersionRequirement {
-    ordering: Ordering,
+	ordering: Ordering,
-    or_equal: bool,
+	or_equal: bool,
-    evm_version: EVMVersion,
+	evm_version: EVMVersion,
 }
 
 impl EvmVersionRequirement {
-    pub fn new_greater_than_or_equals(version: EVMVersion) -> Self {
+	pub fn new_greater_than_or_equals(version: EVMVersion) -> Self {
-        Self {
+		Self { ordering: Ordering::Greater, or_equal: true, evm_version: version }
-            ordering: Ordering::Greater,
+	}
-            or_equal: true,
-            evm_version: version,
-        }
-    }
 
-    pub fn new_greater_than(version: EVMVersion) -> Self {
+	pub fn new_greater_than(version: EVMVersion) -> Self {
-        Self {
+		Self { ordering: Ordering::Greater, or_equal: false, evm_version: version }
-            ordering: Ordering::Greater,
+	}
-            or_equal: false,
-            evm_version: version,
-        }
-    }
 
-    pub fn new_equals(version: EVMVersion) -> Self {
+	pub fn new_equals(version: EVMVersion) -> Self {
-        Self {
+		Self { ordering: Ordering::Equal, or_equal: false, evm_version: version }
-            ordering: Ordering::Equal,
+	}
-            or_equal: false,
-            evm_version: version,
-        }
-    }
 
-    pub fn new_less_than(version: EVMVersion) -> Self {
+	pub fn new_less_than(version: EVMVersion) -> Self {
-        Self {
+		Self { ordering: Ordering::Less, or_equal: false, evm_version: version }
-            ordering: Ordering::Less,
+	}
-            or_equal: false,
-            evm_version: version,
-        }
-    }
 
-    pub fn new_less_than_or_equals(version: EVMVersion) -> Self {
+	pub fn new_less_than_or_equals(version: EVMVersion) -> Self {
-        Self {
+		Self { ordering: Ordering::Less, or_equal: true, evm_version: version }
-            ordering: Ordering::Less,
+	}
-            or_equal: true,
-            evm_version: version,
-        }
-    }
 
-    pub fn matches(&self, other: &EVMVersion) -> bool {
+	pub fn matches(&self, other: &EVMVersion) -> bool {
-        let ordering = other.cmp(&self.evm_version);
+		let ordering = other.cmp(&self.evm_version);
-        ordering == self.ordering || (self.or_equal && matches!(ordering, Ordering::Equal))
+		ordering == self.ordering || (self.or_equal && matches!(ordering, Ordering::Equal))
-    }
+	}
 }
 
 impl Display for EvmVersionRequirement {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let Self {
+		let Self { ordering, or_equal, evm_version } = self;
-            ordering,
+		match ordering {
-            or_equal,
+			Ordering::Less => write!(f, "<")?,
-            evm_version,
+			Ordering::Equal => write!(f, "=")?,
-        } = self;
+			Ordering::Greater => write!(f, ">")?,
-        match ordering {
+		}
-            Ordering::Less => write!(f, "<")?,
+		if *or_equal && !matches!(ordering, Ordering::Equal) {
-            Ordering::Equal => write!(f, "=")?,
+			write!(f, "=")?;
-            Ordering::Greater => write!(f, ">")?,
+		}
-        }
+		write!(f, "{evm_version}")
-        if *or_equal && !matches!(ordering, Ordering::Equal) {
+	}
-            write!(f, "=")?;
-        }
-        write!(f, "{evm_version}")
-    }
 }
 
 impl FromStr for EvmVersionRequirement {
-    type Err = anyhow::Error;
+	type Err = anyhow::Error;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.as_bytes() {
+		match s.as_bytes() {
-            [b'>', b'=', remaining @ ..] => Ok(Self {
+			[b'>', b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Greater,
+				ordering: Ordering::Greater,
-                or_equal: true,
+				or_equal: true,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
+				evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
+			}),
-            [b'>', remaining @ ..] => Ok(Self {
+			[b'>', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Greater,
+				ordering: Ordering::Greater,
-                or_equal: false,
+				or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
+				evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
+			}),
-            [b'<', b'=', remaining @ ..] => Ok(Self {
+			[b'<', b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Less,
+				ordering: Ordering::Less,
-                or_equal: true,
+				or_equal: true,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
+				evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
+			}),
-            [b'<', remaining @ ..] => Ok(Self {
+			[b'<', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Less,
+				ordering: Ordering::Less,
-                or_equal: false,
+				or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
+				evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
+			}),
-            [b'=', remaining @ ..] => Ok(Self {
+			[b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Equal,
+				ordering: Ordering::Equal,
-                or_equal: false,
+				or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
+				evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
+			}),
-            _ => anyhow::bail!("Invalid EVM version requirement {s}"),
+			_ => anyhow::bail!("Invalid EVM version requirement {s}"),
-        }
+		}
-    }
+	}
 }
 
 impl TryFrom<String> for EvmVersionRequirement {
-    type Error = anyhow::Error;
+	type Error = anyhow::Error;
 
-    fn try_from(value: String) -> Result<Self, Self::Error> {
+	fn try_from(value: String) -> Result<Self, Self::Error> {
-        value.parse()
+		value.parse()
-    }
+	}
 }
 
 impl From<EvmVersionRequirement> for String {
-    fn from(value: EvmVersionRequirement) -> Self {
+	fn from(value: EvmVersionRequirement) -> Self {
-        value.to_string()
+		value.to_string()
-    }
+	}
 }
 
 /// A set of compilation directives that will be passed to the compiler whenever the contracts for
@@ -494,62 +495,85 @@ impl From<EvmVersionRequirement> for String {
 /// just a filter for when a test can run whereas this is an instruction to the compiler.
 /// Defines how the compiler should handle revert strings.
 #[derive(
-    Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize, Deserialize,
+	Clone,
+	Debug,
+	Copy,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Default,
+	Serialize,
+	Deserialize,
+	JsonSchema,
 )]
 pub struct CompilationDirectives {
-    /// Defines how the revert strings should be handled.
+	/// Defines how the revert strings should be handled.
-    pub revert_string_handling: Option<RevertString>,
+	pub revert_string_handling: Option<RevertString>,
 }
 
 /// Defines how the compiler should handle revert strings.
 #[derive(
-    Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize, Deserialize,
+	Clone,
+	Debug,
+	Copy,
+	PartialEq,
+	Eq,
+	PartialOrd,
+	Ord,
+	Hash,
+	Default,
+	Serialize,
+	Deserialize,
+	JsonSchema,
 )]
 #[serde(rename_all = "camelCase")]
 pub enum RevertString {
-    #[default]
+	/// The default handling of the revert strings.
-    Default,
+	#[default]
-    Debug,
+	Default,
-    Strip,
+	/// The debug handling of the revert strings.
-    VerboseDebug,
+	Debug,
+	/// Strip the revert strings.
+	Strip,
+	/// Provide verbose debug strings for the revert string.
+	VerboseDebug,
 }
 
 #[cfg(test)]
 mod test {
-    use super::*;
+	use super::*;
 
-    #[test]
+	#[test]
-    fn contract_identifier_respects_roundtrip_property() {
+	fn contract_identifier_respects_roundtrip_property() {
-        // Arrange
+		// Arrange
-        let string = "ERC20/ERC20.sol:ERC20";
+		let string = "ERC20/ERC20.sol:ERC20";
 
-        // Act
+		// Act
-        let identifier = ContractPathAndIdent::from_str(string);
+		let identifier = ContractPathAndIdent::from_str(string);
 
-        // Assert
+		// Assert
-        let identifier = identifier.expect("Failed to parse");
+		let identifier = identifier.expect("Failed to parse");
-        assert_eq!(
+		assert_eq!(identifier.contract_source_path.display().to_string(), "ERC20/ERC20.sol");
-            identifier.contract_source_path.display().to_string(),
+		assert_eq!(identifier.contract_ident, "ERC20".to_owned().into());
-            "ERC20/ERC20.sol"
-        );
-        assert_eq!(identifier.contract_ident, "ERC20".to_owned().into());
 
-        // Act
+		// Act
-        let reserialized = identifier.to_string();
+		let reserialized = identifier.to_string();
 
-        // Assert
+		// Assert
-        assert_eq!(string, reserialized);
+		assert_eq!(string, reserialized);
-    }
+	}
 
-    #[test]
+	#[test]
-    fn complex_metadata_file_can_be_deserialized() {
+	fn complex_metadata_file_can_be_deserialized() {
-        // Arrange
+		// Arrange
-        const JSON: &str = include_str!("../../../assets/test_metadata.json");
+		const JSON: &str = include_str!("../../../assets/test_metadata.json");
 
-        // Act
+		// Act
-        let metadata = serde_json::from_str::<Metadata>(JSON);
+		let metadata = serde_json::from_str::<Metadata>(JSON);
 
-        // Assert
+		// Assert
-        metadata.expect("Failed to deserialize metadata");
+		metadata.expect("Failed to deserialize metadata");
-    }
+	}
 }

crates/format/src/mode.rs

@@ -1,10 +1,12 @@
+use anyhow::Context as _;
 use regex::Regex;
-use revive_dt_common::types::{Mode, ModeOptimizerSetting, ModePipeline};
+use revive_dt_common::{
+	iterators::EitherIter,
+	types::{Mode, ModeOptimizerSetting, ModePipeline},
+};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
+use std::{collections::HashSet, fmt::Display, str::FromStr, sync::LazyLock};
-use std::fmt::Display;
-use std::str::FromStr;
-use std::sync::LazyLock;
 
 /// This represents a mode that has been parsed from test metadata.
 ///
@@ -15,20 +17,20 @@ use std::sync::LazyLock;
 /// ```
 ///
 /// We can parse valid mode strings into [`ParsedMode`] using [`ParsedMode::from_str`].
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema)]
 #[serde(try_from = "String", into = "String")]
 pub struct ParsedMode {
-    pub pipeline: Option<ModePipeline>,
+	pub pipeline: Option<ModePipeline>,
-    pub optimize_flag: Option<bool>,
+	pub optimize_flag: Option<bool>,
-    pub optimize_setting: Option<ModeOptimizerSetting>,
+	pub optimize_setting: Option<ModeOptimizerSetting>,
-    pub version: Option<semver::VersionReq>,
+	pub version: Option<semver::VersionReq>,
 }
 
 impl FromStr for ParsedMode {
-    type Err = anyhow::Error;
+	type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
-        static REGEX: LazyLock<Regex> = LazyLock::new(|| {
+		static REGEX: LazyLock<Regex> = LazyLock::new(|| {
-            Regex::new(r"(?x)
+			Regex::new(r"(?x)
                 ^
                 (?:(?P<pipeline>[YEILV])(?P<optimize_flag>[+-])?)? # Pipeline to use eg Y, E+, E-
                 \s*
@@ -37,226 +39,204 @@ impl FromStr for ParsedMode {
                 (?P<version>[>=<]*\d+(?:\.\d+)*)?                  # Optional semver version eg >=0.8.0, 0.7, <0.8
                 $
             ").unwrap()
-        });
+		});
 
-        let Some(caps) = REGEX.captures(s) else {
+		let Some(caps) = REGEX.captures(s) else {
-            anyhow::bail!("Cannot parse mode '{s}' from string");
+			anyhow::bail!("Cannot parse mode '{s}' from string");
-        };
+		};
 
-        let pipeline = match caps.name("pipeline") {
+		let pipeline = match caps.name("pipeline") {
-            Some(m) => Some(ModePipeline::from_str(m.as_str())?),
+			Some(m) => Some(
-            None => None,
+				ModePipeline::from_str(m.as_str())
-        };
+					.context("Failed to parse mode pipeline from string")?,
+			),
+			None => None,
+		};
 
-        let optimize_flag = caps.name("optimize_flag").map(|m| m.as_str() == "+");
+		let optimize_flag = caps.name("optimize_flag").map(|m| m.as_str() == "+");
 
-        let optimize_setting = match caps.name("optimize_setting") {
+		let optimize_setting = match caps.name("optimize_setting") {
-            Some(m) => Some(ModeOptimizerSetting::from_str(m.as_str())?),
+			Some(m) => Some(
-            None => None,
+				ModeOptimizerSetting::from_str(m.as_str())
-        };
+					.context("Failed to parse optimizer setting from string")?,
+			),
+			None => None,
+		};
 
-        let version = match caps.name("version") {
+		let version = match caps.name("version") {
-            Some(m) => Some(semver::VersionReq::parse(m.as_str()).map_err(|e| {
+			Some(m) => Some(
-                anyhow::anyhow!("Cannot parse the version requirement '{}': {e}", m.as_str())
+				semver::VersionReq::parse(m.as_str())
-            })?),
+					.map_err(|e| {
-            None => None,
+						anyhow::anyhow!(
-        };
+							"Cannot parse the version requirement '{}': {e}",
+							m.as_str()
+						)
+					})
+					.context("Failed to parse semver requirement from mode string")?,
+			),
+			None => None,
+		};
 
-        Ok(ParsedMode {
+		Ok(ParsedMode { pipeline, optimize_flag, optimize_setting, version })
-            pipeline,
+	}
-            optimize_flag,
-            optimize_setting,
-            version,
-        })
-    }
 }
 
 impl Display for ParsedMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut has_written = false;
+		let mut has_written = false;
 
-        if let Some(pipeline) = self.pipeline {
+		if let Some(pipeline) = self.pipeline {
-            pipeline.fmt(f)?;
+			pipeline.fmt(f)?;
-            if let Some(optimize_flag) = self.optimize_flag {
+			if let Some(optimize_flag) = self.optimize_flag {
-                f.write_str(if optimize_flag { "+" } else { "-" })?;
+				f.write_str(if optimize_flag { "+" } else { "-" })?;
-            }
+			}
-            has_written = true;
+			has_written = true;
-        }
+		}
 
-        if let Some(optimize_setting) = self.optimize_setting {
+		if let Some(optimize_setting) = self.optimize_setting {
-            if has_written {
+			if has_written {
-                f.write_str(" ")?;
+				f.write_str(" ")?;
-            }
+			}
-            optimize_setting.fmt(f)?;
+			optimize_setting.fmt(f)?;
-            has_written = true;
+			has_written = true;
-        }
+		}
 
-        if let Some(version) = &self.version {
+		if let Some(version) = &self.version {
-            if has_written {
+			if has_written {
-                f.write_str(" ")?;
+				f.write_str(" ")?;
-            }
+			}
-            version.fmt(f)?;
+			version.fmt(f)?;
-        }
+		}
 
-        Ok(())
+		Ok(())
-    }
+	}
 }
 
 impl From<ParsedMode> for String {
-    fn from(parsed_mode: ParsedMode) -> Self {
+	fn from(parsed_mode: ParsedMode) -> Self {
-        parsed_mode.to_string()
+		parsed_mode.to_string()
-    }
+	}
 }
 
 impl TryFrom<String> for ParsedMode {
-    type Error = anyhow::Error;
+	type Error = anyhow::Error;
-    fn try_from(value: String) -> Result<Self, Self::Error> {
+	fn try_from(value: String) -> Result<Self, Self::Error> {
-        ParsedMode::from_str(&value)
+		ParsedMode::from_str(&value)
-    }
+	}
 }
 
 impl ParsedMode {
-    /// This takes a [`ParsedMode`] and expands it into a list of [`Mode`]s that we should try.
+	/// This takes a [`ParsedMode`] and expands it into a list of [`Mode`]s that we should try.
-    pub fn to_modes(&self) -> impl Iterator<Item = Mode> {
+	pub fn to_modes(&self) -> impl Iterator<Item = Mode> {
-        let pipeline_iter = self.pipeline.as_ref().map_or_else(
+		let pipeline_iter = self.pipeline.as_ref().map_or_else(
-            || EitherIter::A(ModePipeline::test_cases()),
+			|| EitherIter::A(ModePipeline::test_cases()),
-            |p| EitherIter::B(std::iter::once(*p)),
+			|p| EitherIter::B(std::iter::once(*p)),
-        );
+		);
 
-        let optimize_flag_setting = self.optimize_flag.map(|flag| {
+		let optimize_flag_setting = self
-            if flag {
+			.optimize_flag
-                ModeOptimizerSetting::M3
+			.map(|flag| if flag { ModeOptimizerSetting::M3 } else { ModeOptimizerSetting::M0 });
-            } else {
-                ModeOptimizerSetting::M0
-            }
-        });
 
-        let optimize_flag_iter = match optimize_flag_setting {
+		let optimize_flag_iter = match optimize_flag_setting {
-            Some(setting) => EitherIter::A(std::iter::once(setting)),
+			Some(setting) => EitherIter::A(std::iter::once(setting)),
-            None => EitherIter::B(ModeOptimizerSetting::test_cases()),
+			None => EitherIter::B(ModeOptimizerSetting::test_cases()),
-        };
+		};
 
-        let optimize_settings_iter = self.optimize_setting.as_ref().map_or_else(
+		let optimize_settings_iter = self.optimize_setting.as_ref().map_or_else(
-            || EitherIter::A(optimize_flag_iter),
+			|| EitherIter::A(optimize_flag_iter),
-            |s| EitherIter::B(std::iter::once(*s)),
+			|s| EitherIter::B(std::iter::once(*s)),
-        );
+		);
 
-        pipeline_iter.flat_map(move |pipeline| {
+		pipeline_iter.flat_map(move |pipeline| {
-            optimize_settings_iter
+			optimize_settings_iter.clone().map(move |optimize_setting| Mode {
-                .clone()
+				pipeline,
-                .map(move |optimize_setting| Mode {
+				optimize_setting,
-                    pipeline,
+				version: self.version.clone(),
-                    optimize_setting,
+			})
-                    version: self.version.clone(),
+		})
-                })
+	}
-        })
-    }
 
-    /// Return a set of [`Mode`]s that correspond to the given [`ParsedMode`]s.
+	/// Return a set of [`Mode`]s that correspond to the given [`ParsedMode`]s.
-    /// This avoids any duplicate entries.
+	/// This avoids any duplicate entries.
-    pub fn many_to_modes<'a>(
+	pub fn many_to_modes<'a>(
-        parsed: impl Iterator<Item = &'a ParsedMode>,
+		parsed: impl Iterator<Item = &'a ParsedMode>,
-    ) -> impl Iterator<Item = Mode> {
+	) -> impl Iterator<Item = Mode> {
-        let modes: HashSet<_> = parsed.flat_map(|p| p.to_modes()).collect();
+		let modes: HashSet<_> = parsed.flat_map(|p| p.to_modes()).collect();
-        modes.into_iter()
+		modes.into_iter()
-    }
+	}
-}
-
-/// An iterator that could be either of two iterators.
-#[derive(Clone, Debug)]
-enum EitherIter<A, B> {
-    A(A),
-    B(B),
-}
-
-impl<A, B> Iterator for EitherIter<A, B>
-where
-    A: Iterator,
-    B: Iterator<Item = A::Item>,
-{
-    type Item = A::Item;
-    fn next(&mut self) -> Option<Self::Item> {
-        match self {
-            EitherIter::A(iter) => iter.next(),
-            EitherIter::B(iter) => iter.next(),
-        }
-    }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+	use super::*;
 
-    #[test]
+	#[test]
-    fn test_parsed_mode_from_str() {
+	fn test_parsed_mode_from_str() {
-        let strings = vec![
+		let strings = vec![
-            ("Mz", "Mz"),
+			("Mz", "Mz"),
-            ("Y", "Y"),
+			("Y", "Y"),
-            ("Y+", "Y+"),
+			("Y+", "Y+"),
-            ("Y-", "Y-"),
+			("Y-", "Y-"),
-            ("E", "E"),
+			("E", "E"),
-            ("E+", "E+"),
+			("E+", "E+"),
-            ("E-", "E-"),
+			("E-", "E-"),
-            ("Y M0", "Y M0"),
+			("Y M0", "Y M0"),
-            ("Y M1", "Y M1"),
+			("Y M1", "Y M1"),
-            ("Y M2", "Y M2"),
+			("Y M2", "Y M2"),
-            ("Y M3", "Y M3"),
+			("Y M3", "Y M3"),
-            ("Y Ms", "Y Ms"),
+			("Y Ms", "Y Ms"),
-            ("Y Mz", "Y Mz"),
+			("Y Mz", "Y Mz"),
-            ("E M0", "E M0"),
+			("E M0", "E M0"),
-            ("E M1", "E M1"),
+			("E M1", "E M1"),
-            ("E M2", "E M2"),
+			("E M2", "E M2"),
-            ("E M3", "E M3"),
+			("E M3", "E M3"),
-            ("E Ms", "E Ms"),
+			("E Ms", "E Ms"),
-            ("E Mz", "E Mz"),
+			("E Mz", "E Mz"),
-            // When stringifying semver again, 0.8.0 becomes ^0.8.0 (same meaning)
+			// When stringifying semver again, 0.8.0 becomes ^0.8.0 (same meaning)
-            ("Y 0.8.0", "Y ^0.8.0"),
+			("Y 0.8.0", "Y ^0.8.0"),
-            ("E+ 0.8.0", "E+ ^0.8.0"),
+			("E+ 0.8.0", "E+ ^0.8.0"),
-            ("Y M3 >=0.8.0", "Y M3 >=0.8.0"),
+			("Y M3 >=0.8.0", "Y M3 >=0.8.0"),
-            ("E Mz <0.7.0", "E Mz <0.7.0"),
+			("E Mz <0.7.0", "E Mz <0.7.0"),
-            // We can parse +- _and_ M1/M2 but the latter takes priority.
+			// We can parse +- _and_ M1/M2 but the latter takes priority.
-            ("Y+ M1 0.8.0", "Y+ M1 ^0.8.0"),
+			("Y+ M1 0.8.0", "Y+ M1 ^0.8.0"),
-            ("E- M2 0.7.0", "E- M2 ^0.7.0"),
+			("E- M2 0.7.0", "E- M2 ^0.7.0"),
-            // We don't see this in the wild but it is parsed.
+			// We don't see this in the wild but it is parsed.
-            ("<=0.8", "<=0.8"),
+			("<=0.8", "<=0.8"),
-        ];
+		];
 
-        for (actual, expected) in strings {
+		for (actual, expected) in strings {
-            let parsed = ParsedMode::from_str(actual)
+			let parsed = ParsedMode::from_str(actual)
-                .expect(format!("Failed to parse mode string '{actual}'").as_str());
+				.unwrap_or_else(|_| panic!("Failed to parse mode string '{actual}'"));
-            assert_eq!(
+			assert_eq!(
-                expected,
+				expected,
-                parsed.to_string(),
+				parsed.to_string(),
-                "Mode string '{actual}' did not parse to '{expected}': got '{parsed}'"
+				"Mode string '{actual}' did not parse to '{expected}': got '{parsed}'"
-            );
+			);
-        }
+		}
-    }
+	}
 
-    #[test]
+	#[test]
-    fn test_parsed_mode_to_test_modes() {
+	fn test_parsed_mode_to_test_modes() {
-        let strings = vec![
+		let strings = vec![
-            ("Mz", vec!["Y Mz", "E Mz"]),
+			("Mz", vec!["Y Mz", "E Mz"]),
-            ("Y", vec!["Y M0", "Y M3"]),
+			("Y", vec!["Y M0", "Y M3"]),
-            ("E", vec!["E M0", "E M3"]),
+			("E", vec!["E M0", "E M3"]),
-            ("Y+", vec!["Y M3"]),
+			("Y+", vec!["Y M3"]),
-            ("Y-", vec!["Y M0"]),
+			("Y-", vec!["Y M0"]),
-            ("Y <=0.8", vec!["Y M0 <=0.8", "Y M3 <=0.8"]),
+			("Y <=0.8", vec!["Y M0 <=0.8", "Y M3 <=0.8"]),
-            (
+			("<=0.8", vec!["Y M0 <=0.8", "Y M3 <=0.8", "E M0 <=0.8", "E M3 <=0.8"]),
-                "<=0.8",
+		];
-                vec!["Y M0 <=0.8", "Y M3 <=0.8", "E M0 <=0.8", "E M3 <=0.8"],
-            ),
-        ];
 
-        for (actual, expected) in strings {
+		for (actual, expected) in strings {
-            let parsed = ParsedMode::from_str(actual)
+			let parsed = ParsedMode::from_str(actual)
-                .expect(format!("Failed to parse mode string '{actual}'").as_str());
+				.unwrap_or_else(|_| panic!("Failed to parse mode string '{actual}'"));
-            let expected_set: HashSet<_> = expected.into_iter().map(|s| s.to_owned()).collect();
+			let expected_set: HashSet<_> = expected.into_iter().map(|s| s.to_owned()).collect();
-            let actual_set: HashSet<_> = parsed.to_modes().map(|m| m.to_string()).collect();
+			let actual_set: HashSet<_> = parsed.to_modes().map(|m| m.to_string()).collect();
 
-            assert_eq!(
+			assert_eq!(
-                expected_set, actual_set,
+				expected_set, actual_set,
-                "Mode string '{actual}' did not expand to '{expected_set:?}': got '{actual_set:?}'"
+				"Mode string '{actual}' did not expand to '{expected_set:?}': got '{actual_set:?}'"
-            );
+			);
-        }
+		}
-    }
+	}
 }

crates/format/src/traits.rs

@@ -1,150 +1,175 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, pin::Pin};
 
-use alloy::eips::BlockNumberOrTag;
+use alloy::{
-use alloy::json_abi::JsonAbi;
+	eips::BlockNumberOrTag,
-use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
+	json_abi::JsonAbi,
-use alloy_primitives::TxHash;
+	primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, TxHash, U256},
+};
 use anyhow::Result;
 
-use crate::metadata::ContractInstance;
+use crate::metadata::{ContractIdent, ContractInstance};
 
 /// A trait of the interface are required to implement to be used by the resolution logic that this
 /// crate implements to go from string calldata and into the bytes calldata.
 pub trait ResolverApi {
-    /// Returns the ID of the chain that the node is on.
+	/// Returns the ID of the chain that the node is on.
-    fn chain_id(&self) -> impl Future<Output = Result<ChainId>>;
+	fn chain_id(&self) -> Pin<Box<dyn Future<Output = Result<ChainId>> + '_>>;
 
-    /// Returns the gas price for the specified transaction.
+	/// Returns the gas price for the specified transaction.
-    fn transaction_gas_price(&self, tx_hash: &TxHash) -> impl Future<Output = Result<u128>>;
+	fn transaction_gas_price(
+		&self,
+		tx_hash: TxHash,
+	) -> Pin<Box<dyn Future<Output = Result<u128>> + '_>>;
 
-    // TODO: This is currently a u128 due to Kitchensink needing more than 64 bits for its gas limit
+	// TODO: This is currently a u128 due to substrate 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.
+	// 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.
+	/// Returns the gas limit of the specified block.
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u128>>;
+	fn block_gas_limit(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = Result<u128>> + '_>>;
 
-    /// Returns the coinbase of the specified block.
+	/// Returns the coinbase of the specified block.
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<Address>>;
+	fn block_coinbase(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = Result<Address>> + '_>>;
 
-    /// Returns the difficulty of the specified block.
+	/// Returns the difficulty of the specified block.
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<U256>>;
+	fn block_difficulty(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = Result<U256>> + '_>>;
 
-    /// Returns the base fee of the specified block.
+	/// Returns the base fee of the specified block.
-    fn block_base_fee(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u64>>;
+	fn block_base_fee(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = Result<u64>> + '_>>;
 
-    /// Returns the hash of the specified block.
+	/// Returns the hash of the specified block.
-    fn block_hash(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<BlockHash>>;
+	fn block_hash(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = Result<BlockHash>> + '_>>;
 
-    /// Returns the timestamp of the specified block,
+	/// Returns the timestamp of the specified block,
-    fn block_timestamp(
+	fn block_timestamp(
-        &self,
+		&self,
-        number: BlockNumberOrTag,
+		number: BlockNumberOrTag,
-    ) -> impl Future<Output = Result<BlockTimestamp>>;
+	) -> Pin<Box<dyn Future<Output = Result<BlockTimestamp>> + '_>>;
 
-    /// Returns the number of the last block.
+	/// Returns the number of the last block.
-    fn last_block_number(&self) -> impl Future<Output = Result<BlockNumber>>;
+	fn last_block_number(&self) -> Pin<Box<dyn Future<Output = Result<BlockNumber>> + '_>>;
 }
 
 #[derive(Clone, Copy, Debug, Default)]
 /// Contextual information required by the code that's performing the resolution.
 pub struct ResolutionContext<'a> {
-    /// When provided the contracts provided here will be used for resolutions.
+	/// When provided the contracts provided here will be used for resolutions.
-    deployed_contracts: Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>,
+	deployed_contracts: Option<&'a HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
 
-    /// When provided the variables in here will be used for performing resolutions.
+	/// When provided the variables in here will be used for performing resolutions.
-    variables: Option<&'a HashMap<String, U256>>,
+	variables: Option<&'a HashMap<String, U256>>,
 
-    /// When provided this block number will be treated as the tip of the chain.
+	/// When provided this block number will be treated as the tip of the chain.
-    block_number: Option<&'a BlockNumber>,
+	block_number: Option<&'a BlockNumber>,
 
-    /// When provided the resolver will use this transaction hash for all of its resolutions.
+	/// When provided the resolver will use this transaction hash for all of its resolutions.
-    transaction_hash: Option<&'a TxHash>,
+	transaction_hash: Option<&'a TxHash>,
 }
 
 impl<'a> ResolutionContext<'a> {
-    pub fn new() -> Self {
+	pub fn new() -> Self {
-        Default::default()
+		Default::default()
-    }
+	}
 
-    pub fn new_from_parts(
+	pub fn new_from_parts(
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
+		deployed_contracts: impl Into<
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
+			Option<&'a HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
-        block_number: impl Into<Option<&'a BlockNumber>>,
+		>,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
+		variables: impl Into<Option<&'a HashMap<String, U256>>>,
-    ) -> Self {
+		block_number: impl Into<Option<&'a BlockNumber>>,
-        Self {
+		transaction_hash: impl Into<Option<&'a TxHash>>,
-            deployed_contracts: deployed_contracts.into(),
+	) -> Self {
-            variables: variables.into(),
+		Self {
-            block_number: block_number.into(),
+			deployed_contracts: deployed_contracts.into(),
-            transaction_hash: transaction_hash.into(),
+			variables: variables.into(),
-        }
+			block_number: block_number.into(),
-    }
+			transaction_hash: transaction_hash.into(),
+		}
+	}
 
-    pub fn with_deployed_contracts(
+	pub fn with_deployed_contracts(
-        mut self,
+		mut self,
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
+		deployed_contracts: impl Into<
-    ) -> Self {
+			Option<&'a HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
-        self.deployed_contracts = deployed_contracts.into();
+		>,
-        self
+	) -> Self {
-    }
+		self.deployed_contracts = deployed_contracts.into();
+		self
+	}
 
-    pub fn with_variables(
+	pub fn with_variables(
-        mut self,
+		mut self,
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
+		variables: impl Into<Option<&'a HashMap<String, U256>>>,
-    ) -> Self {
+	) -> Self {
-        self.variables = variables.into();
+		self.variables = variables.into();
-        self
+		self
-    }
+	}
 
-    pub fn with_block_number(mut self, block_number: impl Into<Option<&'a BlockNumber>>) -> Self {
+	pub fn with_block_number(mut self, block_number: impl Into<Option<&'a BlockNumber>>) -> Self {
-        self.block_number = block_number.into();
+		self.block_number = block_number.into();
-        self
+		self
-    }
+	}
 
-    pub fn with_transaction_hash(
+	pub fn with_transaction_hash(
-        mut self,
+		mut self,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
+		transaction_hash: impl Into<Option<&'a TxHash>>,
-    ) -> Self {
+	) -> Self {
-        self.transaction_hash = transaction_hash.into();
+		self.transaction_hash = transaction_hash.into();
-        self
+		self
-    }
+	}
 
-    pub fn resolve_block_number(&self, number: BlockNumberOrTag) -> BlockNumberOrTag {
+	pub fn resolve_block_number(&self, number: BlockNumberOrTag) -> BlockNumberOrTag {
-        match self.block_number {
+		match self.block_number {
-            Some(block_number) => match number {
+			Some(block_number) => match number {
-                BlockNumberOrTag::Latest => BlockNumberOrTag::Number(*block_number),
+				BlockNumberOrTag::Latest => BlockNumberOrTag::Number(*block_number),
-                n @ (BlockNumberOrTag::Finalized
+				n @ (BlockNumberOrTag::Finalized |
-                | BlockNumberOrTag::Safe
+				BlockNumberOrTag::Safe |
-                | BlockNumberOrTag::Earliest
+				BlockNumberOrTag::Earliest |
-                | BlockNumberOrTag::Pending
+				BlockNumberOrTag::Pending |
-                | BlockNumberOrTag::Number(_)) => n,
+				BlockNumberOrTag::Number(_)) => n,
-            },
+			},
-            None => number,
+			None => number,
-        }
+		}
-    }
+	}
 
-    pub fn deployed_contract(&self, instance: &ContractInstance) -> Option<&(Address, JsonAbi)> {
+	pub fn deployed_contract(
-        self.deployed_contracts
+		&self,
-            .and_then(|deployed_contracts| deployed_contracts.get(instance))
+		instance: &ContractInstance,
-    }
+	) -> Option<&(ContractIdent, Address, JsonAbi)> {
+		self.deployed_contracts
+			.and_then(|deployed_contracts| deployed_contracts.get(instance))
+	}
 
-    pub fn deployed_contract_address(&self, instance: &ContractInstance) -> Option<&Address> {
+	pub fn deployed_contract_address(&self, instance: &ContractInstance) -> Option<&Address> {
-        self.deployed_contract(instance).map(|(a, _)| a)
+		self.deployed_contract(instance).map(|(_, a, _)| a)
-    }
+	}
 
-    pub fn deployed_contract_abi(&self, instance: &ContractInstance) -> Option<&JsonAbi> {
+	pub fn deployed_contract_abi(&self, instance: &ContractInstance) -> Option<&JsonAbi> {
-        self.deployed_contract(instance).map(|(_, a)| a)
+		self.deployed_contract(instance).map(|(_, _, a)| a)
-    }
+	}
 
-    pub fn variable(&self, name: impl AsRef<str>) -> Option<&U256> {
+	pub fn variable(&self, name: impl AsRef<str>) -> Option<&U256> {
-        self.variables
+		self.variables.and_then(|variables| variables.get(name.as_ref()))
-            .and_then(|variables| variables.get(name.as_ref()))
+	}
-    }
 
-    pub fn tip_block_number(&self) -> Option<&'a BlockNumber> {
+	pub fn tip_block_number(&self) -> Option<&'a BlockNumber> {
-        self.block_number
+		self.block_number
-    }
+	}
 
-    pub fn transaction_hash(&self) -> Option<&'a TxHash> {
+	pub fn transaction_hash(&self) -> Option<&'a TxHash> {
-        self.transaction_hash
+		self.transaction_hash
-    }
+	}
 }

crates/ml-test-runner/Cargo.toml

@@ -0,0 +1,34 @@
+[package]
+name = "ml-test-runner"
+description = "ML-based test runner for executing differential tests file by file"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+
+[[bin]]
+name = "ml-test-runner"
+path = "src/main.rs"
+
+[dependencies]
+revive-dt-common = { workspace = true }
+revive-dt-compiler = { workspace = true }
+revive-dt-config = { workspace = true }
+revive-dt-core = { workspace = true }
+revive-dt-format = { workspace = true }
+revive-dt-node = { workspace = true }
+revive-dt-node-interaction = { workspace = true }
+revive-dt-report = { workspace = true }
+
+alloy = { workspace = true }
+anyhow = { workspace = true }
+clap = { workspace = true }
+tokio = { workspace = true }
+temp-dir = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+[lints]
+workspace = true

crates/ml-test-runner/README.md

@@ -0,0 +1,74 @@
+# ML Test Runner
+
+A test runner for executing Revive differential tests file-by-file with cargo-test-style output.
+
+This is similar to the `retester` binary but designed for ML-based test execution with a focus on:
+- Running tests file-by-file (rather than in bulk)
+- Caching passed tests to skip them in future runs
+- Providing cargo-test-style output for easy integration with ML pipelines
+- Single platform testing (rather than differential testing)
+
+## Features
+
+- **File-by-file execution**: Run tests on individual `.sol` files, corpus files (`.json`), or recursively walk directories
+- **Cached results**: Skip tests that have already passed using `--cached-passed`
+- **Fail fast**: Stop on first failure with `--bail`
+- **Cargo-like output**: Familiar test output format with colored pass/fail indicators
+- **Platform support**: Test against `geth` or `kitchensink` platforms
+
+## Usage
+
+```bash
+# Run a single .sol file (compile-only mode, default)
+./ml-test-runner path/to/test.sol --platform geth
+
+# Run all tests in a corpus file
+./ml-test-runner path/to/corpus.json --platform kitchensink
+
+# Walk a directory recursively for .sol files
+./ml-test-runner path/to/tests/ --platform geth
+
+# Use cached results and bail on first failure
+./ml-test-runner path/to/tests/ --cached-passed ./cache.txt --bail
+
+# Start the platform and execute tests (full mode)
+./ml-test-runner path/to/tests/ --platform geth --start-platform
+
+# Enable verbose logging (info, debug, or trace level)
+RUST_LOG=info ./ml-test-runner path/to/tests/
+RUST_LOG=debug ./ml-test-runner path/to/tests/ --start-platform
+RUST_LOG=trace ./ml-test-runner path/to/tests/ --start-platform
+```
+
+## Arguments
+
+- `<PATH>` - Path to test file (`.sol`), corpus file (`.json`), or folder of `.sol` files
+- `--cached-passed <FILE>` - File to track tests that have already passed
+- `--bail` - Stop after the first file failure
+- `--platform <PLATFORM>` - Platform to test against (`geth`, `kitchensink`, or `zombienet`, default: `geth`)
+- `--start-platform` - Start the platform and execute tests (default: `false`, compile-only mode)
+
+## Output Format
+
+The runner produces cargo-test-style output:
+
+```
+test path/to/test1.sol ... ok
+test path/to/test2.sol ... FAILED
+test path/to/test3.sol ... cached
+
+failures:
+
+---- path/to/test2.sol ----
+Error: ...
+
+test result: FAILED. 1 passed; 1 failed; 1 cached; finished in 2.34s
+```
+
+## Building
+
+```bash
+cargo build --release -p ml-test-runner
+```
+
+The binary will be available at `target/release/ml-test-runner`.

crates/ml-test-runner/src/main.rs

@@ -0,0 +1,639 @@
+use anyhow::Context;
+use clap::Parser;
+use revive_dt_common::{
+	iterators::FilesWithExtensionIterator,
+	types::{PlatformIdentifier, PrivateKeyAllocator},
+};
+use revive_dt_config::TestExecutionContext;
+use revive_dt_core::{
+	CachedCompiler, Platform,
+	helpers::{TestDefinition, TestPlatformInformation},
+};
+use revive_dt_format::{
+	case::CaseIdx,
+	corpus::Corpus,
+	metadata::{Metadata, MetadataFile},
+};
+use std::{
+	borrow::Cow,
+	collections::{BTreeMap, HashSet},
+	fs::File,
+	io::{BufRead, BufReader, BufWriter, Write},
+	path::{Path, PathBuf},
+	sync::Arc,
+	time::{Duration, Instant},
+};
+use temp_dir::TempDir;
+use tokio::sync::Mutex;
+use tracing::info;
+use tracing_subscriber::{EnvFilter, FmtSubscriber};
+
+/// ML-based test runner for executing differential tests file by file
+#[derive(Debug, Parser)]
+#[command(name = "ml-test-runner")]
+struct MlTestRunnerArgs {
+	/// Path to test file (.sol), corpus file (.json), or folder containing .sol files
+	#[arg(value_name = "PATH")]
+	path: PathBuf,
+
+	/// File to cache tests that have already passed
+	#[arg(long = "cached-passed")]
+	cached_passed: Option<PathBuf>,
+
+	/// File to store tests that have failed (defaults to .<platform>-failed)
+	#[arg(long = "cached-failed")]
+	cached_failed: Option<PathBuf>,
+
+	/// Stop after the first file failure
+	#[arg(long = "bail")]
+	bail: bool,
+
+	/// Platform to test against (e.g., geth-evm-solc, kitchensink-polkavm-resolc)
+	#[arg(long = "platform", default_value = "geth-evm-solc")]
+	platform: PlatformIdentifier,
+
+	/// Start the platform and wait for RPC readiness
+	#[arg(long = "start-platform", default_value = "false")]
+	start_platform: bool,
+
+	/// Private key to use for wallet initialization (hex string with or without 0x prefix)
+	#[arg(
+		long = "private-key",
+		default_value = "0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133"
+	)]
+	private_key: String,
+
+	/// RPC port to connect to when using existing node
+	#[arg(long = "rpc-port", default_value = "8545")]
+	rpc_port: u16,
+
+	/// Show verbose output including cached tests and detailed error messages
+	#[arg(long = "verbose", short = 'v')]
+	verbose: bool,
+}
+
+fn main() -> anyhow::Result<()> {
+	let args = MlTestRunnerArgs::parse();
+
+	// Only set up tracing if RUST_LOG is explicitly set or --verbose is passed
+	if std::env::var("RUST_LOG").is_ok() || args.verbose {
+		let subscriber = FmtSubscriber::builder()
+			.with_env_filter(EnvFilter::from_default_env())
+			.with_writer(std::io::stderr)
+			.finish();
+		tracing::subscriber::set_global_default(subscriber)
+			.expect("Failed to set tracing subscriber");
+	}
+
+	info!("ML test runner starting");
+	info!("Platform: {:?}", args.platform);
+	info!("Start platform: {}", args.start_platform);
+
+	tokio::runtime::Builder::new_multi_thread()
+		.enable_all()
+		.build()
+		.expect("Failed building the Runtime")
+		.block_on(run(args))
+}
+
+/// Wait for HTTP server to be ready by attempting to connect to the specified port
+async fn wait_for_http_server(port: u16) -> anyhow::Result<()> {
+	const MAX_RETRIES: u32 = 60;
+	const RETRY_DELAY: Duration = Duration::from_secs(1);
+
+	for attempt in 1..=MAX_RETRIES {
+		match tokio::net::TcpStream::connect(format!("127.0.0.1:{}", port)).await {
+			Ok(_) => {
+				info!("Successfully connected to HTTP server on port {} (attempt {})", port, attempt);
+				return Ok(());
+			},
+			Err(e) => {
+				if attempt == MAX_RETRIES {
+					anyhow::bail!(
+						"Failed to connect to HTTP server on port {} after {} attempts: {}",
+						port,
+						MAX_RETRIES,
+						e
+					);
+				}
+				if attempt % 10 == 0 {
+					info!(
+						"Still waiting for HTTP server on port {} (attempt {}/{})",
+						port, attempt, MAX_RETRIES
+					);
+				}
+				tokio::time::sleep(RETRY_DELAY).await;
+			},
+		}
+	}
+
+	unreachable!()
+}
+
+async fn run(args: MlTestRunnerArgs) -> anyhow::Result<()> {
+	let start_time = Instant::now();
+
+	info!("Discovering test files from: {}", args.path.display());
+	let test_files = discover_test_files(&args.path)?;
+	info!("Found {} test file(s)", test_files.len());
+
+	let cached_passed = if let Some(cache_file) = &args.cached_passed {
+		let cached = load_cached_passed(cache_file)?;
+		info!("Loaded {} cached passed test(s)", cached.len());
+		cached
+	} else {
+		HashSet::new()
+	};
+
+	let cached_passed = Arc::new(Mutex::new(cached_passed));
+
+	// Set up cached-failed file (defaults to .<platform>-failed)
+	let cached_failed_path = args
+		.cached_failed
+		.clone()
+		.unwrap_or_else(|| PathBuf::from(format!(".{:?}-failed", args.platform)));
+
+	let cached_failed = Arc::new(Mutex::new(HashSet::<String>::new()));
+
+	// Get the platform based on CLI args
+	let platform: &dyn Platform = match args.platform {
+		PlatformIdentifier::GethEvmSolc => &revive_dt_core::GethEvmSolcPlatform,
+		PlatformIdentifier::LighthouseGethEvmSolc => &revive_dt_core::LighthouseGethEvmSolcPlatform,
+		PlatformIdentifier::KitchensinkPolkavmResolc =>
+			&revive_dt_core::KitchensinkPolkavmResolcPlatform,
+		PlatformIdentifier::KitchensinkRevmSolc => &revive_dt_core::KitchensinkRevmSolcPlatform,
+		PlatformIdentifier::ReviveDevNodePolkavmResolc =>
+			&revive_dt_core::ReviveDevNodePolkavmResolcPlatform,
+		PlatformIdentifier::ReviveDevNodeRevmSolc => &revive_dt_core::ReviveDevNodeRevmSolcPlatform,
+		PlatformIdentifier::ZombienetPolkavmResolc =>
+			&revive_dt_core::ZombienetPolkavmResolcPlatform,
+		PlatformIdentifier::ZombienetRevmSolc => &revive_dt_core::ZombienetRevmSolcPlatform,
+	};
+
+	let test_context = TestExecutionContext::default();
+	let context = revive_dt_config::Context::Test(Box::new(test_context));
+
+	let node: &'static dyn revive_dt_node_interaction::EthereumNode = if args.start_platform {
+		info!("Starting blockchain node...");
+		let node_handle =
+			platform.new_node(context.clone()).context("Failed to spawn node thread")?;
+
+		info!("Waiting for node to start...");
+		let node = node_handle
+			.join()
+			.map_err(|e| anyhow::anyhow!("Node thread panicked: {:?}", e))?
+			.context("Failed to start node")?;
+
+		info!("Node started with ID: {}, connection: {}", node.id(), node.connection_string());
+		let node = Box::leak(node);
+
+		info!("Running pre-transactions...");
+		node.pre_transactions().await.context("Failed to run pre-transactions")?;
+		info!("Pre-transactions completed");
+
+		node
+	} else {
+		info!("Using existing node at port {}", args.rpc_port);
+
+		// Wait for the HTTP server to be ready
+		info!("Waiting for HTTP server to be ready on port {}...", args.rpc_port);
+		wait_for_http_server(args.rpc_port).await?;
+		info!("HTTP server is ready");
+
+		let existing_node: Box<dyn revive_dt_node_interaction::EthereumNode> = match args.platform {
+			PlatformIdentifier::GethEvmSolc | PlatformIdentifier::LighthouseGethEvmSolc =>
+				Box::new(
+					revive_dt_node::node_implementations::geth::GethNode::new_existing(
+						&args.private_key,
+						args.rpc_port,
+					)
+					.await?,
+				),
+			PlatformIdentifier::KitchensinkPolkavmResolc |
+			PlatformIdentifier::KitchensinkRevmSolc |
+			PlatformIdentifier::ReviveDevNodePolkavmResolc |
+			PlatformIdentifier::ReviveDevNodeRevmSolc |
+			PlatformIdentifier::ZombienetPolkavmResolc |
+			PlatformIdentifier::ZombienetRevmSolc => Box::new(
+				revive_dt_node::node_implementations::substrate::SubstrateNode::new_existing(
+					&args.private_key,
+					args.rpc_port,
+				)
+				.await?,
+			),
+		};
+		Box::leak(existing_node)
+	};
+
+	let mut passed_files = 0;
+	let mut failed_files = 0;
+	let mut skipped_files = 0;
+	let mut failures = Vec::new();
+
+	const GREEN: &str = "\x1B[32m";
+	const RED: &str = "\x1B[31m";
+	const YELLOW: &str = "\x1B[33m";
+	const COLOUR_RESET: &str = "\x1B[0m";
+	const BOLD: &str = "\x1B[1m";
+	const BOLD_RESET: &str = "\x1B[22m";
+
+	for test_file in test_files {
+		let file_display = test_file.display().to_string();
+
+		info!("\n\n == Executing test file: {file_display} == \n\n");
+		// Check if already passed
+		{
+			let cache = cached_passed.lock().await;
+			if cache.contains(&file_display) {
+				if args.verbose {
+					println!("test {file_display} ... {YELLOW}cached{COLOUR_RESET}");
+				}
+				skipped_files += 1;
+				continue;
+			}
+		}
+
+		info!("Loading metadata from: {}", test_file.display());
+		let metadata_file = match load_metadata_file(&test_file) {
+			Ok(mf) => {
+				info!("Loaded metadata with {} case(s)", mf.cases.len());
+				mf
+			},
+			Err(e) => {
+				// Skip files without metadata instead of treating them as failures
+				info!("Skipping {} (no metadata): {}", file_display, e);
+				skipped_files += 1;
+				continue;
+			},
+		};
+
+		// Execute test with 10 second timeout
+		let test_result = tokio::time::timeout(
+			Duration::from_secs(20),
+			execute_test_file(&metadata_file, platform, node, &context),
+		)
+		.await;
+
+		let result = match test_result {
+			Ok(Ok(_)) => Ok(()),
+			Ok(Err(e)) => Err(e),
+			Err(_) => Err(anyhow::anyhow!("Test timed out after 20 seconds")),
+		};
+
+		match result {
+			Ok(_) => {
+				println!("test {file_display} ... {GREEN}ok{COLOUR_RESET}");
+				passed_files += 1;
+
+				// Update cache
+				if let Some(cache_file) = &args.cached_passed {
+					let mut cache = cached_passed.lock().await;
+					cache.insert(file_display);
+					if let Err(e) = save_cached_passed(cache_file, &cache) {
+						info!("Failed to save cache: {}", e);
+					}
+				}
+			},
+			Err(e) => {
+				println!("test {file_display} ... {RED}FAILED{COLOUR_RESET}");
+				failed_files += 1;
+				let error_detail = if args.verbose { format!("{:?}", e) } else { format!("{}", e) };
+				failures.push((file_display.clone(), error_detail));
+
+				// Update cached-failed
+				{
+					let mut cache = cached_failed.lock().await;
+					cache.insert(file_display);
+					if let Err(e) = save_cached_failed(&cached_failed_path, &cache) {
+						info!("Failed to save cached-failed: {}", e);
+					}
+				}
+
+				if args.bail {
+					info!("Bailing after first failure");
+					break;
+				}
+			},
+		}
+	}
+
+	// Print summary
+	println!();
+	if !failures.is_empty() && args.verbose {
+		println!("{BOLD}failures:{BOLD_RESET}");
+		println!();
+		for (file, error) in &failures {
+			println!("---- {} ----", file);
+			println!("{}", error);
+			println!();
+		}
+	}
+
+	let elapsed = start_time.elapsed();
+	println!(
+		"test result: {}. {} passed; {} failed; {} cached; finished in {:.2}s",
+		if failed_files == 0 {
+			format!("{GREEN}ok{COLOUR_RESET}")
+		} else {
+			format!("{RED}FAILED{COLOUR_RESET}")
+		},
+		passed_files,
+		failed_files,
+		skipped_files,
+		elapsed.as_secs_f64()
+	);
+
+	if failed_files > 0 {
+		std::process::exit(1);
+	}
+
+	Ok(())
+}
+
+/// Discover test files from the given path
+fn discover_test_files(path: &Path) -> anyhow::Result<Vec<PathBuf>> {
+	if !path.exists() {
+		anyhow::bail!("Path does not exist: {}", path.display());
+	}
+
+	let mut files = Vec::new();
+
+	if path.is_file() {
+		let extension = path.extension().and_then(|s| s.to_str()).unwrap_or("");
+
+		match extension {
+			"sol" => {
+				// Single .sol file
+				files.push(path.to_path_buf());
+			},
+			"json" => {
+				// Corpus file - enumerate its tests
+				let corpus = Corpus::try_from_path(path)?;
+				let metadata_files = corpus.enumerate_tests();
+				for metadata in metadata_files {
+					files.push(metadata.metadata_file_path);
+				}
+			},
+			_ => anyhow::bail!("Unsupported file extension: {}. Expected .sol or .json", extension),
+		}
+	} else if path.is_dir() {
+		// First, find all test.json files
+		let mut test_json_dirs = HashSet::new();
+		for json_file in FilesWithExtensionIterator::new(path)
+			.with_allowed_extension("json")
+			.with_use_cached_fs(true)
+		{
+			if json_file.file_name().and_then(|s| s.to_str()) == Some("test.json") {
+				if let Some(parent) = json_file.parent() {
+					test_json_dirs.insert(parent.to_path_buf());
+				}
+
+				// Try to parse as corpus file first, then as metadata file
+				if let Ok(corpus) = Corpus::try_from_path(&json_file) {
+					// It's a corpus file - enumerate its tests
+					let metadata_files = corpus.enumerate_tests();
+					for metadata in metadata_files {
+						files.push(metadata.metadata_file_path);
+					}
+				} else {
+					// It's a metadata file - use it directly
+					files.push(json_file);
+				}
+			}
+		}
+
+		// Then, find .sol files that are NOT in directories with test.json
+		for sol_file in FilesWithExtensionIterator::new(path)
+			.with_allowed_extension("sol")
+			.with_use_cached_fs(true)
+		{
+			if let Some(parent) = sol_file.parent() {
+				if !test_json_dirs.contains(parent) {
+					files.push(sol_file);
+				}
+			} else {
+				files.push(sol_file);
+			}
+		}
+	} else {
+		anyhow::bail!("Path is neither a file nor a directory: {}", path.display());
+	}
+
+	Ok(files)
+}
+
+/// Load metadata from a test file
+fn load_metadata_file(path: &Path) -> anyhow::Result<MetadataFile> {
+	let metadata = Metadata::try_from_file(path)
+		.ok_or_else(|| anyhow::anyhow!("Failed to load metadata from {}", path.display()))?;
+
+	Ok(MetadataFile {
+		metadata_file_path: path.to_path_buf(),
+		corpus_file_path: path.to_path_buf(),
+		content: metadata,
+	})
+}
+
+/// Execute all test cases in a metadata file
+async fn execute_test_file(
+	metadata_file: &MetadataFile,
+	platform: &dyn Platform,
+	node: &'static dyn revive_dt_node_interaction::EthereumNode,
+	context: &revive_dt_config::Context,
+) -> anyhow::Result<()> {
+	if metadata_file.cases.is_empty() {
+		anyhow::bail!("No test cases found in file");
+	}
+
+	info!("Processing {} test case(s)", metadata_file.cases.len());
+
+	let temp_dir = TempDir::new()?;
+	info!("Created temporary directory: {}", temp_dir.path().display());
+
+	info!("Initializing cached compiler");
+	let cached_compiler = CachedCompiler::new(temp_dir.path().join("compilation_cache"), false)
+		.await
+		.map(Arc::new)
+		.context("Failed to create cached compiler")?;
+
+	let private_key_allocator =
+		Arc::new(Mutex::new(PrivateKeyAllocator::new(alloy::primitives::U256::from(100))));
+
+	let (reporter, report_task) =
+		revive_dt_report::ReportAggregator::new(context.clone()).into_task();
+
+	tokio::spawn(report_task);
+
+	info!("Building test definitions for {} case(s)", metadata_file.cases.len());
+	let mut test_definitions = Vec::new();
+	for (case_idx, case) in metadata_file.cases.iter().enumerate() {
+		info!("Building test definition for case {}", case_idx);
+		let test_def = build_test_definition(
+			metadata_file,
+			case,
+			case_idx,
+			platform,
+			node,
+			&context,
+			&reporter,
+		)
+		.await?;
+
+		if let Some(test_def) = test_def {
+			info!("Test definition for case {} created successfully", case_idx);
+			test_definitions.push(test_def);
+		}
+	}
+
+	info!("Executing {} test definition(s)", test_definitions.len());
+	for (idx, test_definition) in test_definitions.iter().enumerate() {
+		info!("─────────────────────────────────────────────────────────────────");
+		info!(
+			"Executing case {}/{}: case_idx={}, mode={}, steps={}",
+			idx + 1,
+			test_definitions.len(),
+			test_definition.case_idx,
+			test_definition.mode,
+			test_definition.case.steps.len()
+		);
+
+		info!("Creating driver for case {}", test_definition.case_idx);
+		let driver = revive_dt_core::differential_tests::Driver::new_root(
+			test_definition,
+			private_key_allocator.clone(),
+			&cached_compiler,
+		)
+		.await
+		.context("Failed to create driver")?;
+
+		info!(
+			"Running {} step(s) for case {}",
+			test_definition.case.steps.len(),
+			test_definition.case_idx
+		);
+		let steps_executed = driver
+			.execute_all()
+			.await
+			.context(format!("Failed to execute case {}", test_definition.case_idx))?;
+		info!(
+			"✓ Case {} completed successfully, executed {} step(s)",
+			test_definition.case_idx, steps_executed
+		);
+	}
+	info!("─────────────────────────────────────────────────────────────────");
+	info!("All {} test case(s) executed successfully", test_definitions.len());
+
+	Ok(())
+}
+
+/// Build a test definition for a single test case
+async fn build_test_definition<'a>(
+	metadata_file: &'a MetadataFile,
+	case: &'a revive_dt_format::case::Case,
+	case_idx: usize,
+	platform: &'a dyn Platform,
+	node: &'a dyn revive_dt_node_interaction::EthereumNode,
+	context: &revive_dt_config::Context,
+	reporter: &revive_dt_report::Reporter,
+) -> anyhow::Result<Option<TestDefinition<'a>>> {
+	let mode = case
+		.modes
+		.as_ref()
+		.or(metadata_file.modes.as_ref())
+		.and_then(|modes| modes.first())
+		.and_then(|parsed_mode| parsed_mode.to_modes().next())
+		.map(Cow::Owned)
+		.or_else(|| revive_dt_compiler::Mode::all().next().map(Cow::Borrowed))
+		.unwrap();
+
+	let compiler = platform
+		.new_compiler(context.clone(), mode.version.clone().map(Into::into))
+		.await
+		.context("Failed to create compiler")?;
+
+	let test_reporter =
+		reporter.test_specific_reporter(Arc::new(revive_dt_report::TestSpecifier {
+			solc_mode: mode.as_ref().clone(),
+			metadata_file_path: metadata_file.metadata_file_path.clone(),
+			case_idx: CaseIdx::new(case_idx),
+		}));
+
+	let execution_reporter =
+		test_reporter.execution_specific_reporter(node.id(), platform.platform_identifier());
+
+	let mut platforms = BTreeMap::new();
+	platforms.insert(
+		platform.platform_identifier(),
+		TestPlatformInformation { platform, node, compiler, reporter: execution_reporter },
+	);
+
+	let test_definition = TestDefinition {
+		metadata: metadata_file,
+		metadata_file_path: &metadata_file.metadata_file_path,
+		mode,
+		case_idx: CaseIdx::new(case_idx),
+		case,
+		platforms,
+		reporter: test_reporter,
+	};
+
+	if let Err((reason, _)) = test_definition.check_compatibility() {
+		info!("Skipping case {}: {}", case_idx, reason);
+		return Ok(None);
+	}
+
+	Ok(Some(test_definition))
+}
+
+/// Load cached passed tests from file
+fn load_cached_passed(path: &Path) -> anyhow::Result<HashSet<String>> {
+	if !path.exists() {
+		return Ok(HashSet::new());
+	}
+
+	let file = File::open(path).context("Failed to open cached-passed file")?;
+	let reader = BufReader::new(file);
+
+	let mut cache = HashSet::new();
+	for line in reader.lines() {
+		let line = line?;
+		let trimmed = line.trim();
+		if !trimmed.is_empty() {
+			cache.insert(trimmed.to_string());
+		}
+	}
+
+	Ok(cache)
+}
+
+/// Save cached passed tests to file
+fn save_cached_passed(path: &Path, cache: &HashSet<String>) -> anyhow::Result<()> {
+	let file = File::create(path).context("Failed to create cached-passed file")?;
+	let mut writer = BufWriter::new(file);
+
+	let mut entries: Vec<_> = cache.iter().collect();
+	entries.sort();
+
+	for entry in entries {
+		writeln!(writer, "{}", entry)?;
+	}
+
+	writer.flush()?;
+	Ok(())
+}
+
+/// Save cached failed tests to file
+fn save_cached_failed(path: &Path, cache: &HashSet<String>) -> anyhow::Result<()> {
+	let file = File::create(path).context("Failed to create cached-failed file")?;
+	let mut writer = BufWriter::new(file);
+
+	let mut entries: Vec<_> = cache.iter().collect();
+	entries.sort();
+
+	for entry in entries {
+		writeln!(writer, "{}", entry)?;
+	}
+
+	writer.flush()?;
+	Ok(())
+}

crates/node-interaction/Cargo.toml

@@ -9,5 +9,13 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+revive-common = { workspace = true }
+
+revive-dt-format = { workspace = true }
+
 alloy = { workspace = true }
 anyhow = { workspace = true }
+futures = { workspace = true }
+
+[lints]
+workspace = true

crates/node-interaction/src/lib.rs

@@ -1,35 +1,102 @@
 //! This crate implements all node interactions.
 
-use alloy::primitives::{Address, StorageKey, U256};
+use std::{pin::Pin, sync::Arc};
-use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
+
-use alloy::rpc::types::{EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest};
+use alloy::{
+	primitives::{Address, BlockNumber, BlockTimestamp, StorageKey, TxHash, U256},
+	rpc::types::{
+		EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest,
+		trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace},
+	},
+};
 use anyhow::Result;
 
+use futures::Stream;
+use revive_common::EVMVersion;
+use revive_dt_format::traits::ResolverApi;
+
 /// An interface for all interactions with Ethereum compatible nodes.
+#[allow(clippy::type_complexity)]
 pub trait EthereumNode {
-    /// Execute the [TransactionRequest] and return a [TransactionReceipt].
+	/// A function to run post spawning the nodes and before any transactions are run on the node.
-    fn execute_transaction(
+	fn pre_transactions(&mut self) -> Pin<Box<dyn Future<Output = anyhow::Result<()>> + '_>>;
-        &self,
-        transaction: TransactionRequest,
-    ) -> impl Future<Output = Result<TransactionReceipt>>;
 
-    /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
+	fn id(&self) -> usize;
-    fn trace_transaction(
-        &self,
-        receipt: &TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
-    ) -> impl Future<Output = Result<GethTrace>>;
 
-    /// Returns the state diff of the transaction hash in the [TransactionReceipt].
+	/// Returns the nodes connection string.
-    fn state_diff(&self, receipt: &TransactionReceipt) -> impl Future<Output = Result<DiffMode>>;
+	fn connection_string(&self) -> &str;
 
-    /// Returns the balance of the provided [`Address`] back.
+	fn submit_transaction(
-    fn balance_of(&self, address: Address) -> impl Future<Output = Result<U256>>;
+		&self,
+		transaction: TransactionRequest,
+	) -> Pin<Box<dyn Future<Output = Result<TxHash>> + '_>>;
 
-    /// Returns the latest storage proof of the provided [`Address`]
+	fn get_receipt(
-    fn latest_state_proof(
+		&self,
-        &self,
+		tx_hash: TxHash,
-        address: Address,
+	) -> Pin<Box<dyn Future<Output = Result<TransactionReceipt>> + '_>>;
-        keys: Vec<StorageKey>,
+
-    ) -> impl Future<Output = Result<EIP1186AccountProofResponse>>;
+	/// Execute the [TransactionRequest] and return a [TransactionReceipt].
+	fn execute_transaction(
+		&self,
+		transaction: TransactionRequest,
+	) -> Pin<Box<dyn Future<Output = Result<TransactionReceipt>> + '_>>;
+
+	/// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
+	fn trace_transaction(
+		&self,
+		tx_hash: TxHash,
+		trace_options: GethDebugTracingOptions,
+	) -> Pin<Box<dyn Future<Output = Result<GethTrace>> + '_>>;
+
+	/// Returns the state diff of the transaction hash in the [TransactionReceipt].
+	fn state_diff(&self, tx_hash: TxHash) -> Pin<Box<dyn Future<Output = Result<DiffMode>> + '_>>;
+
+	/// Returns the balance of the provided [`Address`] back.
+	fn balance_of(&self, address: Address) -> Pin<Box<dyn Future<Output = Result<U256>> + '_>>;
+
+	/// Returns the latest storage proof of the provided [`Address`]
+	fn latest_state_proof(
+		&self,
+		address: Address,
+		keys: Vec<StorageKey>,
+	) -> Pin<Box<dyn Future<Output = Result<EIP1186AccountProofResponse>> + '_>>;
+
+	/// Returns the resolver that is to use with this ethereum node.
+	fn resolver(&self) -> Pin<Box<dyn Future<Output = Result<Arc<dyn ResolverApi + '_>>> + '_>>;
+
+	/// Returns the EVM version of the node.
+	fn evm_version(&self) -> EVMVersion;
+
+	/// Returns a stream of the blocks that were mined by the node.
+	fn subscribe_to_full_blocks_information(
+		&self,
+	) -> Pin<
+		Box<
+			dyn Future<Output = anyhow::Result<Pin<Box<dyn Stream<Item = MinedBlockInformation>>>>>
+				+ '_,
+		>,
+	>;
+
+	/// Checks if the provided address is in the wallet. If it is, returns the address.
+	/// Otherwise, returns the default signer's address.
+	fn resolve_signer_or_default(&self, address: Address) -> Address;
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct MinedBlockInformation {
+	/// The block number.
+	pub block_number: BlockNumber,
+
+	/// The block timestamp.
+	pub block_timestamp: BlockTimestamp,
+
+	/// The amount of gas mined in the block.
+	pub mined_gas: u128,
+
+	/// The gas limit of the block.
+	pub block_gas_limit: u128,
+
+	/// The hashes of the transactions that were mined as part of the block.
+	pub transaction_hashes: Vec<TxHash>,
 }

crates/node/Cargo.toml

@@ -11,7 +11,9 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 alloy = { workspace = true }
+futures = { workspace = true }
 tracing = { workspace = true }
+tower = { workspace = true }
 tokio = { workspace = true }
 
 revive-common = { workspace = true }
@@ -22,10 +24,16 @@ revive-dt-node-interaction = { workspace = true }
 
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_with = { workspace = true }
+serde_yaml_ng = { workspace = true }
 
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
+zombienet-sdk = { workspace = true }
 
 [dev-dependencies]
 temp-dir = { workspace = true }
 tokio = { workspace = true }
+
+[lints]
+workspace = true

crates/node/src/common.rs

@@ -1,78 +0,0 @@
-use alloy::{
-    network::{Network, TransactionBuilder},
-    providers::{
-        Provider, SendableTx,
-        fillers::{GasFiller, TxFiller},
-    },
-    transports::TransportResult,
-};
-
-#[derive(Clone, Debug)]
-pub struct FallbackGasFiller {
-    inner: GasFiller,
-    default_gas_limit: u64,
-    default_max_fee_per_gas: u128,
-    default_priority_fee: u128,
-}
-
-impl FallbackGasFiller {
-    pub fn new(
-        default_gas_limit: u64,
-        default_max_fee_per_gas: u128,
-        default_priority_fee: u128,
-    ) -> Self {
-        Self {
-            inner: GasFiller,
-            default_gas_limit,
-            default_max_fee_per_gas,
-            default_priority_fee,
-        }
-    }
-}
-
-impl<N> TxFiller<N> for FallbackGasFiller
-where
-    N: Network,
-{
-    type Fillable = Option<<GasFiller as TxFiller<N>>::Fillable>;
-
-    fn status(
-        &self,
-        tx: &<N as Network>::TransactionRequest,
-    ) -> alloy::providers::fillers::FillerControlFlow {
-        <GasFiller as TxFiller<N>>::status(&self.inner, tx)
-    }
-
-    fn fill_sync(&self, _: &mut alloy::providers::SendableTx<N>) {}
-
-    async fn prepare<P: Provider<N>>(
-        &self,
-        provider: &P,
-        tx: &<N as Network>::TransactionRequest,
-    ) -> TransportResult<Self::Fillable> {
-        // Try to fetch GasFiller’s “fillable” (gas_price, base_fee, estimate_gas, …)
-        // If it errors (i.e. tx would revert under eth_estimateGas), swallow it.
-        match self.inner.prepare(provider, tx).await {
-            Ok(fill) => Ok(Some(fill)),
-            Err(_) => Ok(None),
-        }
-    }
-
-    async fn fill(
-        &self,
-        fillable: Self::Fillable,
-        mut tx: alloy::providers::SendableTx<N>,
-    ) -> TransportResult<SendableTx<N>> {
-        if let Some(fill) = fillable {
-            // our inner GasFiller succeeded — use it
-            self.inner.fill(fill, tx).await
-        } else {
-            if let Some(builder) = tx.as_mut_builder() {
-                builder.set_gas_limit(self.default_gas_limit);
-                builder.set_max_fee_per_gas(self.default_max_fee_per_gas);
-                builder.set_max_priority_fee_per_gas(self.default_priority_fee);
-            }
-            Ok(tx)
-        }
-    }
-}

crates/node/src/constants.rs

@@ -1,5 +1,10 @@
+use alloy::primitives::ChainId;
+
 /// This constant defines how much Wei accounts are pre-seeded with in genesis.
 ///
-/// Note: After changing this number, check that the tests for kitchensink work as we encountered
+/// Note: After changing this number, check that the tests for substrate work as we encountered
-/// some issues with different values of the initial balance on Kitchensink.
+/// some issues with different values of the initial balance on substrate.
 pub const INITIAL_BALANCE: u128 = 10u128.pow(37);
+
+/// The chain id used for all of the chains spawned by the framework.
+pub const CHAIN_ID: ChainId = 420420420;

crates/node/src/geth.rs

@@ -1,741 +0,0 @@
-//! The go-ethereum node implementation.
-
-use std::{
-    fs::{File, OpenOptions, create_dir_all, remove_dir_all},
-    io::{BufRead, BufReader, Read, Write},
-    ops::ControlFlow,
-    path::PathBuf,
-    process::{Child, Command, Stdio},
-    sync::{
-        Arc,
-        atomic::{AtomicU32, Ordering},
-    },
-    time::{Duration, Instant},
-};
-
-use alloy::{
-    eips::BlockNumberOrTag,
-    genesis::{Genesis, GenesisAccount},
-    network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{
-        Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, StorageKey, TxHash, U256,
-    },
-    providers::{
-        Provider, ProviderBuilder,
-        ext::DebugApi,
-        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
-    },
-    rpc::types::{
-        EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest,
-        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
-    },
-    signers::local::PrivateKeySigner,
-};
-use anyhow::Context;
-use revive_common::EVMVersion;
-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 crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
-
-static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
-
-/// The go-ethereum node instance implementation.
-///
-/// Implements helpers to initialize, spawn and wait the node.
-///
-/// Assumes dev mode and IPC only (`P2P`, `http`` etc. are kept disabled).
-///
-/// Prunes the child process and the base directory on drop.
-#[derive(Debug)]
-pub struct GethNode {
-    connection_string: String,
-    base_directory: PathBuf,
-    data_directory: PathBuf,
-    logs_directory: PathBuf,
-    geth: PathBuf,
-    id: u32,
-    handle: Option<Child>,
-    start_timeout: u64,
-    wallet: EthereumWallet,
-    nonce_manager: CachedNonceManager,
-    /// This vector stores [`File`] objects that we use for logging which we want to flush when the
-    /// node object is dropped. We do not store them in a structured fashion at the moment (in
-    /// separate fields) as the logic that we need to apply to them is all the same regardless of
-    /// what it belongs to, we just want to flush them on [`Drop`] of the node.
-    logs_file_to_flush: Vec<File>,
-}
-
-impl GethNode {
-    const BASE_DIRECTORY: &str = "geth";
-    const DATA_DIRECTORY: &str = "data";
-    const LOGS_DIRECTORY: &str = "logs";
-
-    const IPC_FILE: &str = "geth.ipc";
-    const GENESIS_JSON_FILE: &str = "genesis.json";
-
-    const READY_MARKER: &str = "IPC endpoint opened";
-    const ERROR_MARKER: &str = "Fatal:";
-
-    const GETH_STDOUT_LOG_FILE_NAME: &str = "node_stdout.log";
-    const GETH_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
-
-    const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress";
-    const TRANSACTION_TRACING_ERROR: &str = "historical state not available in path scheme yet";
-
-    const RECEIPT_POLLING_DURATION: Duration = Duration::from_secs(5 * 60);
-    const TRACE_POLLING_DURATION: Duration = Duration::from_secs(60);
-
-    /// Create the node directory and call `geth init` to configure the genesis.
-    #[tracing::instrument(level = "info", 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)?;
-
-        let mut genesis = serde_json::from_str::<Genesis>(&genesis)?;
-        for signer_address in
-            <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
-        {
-            // Note, the use of the entry API here means that we only modify the entries for any
-            // account that is not in the `alloc` field of the genesis state.
-            genesis
-                .alloc
-                .entry(signer_address)
-                .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
-        }
-        let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
-        serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;
-
-        let mut child = Command::new(&self.geth)
-            .arg("--state.scheme")
-            .arg("hash")
-            .arg("init")
-            .arg("--datadir")
-            .arg(&self.data_directory)
-            .arg(genesis_path)
-            .stderr(Stdio::piped())
-            .stdout(Stdio::null())
-            .spawn()?;
-
-        let mut stderr = String::new();
-        child
-            .stderr
-            .take()
-            .expect("should be piped")
-            .read_to_string(&mut stderr)?;
-
-        if !child.wait()?.success() {
-            anyhow::bail!("failed to initialize geth node #{:?}: {stderr}", &self.id);
-        }
-
-        Ok(self)
-    }
-
-    /// Spawn the go-ethereum node child process.
-    ///
-    /// [Instance::init] must be called prior.
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn spawn_process(&mut self) -> anyhow::Result<&mut Self> {
-        // This is the `OpenOptions` that we wish to use for all of the log files that we will be
-        // opening in this method. We need to construct it in this way to:
-        // 1. Be consistent
-        // 2. Less verbose and more dry
-        // 3. Because the builder pattern uses mutable references so we need to get around that.
-        let open_options = {
-            let mut options = OpenOptions::new();
-            options.create(true).truncate(true).write(true);
-            options
-        };
-
-        let stdout_logs_file = open_options
-            .clone()
-            .open(self.geth_stdout_log_file_path())?;
-        let stderr_logs_file = open_options.open(self.geth_stderr_log_file_path())?;
-        self.handle = Command::new(&self.geth)
-            .arg("--dev")
-            .arg("--datadir")
-            .arg(&self.data_directory)
-            .arg("--ipcpath")
-            .arg(&self.connection_string)
-            .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()?
-            .into();
-
-        if let Err(error) = self.wait_ready() {
-            tracing::error!(?error, "Failed to start geth, shutting down gracefully");
-            self.shutdown()?;
-            return Err(error);
-        }
-
-        self.logs_file_to_flush
-            .extend([stderr_logs_file, stdout_logs_file]);
-
-        Ok(self)
-    }
-
-    /// Wait for the g-ethereum node child process getting ready.
-    ///
-    /// [Instance::spawn_process] must be called priorly.
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn wait_ready(&mut self) -> anyhow::Result<&mut Self> {
-        let start_time = Instant::now();
-
-        let logs_file = OpenOptions::new()
-            .read(true)
-            .write(false)
-            .append(false)
-            .truncate(false)
-            .open(self.geth_stderr_log_file_path())?;
-
-        let maximum_wait_time = Duration::from_millis(self.start_timeout);
-        let mut stderr = BufReader::new(logs_file).lines();
-        let mut lines = vec![];
-        loop {
-            if let Some(Ok(line)) = stderr.next() {
-                if line.contains(Self::ERROR_MARKER) {
-                    anyhow::bail!("Failed to start geth {line}");
-                }
-                if line.contains(Self::READY_MARKER) {
-                    return Ok(self);
-                }
-                lines.push(line);
-            }
-            if Instant::now().duration_since(start_time) > maximum_wait_time {
-                anyhow::bail!(
-                    "Timeout in starting geth: took longer than {}ms. stdout:\n\n{}\n",
-                    self.start_timeout,
-                    lines.join("\n")
-                );
-            }
-        }
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
-    fn geth_stdout_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::GETH_STDOUT_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
-    fn geth_stderr_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::GETH_STDERR_LOG_FILE_NAME)
-    }
-
-    fn provider(
-        &self,
-    ) -> impl Future<
-        Output = anyhow::Result<
-            FillProvider<impl TxFiller<Ethereum>, impl Provider<Ethereum>, Ethereum>,
-        >,
-    > + 'static {
-        let connection_string = self.connection_string();
-        let wallet = self.wallet.clone();
-
-        // Note: We would like all providers to make use of the same nonce manager so that we have
-        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
-        // its implementation and therefore it means that when we clone it then it still references
-        // the same state.
-        let nonce_manager = self.nonce_manager.clone();
-
-        Box::pin(async move {
-            ProviderBuilder::new()
-                .disable_recommended_fillers()
-                .filler(FallbackGasFiller::new(
-                    25_000_000,
-                    1_000_000_000,
-                    1_000_000_000,
-                ))
-                .filler(ChainIdFiller::default())
-                .filler(NonceFiller::new(nonce_manager))
-                .wallet(wallet)
-                .connect(&connection_string)
-                .await
-                .map_err(Into::into)
-        })
-    }
-}
-
-impl EthereumNode for GethNode {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn execute_transaction(
-        &self,
-        transaction: TransactionRequest,
-    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let span = tracing::debug_span!("Submitting transaction", ?transaction);
-        let _guard = span.enter();
-
-        let provider = 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,
-        // before we can get the receipt of the transaction it needs to have been indexed by the
-        // node's indexer. Just because the transaction has been confirmed it doesn't mean that
-        // it has been indexed. When we call alloy's `get_receipt` it checks if the transaction
-        // was confirmed. If it has been, then it will call `eth_getTransactionReceipt` method
-        // which _might_ return the above error if the tx has not yet been indexed yet. So, we
-        // need to implement a retry mechanism for the receipt to keep retrying to get it until
-        // it eventually works, but we only do that if the error we get back is the "transaction
-        // indexing is in progress" error or if the receipt is None.
-        //
-        // Getting the transaction indexed and taking a receipt can take a long time especially
-        // when a lot of transactions are being submitted to the node. Thus, while initially we
-        // only allowed for 60 seconds of waiting with a 1 second delay in polling, we need to
-        // allow for a larger wait time. Therefore, in here we allow for 5 minutes of waiting
-        // with exponential backoff each time we attempt to get the receipt and find that it's
-        // not available.
-        poll(
-            Self::RECEIPT_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                async move {
-                    match provider.get_transaction_receipt(transaction_hash).await {
-                        Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
-                        Ok(None) => Ok(ControlFlow::Continue(())),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
-                            }
-                        }
-                    }
-                }
-            },
-        )
-        .instrument(tracing::info_span!(
-            "Awaiting transaction receipt",
-            ?transaction_hash
-        ))
-        .await
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn trace_transaction(
-        &self,
-        transaction: &TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
-    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let provider = Arc::new(self.provider().await?);
-        poll(
-            Self::TRACE_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                let trace_options = trace_options.clone();
-                async move {
-                    match provider
-                        .debug_trace_transaction(transaction.transaction_hash, trace_options)
-                        .await
-                    {
-                        Ok(trace) => Ok(ControlFlow::Break(trace)),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_TRACING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
-                            }
-                        }
-                    }
-                }
-            },
-        )
-        .await
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    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)
-            .await?
-            .try_into_pre_state_frame()?
-        {
-            PreStateFrame::Diff(diff) => Ok(diff),
-            _ => anyhow::bail!("expected a diff mode trace"),
-        }
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_balance(address)
-            .await
-            .map_err(Into::into)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn latest_state_proof(
-        &self,
-        address: Address,
-        keys: Vec<StorageKey>,
-    ) -> anyhow::Result<EIP1186AccountProofResponse> {
-        self.provider()
-            .await?
-            .get_proof(address, keys)
-            .latest()
-            .await
-            .map_err(Into::into)
-    }
-}
-
-impl ResolverApi for GethNode {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        self.provider()
-            .await?
-            .get_chain_id()
-            .await
-            .map_err(Into::into)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_transaction_receipt(*tx_hash)
-            .await?
-            .context("Failed to get the transaction receipt")
-            .map(|receipt| receipt.effective_gas_price)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.gas_limit as _)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.beneficiary)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .and_then(|block| {
-                block
-                    .header
-                    .base_fee_per_gas
-                    .context("Failed to get the base fee per gas")
-            })
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.hash)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.timestamp)
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
-            .await?
-            .get_block_number()
-            .await
-            .map_err(Into::into)
-    }
-}
-
-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);
-        let base_directory = geth_directory.join(id.to_string());
-
-        let mut wallet = config.wallet();
-        for signer in (1..=config.private_keys_to_add)
-            .map(|id| U256::from(id))
-            .map(|id| id.to_be_bytes::<32>())
-            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
-        {
-            wallet.register_signer(signer);
-        }
-
-        Self {
-            connection_string: base_directory.join(Self::IPC_FILE).display().to_string(),
-            data_directory: base_directory.join(Self::DATA_DIRECTORY),
-            logs_directory: base_directory.join(Self::LOGS_DIRECTORY),
-            base_directory,
-            geth: config.geth.clone(),
-            id,
-            handle: None,
-            start_timeout: config.geth_start_timeout,
-            wallet,
-            // We know that we only need to be storing 2 files so we can specify that when creating
-            // the vector. It's the stdout and stderr of the geth node.
-            logs_file_to_flush: Vec::with_capacity(2),
-            nonce_manager: Default::default(),
-        }
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn connection_string(&self) -> String {
-        self.connection_string.clone()
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    fn shutdown(&mut self) -> anyhow::Result<()> {
-        // Terminate the processes in a graceful manner to allow for the output to be flushed.
-        if let Some(mut child) = self.handle.take() {
-            child
-                .kill()
-                .map_err(|error| anyhow::anyhow!("Failed to kill the geth process: {error:?}"))?;
-        }
-
-        // Flushing the files that we're using for keeping the logs before shutdown.
-        for file in self.logs_file_to_flush.iter_mut() {
-            file.flush()?
-        }
-
-        // Remove the node's database so that subsequent runs do not run on the same database. We
-        // ignore the error just in case the directory didn't exist in the first place and therefore
-        // there's nothing to be deleted.
-        let _ = remove_dir_all(self.base_directory.join(Self::DATA_DIRECTORY));
-
-        Ok(())
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    fn spawn(&mut self, genesis: String) -> anyhow::Result<()> {
-        self.init(genesis)?.spawn_process()?;
-        Ok(())
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id), err)]
-    fn version(&self) -> anyhow::Result<String> {
-        let output = Command::new(&self.geth)
-            .arg("--version")
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::null())
-            .spawn()?
-            .wait_with_output()?
-            .stdout;
-        Ok(String::from_utf8_lossy(&output).into())
-    }
-
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn matches_target(&self, targets: Option<&[String]>) -> bool {
-        match targets {
-            None => true,
-            Some(targets) => targets.iter().any(|str| str.as_str() == "evm"),
-        }
-    }
-
-    fn evm_version() -> EVMVersion {
-        EVMVersion::Cancun
-    }
-}
-
-impl Drop for GethNode {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
-    fn drop(&mut self) {
-        self.shutdown().expect("Failed to shutdown")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use revive_dt_config::Arguments;
-
-    use temp_dir::TempDir;
-
-    use crate::{GENESIS_JSON, Node};
-
-    use super::*;
-
-    fn test_config() -> (Arguments, TempDir) {
-        let mut config = Arguments::default();
-        let temp_dir = TempDir::new().unwrap();
-        config.working_directory = temp_dir.path().to_path_buf().into();
-
-        (config, temp_dir)
-    }
-
-    fn new_node() -> (GethNode, TempDir) {
-        let (args, temp_dir) = test_config();
-        let mut node = GethNode::new(&args);
-        node.init(GENESIS_JSON.to_owned())
-            .expect("Failed to initialize the node")
-            .spawn_process()
-            .expect("Failed to spawn the node process");
-        (node, temp_dir)
-    }
-
-    #[test]
-    fn init_works() {
-        GethNode::new(&test_config().0)
-            .init(GENESIS_JSON.to_string())
-            .unwrap();
-    }
-
-    #[test]
-    fn spawn_works() {
-        GethNode::new(&test_config().0)
-            .spawn(GENESIS_JSON.to_string())
-            .unwrap();
-    }
-
-    #[test]
-    fn version_works() {
-        let version = GethNode::new(&test_config().0).version().unwrap();
-        assert!(
-            version.starts_with("geth version"),
-            "expected version string, got: '{version}'"
-        );
-    }
-
-    #[tokio::test]
-    async fn can_get_chain_id_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        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);
-    }
-
-    #[tokio::test]
-    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).await;
-
-        // Assert
-        let gas_limit = gas_limit.expect("Failed to get the gas limit");
-        assert_eq!(gas_limit, u32::MAX as u128)
-    }
-
-    #[tokio::test]
-    async fn can_get_coinbase_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        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]))
-    }
-
-    #[tokio::test]
-    async fn can_get_block_difficulty_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        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)
-    }
-
-    #[tokio::test]
-    async fn can_get_block_hash_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
-
-        // Assert
-        let _ = block_hash.expect("Failed to get the block hash");
-    }
-
-    #[tokio::test]
-    async fn can_get_block_timestamp_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
-
-        // Assert
-        let _ = block_timestamp.expect("Failed to get the block timestamp");
-    }
-
-    #[tokio::test]
-    async fn can_get_block_number_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_number = node.last_block_number().await;
-
-        // Assert
-        let block_number = block_number.expect("Failed to get the block number");
-        assert_eq!(block_number, 0)
-    }
-}

crates/node/src/helpers/mod.rs

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

crates/node/src/helpers/process.rs

@@ -0,0 +1,172 @@
+use std::{
+	fs::{File, OpenOptions},
+	io::{BufRead, BufReader, Write},
+	path::Path,
+	process::{Child, Command},
+	time::{Duration, Instant},
+};
+
+use anyhow::{Context, Result, bail};
+
+/// A wrapper around processes which allows for their stdout and stderr to be logged and flushed
+/// when the process is dropped.
+#[derive(Debug)]
+pub struct Process {
+	/// The handle of the child process.
+	child: Child,
+
+	/// The file that stdout is being logged to.
+	stdout_logs_file: File,
+
+	/// The file that stderr is being logged to.
+	stderr_logs_file: File,
+}
+
+impl Process {
+	pub fn new(
+		log_file_prefix: impl Into<Option<&'static str>>,
+		logs_directory: impl AsRef<Path>,
+		binary_path: impl AsRef<Path>,
+		command_building_callback: impl FnOnce(&mut Command, File, File),
+		process_readiness_wait_behavior: ProcessReadinessWaitBehavior,
+	) -> Result<Self> {
+		let log_file_prefix = log_file_prefix.into();
+
+		let (stdout_file_name, stderr_file_name) = match log_file_prefix {
+			Some(prefix) => (format!("{prefix}_stdout.log"), format!("{prefix}_stderr.log")),
+			None => ("stdout.log".to_string(), "stderr.log".to_string()),
+		};
+
+		let stdout_logs_file_path = logs_directory.as_ref().join(stdout_file_name);
+		let stderr_logs_file_path = logs_directory.as_ref().join(stderr_file_name);
+
+		let stdout_logs_file = OpenOptions::new()
+			.write(true)
+			.truncate(true)
+			.create(true)
+			.open(stdout_logs_file_path.as_path())
+			.context("Failed to open the stdout logs file")?;
+		let stderr_logs_file = OpenOptions::new()
+			.write(true)
+			.truncate(true)
+			.create(true)
+			.open(stderr_logs_file_path.as_path())
+			.context("Failed to open the stderr logs file")?;
+
+		let mut command = {
+			let stdout_logs_file =
+				stdout_logs_file.try_clone().context("Failed to clone the stdout logs file")?;
+			let stderr_logs_file =
+				stderr_logs_file.try_clone().context("Failed to clone the stderr logs file")?;
+
+			let mut command = Command::new(binary_path.as_ref());
+			command_building_callback(&mut command, stdout_logs_file, stderr_logs_file);
+			command
+		};
+		let mut child = command.spawn().context("Failed to spawn the built command")?;
+
+		match process_readiness_wait_behavior {
+			ProcessReadinessWaitBehavior::NoStartupWait => {},
+			ProcessReadinessWaitBehavior::WaitDuration(duration) => std::thread::sleep(duration),
+			ProcessReadinessWaitBehavior::TimeBoundedWaitFunction {
+				max_wait_duration,
+				mut check_function,
+			} => {
+				let spawn_time = Instant::now();
+
+				let stdout_logs_file = OpenOptions::new()
+					.read(true)
+					.open(stdout_logs_file_path)
+					.context("Failed to open the stdout logs file")?;
+				let stderr_logs_file = OpenOptions::new()
+					.read(true)
+					.open(stderr_logs_file_path)
+					.context("Failed to open the stderr logs file")?;
+
+				let mut stdout_lines = BufReader::new(stdout_logs_file).lines();
+				let mut stderr_lines = BufReader::new(stderr_logs_file).lines();
+
+				let mut stdout = String::new();
+				let mut stderr = String::new();
+
+				loop {
+					let stdout_line = stdout_lines.next().and_then(Result::ok);
+					let stderr_line = stderr_lines.next().and_then(Result::ok);
+
+					if let Some(stdout_line) = stdout_line.as_ref() {
+						stdout.push_str(stdout_line);
+						stdout.push('\n');
+					}
+					if let Some(stderr_line) = stderr_line.as_ref() {
+						stderr.push_str(stderr_line);
+						stderr.push('\n');
+					}
+
+					let check_result =
+						check_function(stdout_line.as_deref(), stderr_line.as_deref()).context(
+							format!(
+								"Failed to wait for the process to be ready - {stdout} - {stderr}"
+							),
+						)?;
+
+					if check_result {
+						break;
+					}
+
+					if Instant::now().duration_since(spawn_time) > max_wait_duration {
+						bail!(
+							"Waited for the process to start but it failed to start in time. stderr {stderr} - stdout {stdout}"
+						)
+					}
+				}
+			},
+			ProcessReadinessWaitBehavior::WaitForCommandToExit => {
+				if !child.wait().context("Failed waiting for process to finish")?.success() {
+					anyhow::bail!("Failed to spawn command");
+				}
+			},
+		}
+
+		Ok(Self { child, stdout_logs_file, stderr_logs_file })
+	}
+}
+
+impl Drop for Process {
+	fn drop(&mut self) {
+		self.child.kill().expect("Failed to kill the process");
+		self.stdout_logs_file.flush().expect("Failed to flush the stdout logs file");
+		self.stderr_logs_file.flush().expect("Failed to flush the stderr logs file");
+	}
+}
+
+pub enum ProcessReadinessWaitBehavior {
+	/// The process does not require any kind of wait after it's been spawned and can be used
+	/// straight away.
+	NoStartupWait,
+
+	/// Waits for the command to exit.
+	WaitForCommandToExit,
+
+	/// The process does require some amount of wait duration after it's been started.
+	WaitDuration(Duration),
+
+	/// The process requires a time bounded wait function which is a function of the lines that
+	/// appear in the log files.
+	TimeBoundedWaitFunction {
+		/// The maximum amount of time to wait for the check function to return true.
+		max_wait_duration: Duration,
+
+		/// The function to use to check if the process spawned is ready to use or not. This
+		/// function should return the following in the following cases:
+		///
+		/// - `Ok(true)`: Returned when the condition the process is waiting for has been fulfilled
+		///   and the wait is completed.
+		/// - `Ok(false)`: The process is not ready yet but it might be ready in the future.
+		/// - `Err`: The process is not ready yet and will not be ready in the future as it appears
+		///   that it has encountered an error when it was being spawned.
+		///
+		/// The first argument is a line from stdout and the second argument is a line from stderr.
+		#[allow(clippy::type_complexity)]
+		check_function: Box<dyn FnMut(Option<&str>, Option<&str>) -> anyhow::Result<bool>>,
+	},
+}

crates/node/src/lib.rs

@@ -1,43 +1,25 @@
 //! This crate implements the testing nodes.
 
-use revive_common::EVMVersion;
+use alloy::genesis::Genesis;
-use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
-pub mod common;
 pub mod constants;
-pub mod geth;
+pub mod helpers;
-pub mod kitchensink;
+pub mod node_implementations;
-pub mod pool;
+pub mod provider_utils;
-
-/// The default genesis configuration.
-pub const GENESIS_JSON: &str = include_str!("../../../genesis.json");
 
 /// An abstract interface for testing nodes.
 pub trait Node: EthereumNode {
-    /// Create a new uninitialized instance.
+	/// Spawns a node configured according to the genesis json.
-    fn new(config: &Arguments) -> Self;
+	///
+	/// Blocking until it's ready to accept transactions.
+	fn spawn(&mut self, genesis: Genesis) -> anyhow::Result<()>;
 
-    /// Spawns a node configured according to the genesis json.
+	/// Prune the node instance and related data.
-    ///
+	///
-    /// Blocking until it's ready to accept transactions.
+	/// Blocking until it's completely stopped.
-    fn spawn(&mut self, genesis: String) -> anyhow::Result<()>;
+	fn shutdown(&mut self) -> anyhow::Result<()>;
 
-    /// Prune the node instance and related data.
+	/// Returns the node version.
-    ///
+	fn version(&self) -> anyhow::Result<String>;
-    /// Blocking until it's completely stopped.
-    fn shutdown(&mut self) -> anyhow::Result<()>;
-
-    /// Returns the nodes connection string.
-    fn connection_string(&self) -> String;
-
-    /// Returns the node version.
-    fn version(&self) -> anyhow::Result<String>;
-
-    /// Given a list of targets from the metadata file, this function determines if the metadata
-    /// file can be ran on this node or not.
-    fn matches_target(&self, targets: Option<&[String]>) -> bool;
-
-    /// Returns the EVM version of the node.
-    fn evm_version() -> EVMVersion;
 }

crates/node/src/node_implementations/geth.rs

@@ -0,0 +1,981 @@
+//! The go-ethereum node implementation.
+
+use std::{
+	fs::{File, create_dir_all, remove_dir_all},
+	io::Read,
+	ops::ControlFlow,
+	path::PathBuf,
+	pin::Pin,
+	process::{Command, Stdio},
+	sync::{
+		Arc,
+		atomic::{AtomicU32, Ordering},
+	},
+	time::Duration,
+};
+
+use alloy::{
+	eips::BlockNumberOrTag,
+	genesis::{Genesis, GenesisAccount},
+	network::{Ethereum, EthereumWallet, NetworkWallet},
+	primitives::{
+		Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, StorageKey, TxHash, U256,
+	},
+	providers::{
+		Provider,
+		ext::DebugApi,
+		fillers::{CachedNonceManager, ChainIdFiller, NonceFiller},
+	},
+	rpc::types::{
+		EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest,
+		trace::geth::{
+			DiffMode, GethDebugTracingOptions, GethTrace, PreStateConfig, PreStateFrame,
+		},
+	},
+};
+use anyhow::Context as _;
+use futures::{Stream, StreamExt};
+use revive_common::EVMVersion;
+use tokio::sync::OnceCell;
+use tracing::{Instrument, error, instrument};
+
+use revive_dt_common::{
+	fs::clear_directory,
+	futures::{PollingWaitBehavior, poll},
+};
+use revive_dt_config::*;
+use revive_dt_format::traits::ResolverApi;
+use revive_dt_node_interaction::{EthereumNode, MinedBlockInformation};
+
+use crate::{
+	Node,
+	constants::{CHAIN_ID, INITIAL_BALANCE},
+	helpers::{Process, ProcessReadinessWaitBehavior},
+	provider_utils::{ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider},
+};
+
+static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
+
+/// The go-ethereum node instance implementation.
+///
+/// Implements helpers to initialize, spawn and wait the node.
+///
+/// Assumes dev mode and IPC only (`P2P`, `http`` etc. are kept disabled).
+///
+/// Prunes the child process and the base directory on drop.
+#[derive(Debug)]
+#[allow(clippy::type_complexity)]
+pub struct GethNode {
+	connection_string: String,
+	base_directory: PathBuf,
+	data_directory: PathBuf,
+	logs_directory: PathBuf,
+	geth: PathBuf,
+	id: u32,
+	handle: Option<Process>,
+	start_timeout: Duration,
+	wallet: Arc<EthereumWallet>,
+	nonce_manager: CachedNonceManager,
+	provider: OnceCell<ConcreteProvider<Ethereum, Arc<EthereumWallet>>>,
+	chain_id: ChainId,
+}
+
+impl GethNode {
+	const BASE_DIRECTORY: &str = "geth";
+	const DATA_DIRECTORY: &str = "data";
+	const LOGS_DIRECTORY: &str = "logs";
+
+	const IPC_FILE: &str = "geth.ipc";
+	const GENESIS_JSON_FILE: &str = "genesis.json";
+
+	const READY_MARKER: &str = "IPC endpoint opened";
+	const ERROR_MARKER: &str = "Fatal:";
+
+	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(10);
+	const TRACE_POLLING_DURATION: Duration = Duration::from_secs(10);
+
+	pub fn new(
+		context: impl AsRef<WorkingDirectoryConfiguration>
+		+ AsRef<WalletConfiguration>
+		+ AsRef<GethConfiguration>
+		+ Clone,
+	) -> Self {
+		let working_directory_configuration =
+			AsRef::<WorkingDirectoryConfiguration>::as_ref(&context);
+		let wallet_configuration = AsRef::<WalletConfiguration>::as_ref(&context);
+		let geth_configuration = AsRef::<GethConfiguration>::as_ref(&context);
+
+		let geth_directory = working_directory_configuration.as_path().join(Self::BASE_DIRECTORY);
+		let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
+		let base_directory = geth_directory.join(id.to_string());
+
+		let wallet = wallet_configuration.wallet();
+
+		Self {
+			connection_string: base_directory.join(Self::IPC_FILE).display().to_string(),
+			data_directory: base_directory.join(Self::DATA_DIRECTORY),
+			logs_directory: base_directory.join(Self::LOGS_DIRECTORY),
+			base_directory,
+			geth: geth_configuration.path.clone(),
+			id,
+			handle: None,
+			start_timeout: geth_configuration.start_timeout_ms,
+			wallet: wallet.clone(),
+			nonce_manager: Default::default(),
+			provider: Default::default(),
+			chain_id: CHAIN_ID,
+		}
+	}
+
+	pub async fn new_existing(private_key: &str, rpc_port: u16) -> anyhow::Result<Self> {
+		use alloy::{
+			primitives::FixedBytes,
+			providers::{Provider, ProviderBuilder},
+			signers::local::PrivateKeySigner,
+		};
+
+		let key_str = private_key.trim().strip_prefix("0x").unwrap_or(private_key.trim());
+		let key_bytes = alloy::hex::decode(key_str)
+			.map_err(|e| anyhow::anyhow!("Failed to decode private key hex: {}", e))?;
+
+		if key_bytes.len() != 32 {
+			anyhow::bail!(
+				"Private key must be 32 bytes (64 hex characters), got {}",
+				key_bytes.len()
+			);
+		}
+
+		let mut bytes = [0u8; 32];
+		bytes.copy_from_slice(&key_bytes);
+
+		let signer = PrivateKeySigner::from_bytes(&FixedBytes(bytes))
+			.map_err(|e| anyhow::anyhow!("Failed to create signer from private key: {}", e))?;
+
+		let address = signer.address();
+		let wallet = Arc::new(EthereumWallet::new(signer));
+		let connection_string = format!("http://localhost:{}", rpc_port);
+
+		let chain_id = ProviderBuilder::new()
+			.connect_http(connection_string.parse()?)
+			.get_chain_id()
+			.await
+			.context("Failed to query chain ID from RPC")?;
+
+		let node = Self {
+			connection_string: format!("http://localhost:{}", rpc_port),
+			base_directory: PathBuf::new(),
+			data_directory: PathBuf::new(),
+			logs_directory: PathBuf::new(),
+			geth: PathBuf::new(),
+			id: 0,
+			chain_id,
+			handle: None,
+			start_timeout: Duration::from_secs(0),
+			wallet,
+			nonce_manager: Default::default(),
+			provider: Default::default(),
+		};
+
+		// Check balance and fund if needed
+		node.ensure_funded(address).await?;
+
+		Ok(node)
+	}
+
+	/// Ensure that the given address has at least 1000 ETH, funding it from the node's managed
+	/// account if necessary.
+	async fn ensure_funded(&self, address: Address) -> anyhow::Result<()> {
+		use alloy::{
+			primitives::utils::{format_ether, parse_ether},
+			providers::{Provider, ProviderBuilder},
+		};
+
+		let provider = ProviderBuilder::new().connect_http(self.connection_string.parse()?);
+		let balance = provider.get_balance(address).await?;
+		let min_balance = parse_ether("1000")?;
+
+		if balance >= min_balance {
+			tracing::info!(
+				"Wallet {} already has sufficient balance: {} ETH",
+				address,
+				format_ether(balance)
+			);
+			return Ok(());
+		}
+
+		tracing::info!(
+			"Funding wallet {} (current: {} ETH, target: 1000 ETH)",
+			address,
+			format_ether(balance)
+		);
+
+		// Get the node's managed account
+		let accounts = provider.get_accounts().await?;
+		if accounts.is_empty() {
+			anyhow::bail!("No managed accounts available on the node to fund wallet");
+		}
+
+		let from_account = accounts[0];
+
+		let funding_amount = min_balance - balance;
+		let tx = TransactionRequest::default()
+			.from(from_account)
+			.to(address)
+			.value(funding_amount);
+
+		provider
+			.send_transaction(tx)
+			.await?
+			.get_receipt()
+			.await
+			.context("Failed to get receipt for funding transaction")?;
+
+		tracing::info!("Successfully funded wallet {}", address);
+		Ok(())
+	}
+
+	/// Create the node directory and call `geth init` to configure the genesis.
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn init(&mut self, mut genesis: Genesis) -> anyhow::Result<&mut Self> {
+		let _ = clear_directory(&self.base_directory);
+		let _ = clear_directory(&self.logs_directory);
+
+		create_dir_all(&self.base_directory)
+			.context("Failed to create base directory for geth node")?;
+		create_dir_all(&self.logs_directory)
+			.context("Failed to create logs directory for geth node")?;
+
+		for signer_address in
+			<EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
+		{
+			// Note, the use of the entry API here means that we only modify the entries for any
+			// account that is not in the `alloc` field of the genesis state.
+			genesis
+				.alloc
+				.entry(signer_address)
+				.or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
+		}
+		let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
+		serde_json::to_writer(
+			File::create(&genesis_path).context("Failed to create geth genesis file")?,
+			&genesis,
+		)
+		.context("Failed to serialize geth genesis JSON to file")?;
+
+		let mut child = Command::new(&self.geth)
+			.arg("--state.scheme")
+			.arg("hash")
+			.arg("init")
+			.arg("--datadir")
+			.arg(&self.data_directory)
+			.arg(genesis_path)
+			.stderr(Stdio::piped())
+			.stdout(Stdio::null())
+			.spawn()
+			.context("Failed to spawn geth --init process")?;
+
+		let mut stderr = String::new();
+		child
+			.stderr
+			.take()
+			.expect("should be piped")
+			.read_to_string(&mut stderr)
+			.context("Failed to read geth --init stderr")?;
+
+		if !child
+			.wait()
+			.context("Failed waiting for geth --init process to finish")?
+			.success()
+		{
+			anyhow::bail!("failed to initialize geth node #{:?}: {stderr}", &self.id);
+		}
+
+		Ok(self)
+	}
+
+	/// Spawn the go-ethereum node child process.
+	///
+	/// [Instance::init] must be called prior.
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn spawn_process(&mut self) -> anyhow::Result<&mut Self> {
+		let process = Process::new(
+			None,
+			self.logs_directory.as_path(),
+			self.geth.as_path(),
+			|command, stdout_file, stderr_file| {
+				command
+					.arg("--dev")
+					.arg("--datadir")
+					.arg(&self.data_directory)
+					.arg("--ipcpath")
+					.arg(&self.connection_string)
+					.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_file)
+					.stdout(stdout_file);
+			},
+			ProcessReadinessWaitBehavior::TimeBoundedWaitFunction {
+				max_wait_duration: self.start_timeout,
+				check_function: Box::new(|_, stderr_line| match stderr_line {
+					Some(line) =>
+						if line.contains(Self::ERROR_MARKER) {
+							anyhow::bail!("Failed to start geth {line}");
+						} else if line.contains(Self::READY_MARKER) {
+							Ok(true)
+						} else {
+							Ok(false)
+						},
+					None => Ok(false),
+				}),
+			},
+		);
+
+		match process {
+			Ok(process) => self.handle = Some(process),
+			Err(err) => {
+				error!(?err, "Failed to start geth, shutting down gracefully");
+				self.shutdown()
+					.context("Failed to gracefully shutdown after geth start error")?;
+				return Err(err);
+			},
+		}
+
+		Ok(self)
+	}
+
+	async fn provider(&self) -> anyhow::Result<ConcreteProvider<Ethereum, Arc<EthereumWallet>>> {
+		self.provider
+			.get_or_try_init(|| async move {
+				construct_concurrency_limited_provider::<Ethereum, _>(
+					self.connection_string.as_str(),
+					FallbackGasFiller::default(),
+					ChainIdFiller::new(Some(self.chain_id)),
+					NonceFiller::new(self.nonce_manager.clone()),
+					self.wallet.clone(),
+				)
+				.await
+				.context("Failed to construct the provider")
+			})
+			.await
+			.cloned()
+	}
+}
+
+impl EthereumNode for GethNode {
+	fn pre_transactions(&mut self) -> Pin<Box<dyn Future<Output = anyhow::Result<()>> + '_>> {
+		Box::pin(async move { Ok(()) })
+	}
+
+	fn id(&self) -> usize {
+		self.id as _
+	}
+
+	fn connection_string(&self) -> &str {
+		&self.connection_string
+	}
+
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(geth_node_id = self.id, connection_string = self.connection_string),
+        err,
+    )]
+	fn submit_transaction(
+		&self,
+		transaction: TransactionRequest,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<TxHash>> + '_>> {
+		Box::pin(async move {
+			let provider = self
+				.provider()
+				.await
+				.context("Failed to create the provider for transaction submission")?;
+			let pending_transaction = provider
+				.send_transaction(transaction)
+				.await
+				.context("Failed to submit the transaction through the provider")?;
+			Ok(*pending_transaction.tx_hash())
+		})
+	}
+
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(geth_node_id = self.id, connection_string = self.connection_string),
+        err,
+    )]
+	fn get_receipt(
+		&self,
+		tx_hash: TxHash,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<TransactionReceipt>> + '_>> {
+		Box::pin(async move {
+			self.provider()
+				.await
+				.context("Failed to create provider for getting the receipt")?
+				.get_transaction_receipt(tx_hash)
+				.await
+				.context("Failed to get the receipt of the transaction")?
+				.context("Failed to get the receipt of the transaction")
+		})
+	}
+
+	#[instrument(
+        level = "info",
+        skip_all,
+        fields(geth_node_id = self.id, connection_string = self.connection_string),
+        err,
+    )]
+	fn execute_transaction(
+		&self,
+		transaction: TransactionRequest,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<TransactionReceipt>> + '_>> {
+		Box::pin(async move {
+			let provider = self
+				.provider()
+				.await
+				.context("Failed to create provider for transaction submission")?;
+
+			let pending_transaction = provider
+				.send_transaction(transaction)
+				.await
+				.inspect_err(
+					|err| error!(%err, "Encountered an error when submitting the transaction"),
+				)
+				.context("Failed to submit transaction to geth node")?;
+			let transaction_hash = *pending_transaction.tx_hash();
+
+			// The following is a fix for the "transaction indexing is in progress" error that we
+			// used to get. You can find more information on this in the following GH issue in
+			// geth https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on,
+			// before we can get the receipt of the transaction it needs to have been indexed by the
+			// node's indexer. Just because the transaction has been confirmed it doesn't mean that
+			// it has been indexed. When we call alloy's `get_receipt` it checks if the
+			// transaction was confirmed. If it has been, then it will call
+			// `eth_getTransactionReceipt` method which _might_ return the above error if the tx
+			// has not yet been indexed yet. So, we need to implement a retry mechanism for the
+			// receipt to keep retrying to get it until it eventually works, but we only do that
+			// if the error we get back is the "transaction indexing is in progress" error or if
+			// the receipt is None.
+			//
+			// Getting the transaction indexed and taking a receipt can take a long time especially
+			// when a lot of transactions are being submitted to the node. Thus, while initially
+			// we only allowed for 60 seconds of waiting with a 1 second delay in polling, we
+			// need to allow for a larger wait time. Therefore, in here we allow for 5 minutes of
+			// waiting with exponential backoff each time we attempt to get the receipt and find
+			// that it's not available.
+			poll(
+				Self::RECEIPT_POLLING_DURATION,
+				PollingWaitBehavior::Constant(Duration::from_millis(200)),
+				move || {
+					let provider = provider.clone();
+					async move {
+						match provider.get_transaction_receipt(transaction_hash).await {
+							Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
+							Ok(None) => Ok(ControlFlow::Continue(())),
+							Err(error) => {
+								let error_string = error.to_string();
+								match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+									true => Ok(ControlFlow::Continue(())),
+									false => Err(error.into()),
+								}
+							},
+						}
+					}
+				},
+			)
+			.instrument(tracing::info_span!("Awaiting transaction receipt", ?transaction_hash))
+			.await
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn trace_transaction(
+		&self,
+		tx_hash: TxHash,
+		trace_options: GethDebugTracingOptions,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<GethTrace>> + '_>> {
+		Box::pin(async move {
+			let provider =
+				self.provider().await.context("Failed to create provider for tracing")?;
+			poll(
+				Self::TRACE_POLLING_DURATION,
+				PollingWaitBehavior::Constant(Duration::from_millis(200)),
+				move || {
+					let provider = provider.clone();
+					let trace_options = trace_options.clone();
+					async move {
+						match provider.debug_trace_transaction(tx_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
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn state_diff(
+		&self,
+		tx_hash: TxHash,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<DiffMode>> + '_>> {
+		Box::pin(async move {
+			let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+				diff_mode: Some(true),
+				disable_code: None,
+				disable_storage: None,
+			});
+			match self
+				.trace_transaction(tx_hash, trace_options)
+				.await
+				.context("Failed to trace transaction for prestate diff")?
+				.try_into_pre_state_frame()
+				.context("Failed to convert trace into pre-state frame")?
+			{
+				PreStateFrame::Diff(diff) => Ok(diff),
+				_ => anyhow::bail!("expected a diff mode trace"),
+			}
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn balance_of(
+		&self,
+		address: Address,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<U256>> + '_>> {
+		Box::pin(async move {
+			self.provider()
+				.await
+				.context("Failed to get the Geth provider")?
+				.get_balance(address)
+				.await
+				.map_err(Into::into)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn latest_state_proof(
+		&self,
+		address: Address,
+		keys: Vec<StorageKey>,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<EIP1186AccountProofResponse>> + '_>> {
+		Box::pin(async move {
+			self.provider()
+				.await
+				.context("Failed to get the Geth provider")?
+				.get_proof(address, keys)
+				.latest()
+				.await
+				.map_err(Into::into)
+		})
+	}
+
+	// #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn resolver(
+		&self,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Arc<dyn ResolverApi + '_>>> + '_>> {
+		Box::pin(async move {
+			let id = self.id;
+			let provider = self.provider().await?;
+			Ok(Arc::new(GethNodeResolver { id, provider }) as Arc<dyn ResolverApi>)
+		})
+	}
+
+	fn evm_version(&self) -> EVMVersion {
+		EVMVersion::Cancun
+	}
+
+	fn subscribe_to_full_blocks_information(
+		&self,
+	) -> Pin<
+		Box<
+			dyn Future<Output = anyhow::Result<Pin<Box<dyn Stream<Item = MinedBlockInformation>>>>>
+				+ '_,
+		>,
+	> {
+		Box::pin(async move {
+			let provider = self
+				.provider()
+				.await
+				.context("Failed to create the provider for block subscription")?;
+			let block_subscription = provider.subscribe_full_blocks();
+			let block_stream = block_subscription
+				.into_stream()
+				.await
+				.context("Failed to create the block stream")?;
+
+			let mined_block_information_stream = block_stream.filter_map(|block| async {
+				let block = block.ok()?;
+				Some(MinedBlockInformation {
+					block_number: block.number(),
+					block_timestamp: block.header.timestamp,
+					mined_gas: block.header.gas_used as _,
+					block_gas_limit: block.header.gas_limit as _,
+					transaction_hashes: block
+						.transactions
+						.into_hashes()
+						.as_hashes()
+						.expect("Must be hashes")
+						.to_vec(),
+				})
+			});
+
+			Ok(Box::pin(mined_block_information_stream)
+				as Pin<Box<dyn Stream<Item = MinedBlockInformation>>>)
+		})
+	}
+
+	fn resolve_signer_or_default(&self, address: Address) -> Address {
+		let signer_addresses: Vec<_> =
+			<EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet).collect();
+		if signer_addresses.contains(&address) {
+			address
+		} else {
+			self.wallet.default_signer().address()
+		}
+	}
+}
+
+pub struct GethNodeResolver {
+	id: u32,
+	provider: ConcreteProvider<Ethereum, Arc<EthereumWallet>>,
+}
+
+impl ResolverApi for GethNodeResolver {
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn chain_id(
+		&self,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<alloy::primitives::ChainId>> + '_>> {
+		Box::pin(async move { self.provider.get_chain_id().await.map_err(Into::into) })
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn transaction_gas_price(
+		&self,
+		tx_hash: TxHash,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<u128>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_transaction_receipt(tx_hash)
+				.await?
+				.context("Failed to get the transaction receipt")
+				.map(|receipt| receipt.effective_gas_price)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_gas_limit(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<u128>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.map(|block| block.header.gas_limit as _)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_coinbase(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<Address>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.map(|block| block.header.beneficiary)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_difficulty(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<U256>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.map(|block| U256::from_be_bytes(block.header.mix_hash.0))
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_base_fee(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<u64>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.and_then(|block| {
+					block.header.base_fee_per_gas.context("Failed to get the base fee per gas")
+				})
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_hash(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<BlockHash>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.map(|block| block.header.hash)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn block_timestamp(
+		&self,
+		number: BlockNumberOrTag,
+	) -> Pin<Box<dyn Future<Output = anyhow::Result<BlockTimestamp>> + '_>> {
+		Box::pin(async move {
+			self.provider
+				.get_block_by_number(number)
+				.await
+				.context("Failed to get the geth block")?
+				.context("Failed to get the Geth block, perhaps there are no blocks?")
+				.map(|block| block.header.timestamp)
+		})
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn last_block_number(&self) -> Pin<Box<dyn Future<Output = anyhow::Result<BlockNumber>> + '_>> {
+		Box::pin(async move { self.provider.get_block_number().await.map_err(Into::into) })
+	}
+}
+
+impl Node for GethNode {
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn shutdown(&mut self) -> anyhow::Result<()> {
+		drop(self.handle.take());
+
+		// Remove the node's database so that subsequent runs do not run on the same database. We
+		// ignore the error just in case the directory didn't exist in the first place and therefore
+		// there's nothing to be deleted.
+		let _ = remove_dir_all(self.base_directory.join(Self::DATA_DIRECTORY));
+
+		Ok(())
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn spawn(&mut self, genesis: Genesis) -> anyhow::Result<()> {
+		self.init(genesis)?.spawn_process()?;
+		Ok(())
+	}
+
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn version(&self) -> anyhow::Result<String> {
+		let output = Command::new(&self.geth)
+			.arg("--version")
+			.stdin(Stdio::null())
+			.stdout(Stdio::piped())
+			.stderr(Stdio::null())
+			.spawn()
+			.context("Failed to spawn geth --version process")?
+			.wait_with_output()
+			.context("Failed to wait for geth --version output")?
+			.stdout;
+		Ok(String::from_utf8_lossy(&output).into())
+	}
+}
+
+impl Drop for GethNode {
+	#[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+	fn drop(&mut self) {
+		self.shutdown().expect("Failed to shutdown")
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::LazyLock;
+
+	use super::*;
+
+	fn test_config() -> TestExecutionContext {
+		TestExecutionContext::default()
+	}
+
+	fn new_node() -> (TestExecutionContext, GethNode) {
+		let context = test_config();
+		let mut node = GethNode::new(&context);
+		node.init(context.genesis_configuration.genesis().unwrap().clone())
+			.expect("Failed to initialize the node")
+			.spawn_process()
+			.expect("Failed to spawn the node process");
+		(context, node)
+	}
+
+	fn shared_state() -> &'static (TestExecutionContext, GethNode) {
+		static STATE: LazyLock<(TestExecutionContext, GethNode)> = LazyLock::new(new_node);
+		&STATE
+	}
+
+	fn shared_node() -> &'static GethNode {
+		&shared_state().1
+	}
+
+	#[tokio::test]
+	async fn node_mines_simple_transfer_transaction_and_returns_receipt() {
+		// Arrange
+		let (context, node) = shared_state();
+
+		let account_address = context.wallet_configuration.wallet().default_signer().address();
+		let transaction = TransactionRequest::default()
+			.to(account_address)
+			.value(U256::from(100_000_000_000_000u128));
+
+		// Act
+		let receipt = node.execute_transaction(transaction).await;
+
+		// Assert
+		let _ = receipt.expect("Failed to get the receipt for the transfer");
+	}
+
+	#[test]
+	#[ignore = "Ignored since they take a long time to run"]
+	fn version_works() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let version = node.version();
+
+		// Assert
+		let version = version.expect("Failed to get the version");
+		assert!(version.starts_with("geth version"), "expected version string, got: '{version}'");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_chain_id_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let chain_id = node.resolver().await.unwrap().chain_id().await;
+
+		// Assert
+		let chain_id = chain_id.expect("Failed to get the chain id");
+		assert_eq!(chain_id, 420_420_420);
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_gas_limit_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let gas_limit =
+			node.resolver().await.unwrap().block_gas_limit(BlockNumberOrTag::Latest).await;
+
+		// Assert
+		let _ = gas_limit.expect("Failed to get the gas limit");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_coinbase_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let coinbase =
+			node.resolver().await.unwrap().block_coinbase(BlockNumberOrTag::Latest).await;
+
+		// Assert
+		let _ = coinbase.expect("Failed to get the coinbase");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_block_difficulty_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let block_difficulty =
+			node.resolver().await.unwrap().block_difficulty(BlockNumberOrTag::Latest).await;
+
+		// Assert
+		let _ = block_difficulty.expect("Failed to get the block difficulty");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_block_hash_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let block_hash = node.resolver().await.unwrap().block_hash(BlockNumberOrTag::Latest).await;
+
+		// Assert
+		let _ = block_hash.expect("Failed to get the block hash");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_block_timestamp_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let block_timestamp =
+			node.resolver().await.unwrap().block_timestamp(BlockNumberOrTag::Latest).await;
+
+		// Assert
+		let _ = block_timestamp.expect("Failed to get the block timestamp");
+	}
+
+	#[tokio::test]
+	#[ignore = "Ignored since they take a long time to run"]
+	async fn can_get_block_number_from_node() {
+		// Arrange
+		let node = shared_node();
+
+		// Act
+		let block_number = node.resolver().await.unwrap().last_block_number().await;
+
+		// Assert
+		let _ = block_number.expect("Failed to get the block number");
+	}
+}

crates/node/src/node_implementations/mod.rs

@@ -0,0 +1,4 @@
+pub mod geth;
+pub mod lighthouse_geth;
+pub mod substrate;
+pub mod zombienet;

crates/node/src/pool.rs

@@ -1,69 +0,0 @@
-//! This crate implements concurrent handling of testing node.
-
-use std::{
-    sync::atomic::{AtomicUsize, Ordering},
-    thread,
-};
-
-use revive_dt_common::cached_fs::read_to_string;
-
-use anyhow::Context;
-use revive_dt_config::Arguments;
-
-use crate::Node;
-
-/// The node pool starts one or more [Node] which then can be accessed
-/// in a round robbin fasion.
-pub struct NodePool<T> {
-    next: AtomicUsize,
-    nodes: Vec<T>,
-}
-
-impl<T> NodePool<T>
-where
-    T: Node + Send + 'static,
-{
-    /// Create a new Pool. This will start as many nodes as there are workers in `config`.
-    pub fn new(config: &Arguments) -> anyhow::Result<Self> {
-        let nodes = config.number_of_nodes;
-        let genesis = read_to_string(&config.genesis_file).context(format!(
-            "can not read genesis file: {}",
-            config.genesis_file.display()
-        ))?;
-
-        let mut handles = Vec::with_capacity(nodes);
-        for _ in 0..nodes {
-            let config = config.clone();
-            let genesis = genesis.clone();
-            handles.push(thread::spawn(move || spawn_node::<T>(&config, genesis)));
-        }
-
-        let mut nodes = Vec::with_capacity(nodes);
-        for handle in handles {
-            nodes.push(
-                handle
-                    .join()
-                    .map_err(|error| anyhow::anyhow!("failed to spawn node: {:?}", error))?
-                    .map_err(|error| anyhow::anyhow!("node failed to spawn: {error}"))?,
-            );
-        }
-
-        Ok(Self {
-            nodes,
-            next: Default::default(),
-        })
-    }
-
-    /// Get a handle to the next node.
-    pub fn round_robbin(&self) -> &T {
-        let current = self.next.fetch_add(1, Ordering::SeqCst) % self.nodes.len();
-        self.nodes.get(current).unwrap()
-    }
-}
-
-fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Result<T> {
-    let mut node = T::new(args);
-    tracing::info!("starting node: {}", node.connection_string());
-    node.spawn(genesis)?;
-    Ok(node)
-}

crates/node/src/provider_utils/concurrency_limiter.rs

@@ -0,0 +1,61 @@
+use std::sync::Arc;
+
+use alloy::transports::BoxFuture;
+use tokio::sync::Semaphore;
+use tower::{Layer, Service};
+
+#[derive(Clone, Debug)]
+pub struct ConcurrencyLimiterLayer {
+	semaphore: Arc<Semaphore>,
+}
+
+impl ConcurrencyLimiterLayer {
+	pub fn new(permit_count: usize) -> Self {
+		Self { semaphore: Arc::new(Semaphore::new(permit_count)) }
+	}
+}
+
+impl<S> Layer<S> for ConcurrencyLimiterLayer {
+	type Service = ConcurrencyLimiterService<S>;
+
+	fn layer(&self, inner: S) -> Self::Service {
+		ConcurrencyLimiterService { service: inner, semaphore: self.semaphore.clone() }
+	}
+}
+
+#[derive(Clone)]
+pub struct ConcurrencyLimiterService<S> {
+	service: S,
+	semaphore: Arc<Semaphore>,
+}
+
+impl<S, Request> Service<Request> for ConcurrencyLimiterService<S>
+where
+	S: Service<Request> + Send,
+	S::Future: Send + 'static,
+{
+	type Response = S::Response;
+	type Error = S::Error;
+	type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+	fn poll_ready(
+		&mut self,
+		cx: &mut std::task::Context<'_>,
+	) -> std::task::Poll<Result<(), Self::Error>> {
+		self.service.poll_ready(cx)
+	}
+
+	fn call(&mut self, req: Request) -> Self::Future {
+		let semaphore = self.semaphore.clone();
+		let future = self.service.call(req);
+
+		Box::pin(async move {
+			let _permit = semaphore.acquire().await.expect("Semaphore has been closed");
+			tracing::debug!(
+				available_permits = semaphore.available_permits(),
+				"Acquired Semaphore Permit"
+			);
+			future.await
+		})
+	}
+}

crates/node/src/provider_utils/fallback_gas_provider.rs

@@ -0,0 +1,76 @@
+use alloy::{
+	network::{Network, TransactionBuilder},
+	providers::{
+		Provider, SendableTx,
+		fillers::{GasFiller, TxFiller},
+	},
+	transports::TransportResult,
+};
+
+#[derive(Clone, Debug)]
+pub struct FallbackGasFiller {
+	inner: GasFiller,
+	default_gas_limit: u64,
+	default_max_fee_per_gas: u128,
+	default_priority_fee: u128,
+}
+
+impl FallbackGasFiller {
+	pub fn new(
+		default_gas_limit: u64,
+		default_max_fee_per_gas: u128,
+		default_priority_fee: u128,
+	) -> Self {
+		Self { inner: GasFiller, default_gas_limit, default_max_fee_per_gas, default_priority_fee }
+	}
+}
+
+impl Default for FallbackGasFiller {
+	fn default() -> Self {
+		FallbackGasFiller::new(10_000_000, 1_000_000_000, 1_000_000_000)
+	}
+}
+
+impl<N> TxFiller<N> for FallbackGasFiller
+where
+	N: Network,
+{
+	type Fillable = Option<<GasFiller as TxFiller<N>>::Fillable>;
+
+	fn status(
+		&self,
+		tx: &<N as Network>::TransactionRequest,
+	) -> alloy::providers::fillers::FillerControlFlow {
+		<GasFiller as TxFiller<N>>::status(&self.inner, tx)
+	}
+
+	fn fill_sync(&self, _: &mut alloy::providers::SendableTx<N>) {}
+
+	async fn prepare<P: Provider<N>>(
+		&self,
+		provider: &P,
+		tx: &<N as Network>::TransactionRequest,
+	) -> TransportResult<Self::Fillable> {
+		// Try to fetch GasFiller's "fillable" (gas_price, base_fee, estimate_gas, …)
+		// Propagate errors so caller can handle them appropriately
+		self.inner.prepare(provider, tx).await.map(Some)
+	}
+
+	async fn fill(
+		&self,
+		fillable: Self::Fillable,
+		mut tx: alloy::providers::SendableTx<N>,
+	) -> TransportResult<SendableTx<N>> {
+		if let Some(fill) = fillable {
+			// our inner GasFiller succeeded — use it
+			self.inner.fill(fill, tx).await
+		} else {
+			if let Some(builder) = tx.as_mut_builder() {
+				builder.set_gas_limit(self.default_gas_limit);
+				builder.set_max_fee_per_gas(self.default_max_fee_per_gas);
+				builder.set_max_priority_fee_per_gas(self.default_priority_fee);
+			}
+			Ok(tx)
+		}
+	}
+}

crates/node/src/provider_utils/mod.rs

@@ -0,0 +1,7 @@
+mod concurrency_limiter;
+mod fallback_gas_provider;
+mod provider;
+
+pub use concurrency_limiter::*;
+pub use fallback_gas_provider::*;
+pub use provider::*;

crates/node/src/provider_utils/provider.rs

@@ -0,0 +1,124 @@
+use std::{ops::ControlFlow, sync::LazyLock, time::Duration};
+
+use alloy::{
+	network::{Ethereum, Network, NetworkWallet, TransactionBuilder4844},
+	providers::{
+		Identity, PendingTransactionBuilder, Provider, ProviderBuilder, RootProvider,
+		fillers::{ChainIdFiller, FillProvider, JoinFill, NonceFiller, TxFiller, WalletFiller},
+	},
+	rpc::client::ClientBuilder,
+};
+use anyhow::{Context, Result};
+use revive_dt_common::futures::{PollingWaitBehavior, poll};
+use tracing::debug;
+
+use crate::provider_utils::{ConcurrencyLimiterLayer, FallbackGasFiller};
+
+pub type ConcreteProvider<N, W> = FillProvider<
+	JoinFill<
+		JoinFill<JoinFill<JoinFill<Identity, FallbackGasFiller>, ChainIdFiller>, NonceFiller>,
+		WalletFiller<W>,
+	>,
+	RootProvider<N>,
+	N,
+>;
+
+pub async fn construct_concurrency_limited_provider<N, W>(
+	rpc_url: &str,
+	fallback_gas_filler: FallbackGasFiller,
+	chain_id_filler: ChainIdFiller,
+	nonce_filler: NonceFiller,
+	wallet: W,
+) -> Result<ConcreteProvider<N, W>>
+where
+	N: Network<TransactionRequest: TransactionBuilder4844>,
+	W: NetworkWallet<N>,
+	Identity: TxFiller<N>,
+	FallbackGasFiller: TxFiller<N>,
+	ChainIdFiller: TxFiller<N>,
+	NonceFiller: TxFiller<N>,
+	WalletFiller<W>: TxFiller<N>,
+{
+	// This is a global limit on the RPC concurrency that applies to all of the providers created
+	// by the framework. With this limit, it means that we can have a maximum of N concurrent
+	// requests at any point of time and no more than that. This is done in an effort to stabilize
+	// the framework from some of the interment issues that we've been seeing related to RPC calls.
+	static GLOBAL_CONCURRENCY_LIMITER_LAYER: LazyLock<ConcurrencyLimiterLayer> =
+		LazyLock::new(|| ConcurrencyLimiterLayer::new(10));
+
+	let client = ClientBuilder::default()
+		.layer(GLOBAL_CONCURRENCY_LIMITER_LAYER.clone())
+		.connect(rpc_url)
+		.await
+		.context("Failed to construct the RPC client")?;
+
+	let provider = ProviderBuilder::new()
+		.disable_recommended_fillers()
+		.network::<N>()
+		.filler(fallback_gas_filler)
+		.filler(chain_id_filler)
+		.filler(nonce_filler)
+		.wallet(wallet)
+		.connect_client(client);
+
+	Ok(provider)
+}
+
+pub async fn execute_transaction<N, W>(
+	provider: ConcreteProvider<N, W>,
+	transaction: N::TransactionRequest,
+) -> Result<N::ReceiptResponse>
+where
+	N: Network<
+			TransactionRequest: TransactionBuilder4844,
+			TxEnvelope = <Ethereum as Network>::TxEnvelope,
+		>,
+	W: NetworkWallet<N>,
+	Identity: TxFiller<N>,
+	FallbackGasFiller: TxFiller<N>,
+	ChainIdFiller: TxFiller<N>,
+	NonceFiller: TxFiller<N>,
+	WalletFiller<W>: TxFiller<N>,
+{
+	let sendable_transaction =
+		provider.fill(transaction).await.context("Failed to fill transaction")?;
+
+	let transaction_envelope = sendable_transaction
+		.try_into_envelope()
+		.context("Failed to convert transaction into an envelope")?;
+	let tx_hash = *transaction_envelope.tx_hash();
+
+	let mut pending_transaction = match provider.send_tx_envelope(transaction_envelope).await {
+		Ok(pending_transaction) => pending_transaction,
+		Err(error) => {
+			let error_string = error.to_string();
+
+			if error_string.contains("Transaction Already Imported") {
+				PendingTransactionBuilder::<N>::new(provider.root().clone(), tx_hash)
+			} else {
+				return Err(error).context(format!("Failed to submit transaction {tx_hash}"));
+			}
+		},
+	};
+	debug!(%tx_hash, "Submitted Transaction");
+
+	pending_transaction.set_timeout(Some(Duration::from_secs(120)));
+	let tx_hash = pending_transaction
+		.watch()
+		.await
+		.context(format!("Transaction inclusion watching timeout for {tx_hash}"))?;
+
+	debug!(%tx_hash, "Transaction included, polling for receipt");
+
+	poll(Duration::from_secs(30), PollingWaitBehavior::Constant(Duration::from_secs(3)), || {
+		let provider = provider.clone();
+		async move {
+			match provider.get_transaction_receipt(tx_hash).await {
+				Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
+				_ => Ok(ControlFlow::Continue(())),
+			}
+		}
+	})
+	.await
+	.context(format!("Polling for receipt timed out for {tx_hash}"))
+}

crates/report/Cargo.toml

@@ -13,7 +13,16 @@ revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }
 revive-dt-compiler = { workspace = true }
 
+alloy = { workspace = true }
 anyhow = { workspace = true }
-tracing = { workspace = true }
+paste = { workspace = true }
+indexmap = { workspace = true, features = ["serde"] }
+semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_with = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+
+[lints]
+workspace = true

crates/report/src/aggregator.rs

@@ -0,0 +1,497 @@
+//! Implementation of the report aggregator task which consumes the events sent by the various
+//! reporters and combines them into a single unified report.
+
+use std::{
+	collections::{BTreeMap, BTreeSet, HashMap, HashSet},
+	fs::OpenOptions,
+	path::PathBuf,
+	time::{SystemTime, UNIX_EPOCH},
+};
+
+use alloy::primitives::Address;
+use anyhow::{Context as _, Result};
+use indexmap::IndexMap;
+use revive_dt_common::types::PlatformIdentifier;
+use revive_dt_compiler::{CompilerInput, CompilerOutput, Mode};
+use revive_dt_config::Context;
+use revive_dt_format::{case::CaseIdx, corpus::Corpus, metadata::ContractInstance};
+use semver::Version;
+use serde::Serialize;
+use serde_with::{DisplayFromStr, serde_as};
+use tokio::sync::{
+	broadcast::{Sender, channel},
+	mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel},
+};
+use tracing::debug;
+
+use crate::*;
+
+pub struct ReportAggregator {
+	/* Internal Report State */
+	report: Report,
+	remaining_cases: HashMap<MetadataFilePath, HashMap<Mode, HashSet<CaseIdx>>>,
+	/* Channels */
+	runner_tx: Option<UnboundedSender<RunnerEvent>>,
+	runner_rx: UnboundedReceiver<RunnerEvent>,
+	listener_tx: Sender<ReporterEvent>,
+}
+
+impl ReportAggregator {
+	pub fn new(context: Context) -> Self {
+		let (runner_tx, runner_rx) = unbounded_channel::<RunnerEvent>();
+		let (listener_tx, _) = channel::<ReporterEvent>(1024);
+		Self {
+			report: Report::new(context),
+			remaining_cases: Default::default(),
+			runner_tx: Some(runner_tx),
+			runner_rx,
+			listener_tx,
+		}
+	}
+
+	pub fn into_task(mut self) -> (Reporter, impl Future<Output = Result<()>>) {
+		let reporter = self
+			.runner_tx
+			.take()
+			.map(Into::into)
+			.expect("Can't fail since this can only be called once");
+		(reporter, async move { self.aggregate().await })
+	}
+
+	async fn aggregate(mut self) -> Result<()> {
+		debug!("Starting to aggregate report");
+
+		while let Some(event) = self.runner_rx.recv().await {
+			debug!(?event, "Received Event");
+			match event {
+				RunnerEvent::SubscribeToEvents(event) => {
+					self.handle_subscribe_to_events_event(*event);
+				},
+				RunnerEvent::CorpusFileDiscovery(event) =>
+					self.handle_corpus_file_discovered_event(*event),
+				RunnerEvent::MetadataFileDiscovery(event) => {
+					self.handle_metadata_file_discovery_event(*event);
+				},
+				RunnerEvent::TestCaseDiscovery(event) => {
+					self.handle_test_case_discovery(*event);
+				},
+				RunnerEvent::TestSucceeded(event) => {
+					self.handle_test_succeeded_event(*event);
+				},
+				RunnerEvent::TestFailed(event) => {
+					self.handle_test_failed_event(*event);
+				},
+				RunnerEvent::TestIgnored(event) => {
+					self.handle_test_ignored_event(*event);
+				},
+				RunnerEvent::NodeAssigned(event) => {
+					self.handle_node_assigned_event(*event);
+				},
+				RunnerEvent::PreLinkContractsCompilationSucceeded(event) =>
+					self.handle_pre_link_contracts_compilation_succeeded_event(*event),
+				RunnerEvent::PostLinkContractsCompilationSucceeded(event) =>
+					self.handle_post_link_contracts_compilation_succeeded_event(*event),
+				RunnerEvent::PreLinkContractsCompilationFailed(event) =>
+					self.handle_pre_link_contracts_compilation_failed_event(*event),
+				RunnerEvent::PostLinkContractsCompilationFailed(event) =>
+					self.handle_post_link_contracts_compilation_failed_event(*event),
+				RunnerEvent::LibrariesDeployed(event) => {
+					self.handle_libraries_deployed_event(*event);
+				},
+				RunnerEvent::ContractDeployed(event) => {
+					self.handle_contract_deployed_event(*event);
+				},
+				RunnerEvent::Completion(event) => {
+					self.handle_completion(*event);
+					break;
+				},
+			}
+		}
+		debug!("Report aggregation completed");
+
+		let file_name = {
+			let current_timestamp = SystemTime::now()
+				.duration_since(UNIX_EPOCH)
+				.context("System clock is before UNIX_EPOCH; cannot compute report timestamp")?
+				.as_secs();
+			let mut file_name = current_timestamp.to_string();
+			file_name.push_str(".json");
+			file_name
+		};
+		let file_path =
+			self.report.context.working_directory_configuration().as_path().join(file_name);
+		let file = OpenOptions::new()
+			.create(true)
+			.write(true)
+			.truncate(true)
+			.read(false)
+			.open(&file_path)
+			.with_context(|| {
+				format!("Failed to open report file for writing: {}", file_path.display())
+			})?;
+		serde_json::to_writer_pretty(&file, &self.report).with_context(|| {
+			format!("Failed to serialize report JSON to {}", file_path.display())
+		})?;
+
+		Ok(())
+	}
+
+	fn handle_subscribe_to_events_event(&self, event: SubscribeToEventsEvent) {
+		let _ = event.tx.send(self.listener_tx.subscribe());
+	}
+
+	fn handle_corpus_file_discovered_event(&mut self, event: CorpusFileDiscoveryEvent) {
+		self.report.corpora.push(event.corpus);
+	}
+
+	fn handle_metadata_file_discovery_event(&mut self, event: MetadataFileDiscoveryEvent) {
+		self.report.metadata_files.insert(event.path.clone());
+	}
+
+	fn handle_test_case_discovery(&mut self, event: TestCaseDiscoveryEvent) {
+		self.remaining_cases
+			.entry(event.test_specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(event.test_specifier.solc_mode.clone())
+			.or_default()
+			.insert(event.test_specifier.case_idx);
+	}
+
+	fn handle_test_succeeded_event(&mut self, event: TestSucceededEvent) {
+		// Remove this from the set of cases we're tracking since it has completed.
+		self.remaining_cases
+			.entry(event.test_specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(event.test_specifier.solc_mode.clone())
+			.or_default()
+			.remove(&event.test_specifier.case_idx);
+
+		// Add information on the fact that the case was ignored to the report.
+		let test_case_report = self.test_case_report(&event.test_specifier);
+		test_case_report.status =
+			Some(TestCaseStatus::Succeeded { steps_executed: event.steps_executed });
+		self.handle_post_test_case_status_update(&event.test_specifier);
+	}
+
+	fn handle_test_failed_event(&mut self, event: TestFailedEvent) {
+		// Remove this from the set of cases we're tracking since it has completed.
+		self.remaining_cases
+			.entry(event.test_specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(event.test_specifier.solc_mode.clone())
+			.or_default()
+			.remove(&event.test_specifier.case_idx);
+
+		// Add information on the fact that the case was ignored to the report.
+		let test_case_report = self.test_case_report(&event.test_specifier);
+		test_case_report.status = Some(TestCaseStatus::Failed { reason: event.reason });
+		self.handle_post_test_case_status_update(&event.test_specifier);
+	}
+
+	fn handle_test_ignored_event(&mut self, event: TestIgnoredEvent) {
+		// Remove this from the set of cases we're tracking since it has completed.
+		self.remaining_cases
+			.entry(event.test_specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(event.test_specifier.solc_mode.clone())
+			.or_default()
+			.remove(&event.test_specifier.case_idx);
+
+		// Add information on the fact that the case was ignored to the report.
+		let test_case_report = self.test_case_report(&event.test_specifier);
+		test_case_report.status = Some(TestCaseStatus::Ignored {
+			reason: event.reason,
+			additional_fields: event.additional_fields,
+		});
+		self.handle_post_test_case_status_update(&event.test_specifier);
+	}
+
+	fn handle_post_test_case_status_update(&mut self, specifier: &TestSpecifier) {
+		let remaining_cases = self
+			.remaining_cases
+			.entry(specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(specifier.solc_mode.clone())
+			.or_default();
+		if !remaining_cases.is_empty() {
+			return;
+		}
+
+		let case_status = self
+			.report
+			.test_case_information
+			.entry(specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(specifier.solc_mode.clone())
+			.or_default()
+			.iter()
+			.map(|(case_idx, case_report)| {
+				(*case_idx, case_report.status.clone().expect("Can't be uninitialized"))
+			})
+			.collect::<BTreeMap<_, _>>();
+		let event = ReporterEvent::MetadataFileSolcModeCombinationExecutionCompleted {
+			metadata_file_path: specifier.metadata_file_path.clone().into(),
+			mode: specifier.solc_mode.clone(),
+			case_status,
+		};
+
+		// According to the documentation on send, the sending fails if there are no more receiver
+		// handles. Therefore, this isn't an error that we want to bubble up or anything. If we fail
+		// to send then we ignore the error.
+		let _ = self.listener_tx.send(event);
+	}
+
+	fn handle_node_assigned_event(&mut self, event: NodeAssignedEvent) {
+		let execution_information = self.execution_information(&ExecutionSpecifier {
+			test_specifier: event.test_specifier,
+			node_id: event.id,
+			platform_identifier: event.platform_identifier,
+		});
+		execution_information.node = Some(TestCaseNodeInformation {
+			id: event.id,
+			platform_identifier: event.platform_identifier,
+			connection_string: event.connection_string,
+		});
+	}
+
+	fn handle_pre_link_contracts_compilation_succeeded_event(
+		&mut self,
+		event: PreLinkContractsCompilationSucceededEvent,
+	) {
+		let include_input = self.report.context.report_configuration().include_compiler_input;
+		let include_output = self.report.context.report_configuration().include_compiler_output;
+
+		let execution_information = self.execution_information(&event.execution_specifier);
+
+		let compiler_input = if include_input { event.compiler_input } else { None };
+		let compiler_output = if include_output { Some(event.compiler_output) } else { None };
+
+		execution_information.pre_link_compilation_status = Some(CompilationStatus::Success {
+			is_cached: event.is_cached,
+			compiler_version: event.compiler_version,
+			compiler_path: event.compiler_path,
+			compiler_input,
+			compiler_output,
+		});
+	}
+
+	fn handle_post_link_contracts_compilation_succeeded_event(
+		&mut self,
+		event: PostLinkContractsCompilationSucceededEvent,
+	) {
+		let include_input = self.report.context.report_configuration().include_compiler_input;
+		let include_output = self.report.context.report_configuration().include_compiler_output;
+
+		let execution_information = self.execution_information(&event.execution_specifier);
+
+		let compiler_input = if include_input { event.compiler_input } else { None };
+		let compiler_output = if include_output { Some(event.compiler_output) } else { None };
+
+		execution_information.post_link_compilation_status = Some(CompilationStatus::Success {
+			is_cached: event.is_cached,
+			compiler_version: event.compiler_version,
+			compiler_path: event.compiler_path,
+			compiler_input,
+			compiler_output,
+		});
+	}
+
+	fn handle_pre_link_contracts_compilation_failed_event(
+		&mut self,
+		event: PreLinkContractsCompilationFailedEvent,
+	) {
+		let execution_information = self.execution_information(&event.execution_specifier);
+
+		execution_information.pre_link_compilation_status = Some(CompilationStatus::Failure {
+			reason: event.reason,
+			compiler_version: event.compiler_version,
+			compiler_path: event.compiler_path,
+			compiler_input: event.compiler_input,
+		});
+	}
+
+	fn handle_post_link_contracts_compilation_failed_event(
+		&mut self,
+		event: PostLinkContractsCompilationFailedEvent,
+	) {
+		let execution_information = self.execution_information(&event.execution_specifier);
+
+		execution_information.post_link_compilation_status = Some(CompilationStatus::Failure {
+			reason: event.reason,
+			compiler_version: event.compiler_version,
+			compiler_path: event.compiler_path,
+			compiler_input: event.compiler_input,
+		});
+	}
+
+	fn handle_libraries_deployed_event(&mut self, event: LibrariesDeployedEvent) {
+		self.execution_information(&event.execution_specifier).deployed_libraries =
+			Some(event.libraries);
+	}
+
+	fn handle_contract_deployed_event(&mut self, event: ContractDeployedEvent) {
+		self.execution_information(&event.execution_specifier)
+			.deployed_contracts
+			.get_or_insert_default()
+			.insert(event.contract_instance, event.address);
+	}
+
+	fn handle_completion(&mut self, _: CompletionEvent) {
+		self.runner_rx.close();
+	}
+
+	fn test_case_report(&mut self, specifier: &TestSpecifier) -> &mut TestCaseReport {
+		self.report
+			.test_case_information
+			.entry(specifier.metadata_file_path.clone().into())
+			.or_default()
+			.entry(specifier.solc_mode.clone())
+			.or_default()
+			.entry(specifier.case_idx)
+			.or_default()
+	}
+
+	fn execution_information(
+		&mut self,
+		specifier: &ExecutionSpecifier,
+	) -> &mut ExecutionInformation {
+		let test_case_report = self.test_case_report(&specifier.test_specifier);
+		test_case_report
+			.platform_execution
+			.entry(specifier.platform_identifier)
+			.or_default()
+			.get_or_insert_default()
+	}
+}
+
+#[serde_as]
+#[derive(Clone, Debug, Serialize)]
+pub struct Report {
+	/// The context that the tool was started up with.
+	pub context: Context,
+	/// The list of corpus files that the tool found.
+	pub corpora: Vec<Corpus>,
+	/// The list of metadata files that were found by the tool.
+	pub metadata_files: BTreeSet<MetadataFilePath>,
+	/// Information relating to each test case.
+	#[serde_as(as = "BTreeMap<_, HashMap<DisplayFromStr, BTreeMap<DisplayFromStr, _>>>")]
+	pub test_case_information:
+		BTreeMap<MetadataFilePath, HashMap<Mode, BTreeMap<CaseIdx, TestCaseReport>>>,
+}
+
+impl Report {
+	pub fn new(context: Context) -> Self {
+		Self {
+			context,
+			corpora: Default::default(),
+			metadata_files: Default::default(),
+			test_case_information: Default::default(),
+		}
+	}
+}
+
+#[derive(Clone, Debug, Serialize, Default)]
+pub struct TestCaseReport {
+	/// Information on the status of the test case and whether it succeeded, failed, or was
+	/// ignored.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub status: Option<TestCaseStatus>,
+	/// Information related to the execution on one of the platforms.
+	pub platform_execution: BTreeMap<PlatformIdentifier, Option<ExecutionInformation>>,
+}
+
+/// Information related to the status of the test. Could be that the test succeeded, failed, or that
+/// it was ignored.
+#[derive(Clone, Debug, Serialize)]
+#[serde(tag = "status")]
+pub enum TestCaseStatus {
+	/// The test case succeeded.
+	Succeeded {
+		/// The number of steps of the case that were executed.
+		steps_executed: usize,
+	},
+	/// The test case failed.
+	Failed {
+		/// The reason for the failure of the test case.
+		reason: String,
+	},
+	/// The test case was ignored. This variant carries information related to why it was ignored.
+	Ignored {
+		/// The reason behind the test case being ignored.
+		reason: String,
+		/// Additional fields that describe more information on why the test case is ignored.
+		#[serde(flatten)]
+		additional_fields: IndexMap<String, serde_json::Value>,
+	},
+}
+
+/// Information related to the platform node that's being used to execute the step.
+#[derive(Clone, Debug, Serialize)]
+pub struct TestCaseNodeInformation {
+	/// The ID of the node that this case is being executed on.
+	pub id: usize,
+	/// The platform of the node.
+	pub platform_identifier: PlatformIdentifier,
+	/// The connection string of the node.
+	pub connection_string: String,
+}
+
+/// Execution information tied to the platform.
+#[derive(Clone, Debug, Default, Serialize)]
+pub struct ExecutionInformation {
+	/// Information related to the node assigned to this test case.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub node: Option<TestCaseNodeInformation>,
+	/// Information on the pre-link compiled contracts.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub pre_link_compilation_status: Option<CompilationStatus>,
+	/// Information on the post-link compiled contracts.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub post_link_compilation_status: Option<CompilationStatus>,
+	/// Information on the deployed libraries.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub deployed_libraries: Option<BTreeMap<ContractInstance, Address>>,
+	/// Information on the deployed contracts.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub deployed_contracts: Option<BTreeMap<ContractInstance, Address>>,
+}
+
+/// Information related to compilation
+#[derive(Clone, Debug, Serialize)]
+#[serde(tag = "status")]
+pub enum CompilationStatus {
+	/// The compilation was successful.
+	Success {
+		/// A flag with information on whether the compilation artifacts were cached or not.
+		is_cached: bool,
+		/// The version of the compiler used to compile the contracts.
+		compiler_version: Version,
+		/// The path of the compiler used to compile the contracts.
+		compiler_path: PathBuf,
+		/// The input provided to the compiler to compile the contracts. This is only included if
+		/// the appropriate flag is set in the CLI context and if the contracts were not cached and
+		/// the compiler was invoked.
+		#[serde(skip_serializing_if = "Option::is_none")]
+		compiler_input: Option<CompilerInput>,
+		/// The output of the compiler. This is only included if the appropriate flag is set in the
+		/// CLI contexts.
+		#[serde(skip_serializing_if = "Option::is_none")]
+		compiler_output: Option<CompilerOutput>,
+	},
+	/// The compilation failed.
+	Failure {
+		/// The failure reason.
+		reason: String,
+		/// The version of the compiler used to compile the contracts.
+		#[serde(skip_serializing_if = "Option::is_none")]
+		compiler_version: Option<Version>,
+		/// The path of the compiler used to compile the contracts.
+		#[serde(skip_serializing_if = "Option::is_none")]
+		compiler_path: Option<PathBuf>,
+		/// The input provided to the compiler to compile the contracts. This is only included if
+		/// the appropriate flag is set in the CLI context and if the contracts were not cached and
+		/// the compiler was invoked.
+		#[serde(skip_serializing_if = "Option::is_none")]
+		compiler_input: Option<CompilerInput>,
+	},
+}

crates/report/src/analyzer.rs

@@ -1,81 +0,0 @@
-//! The report analyzer enriches the raw report data.
-
-use revive_dt_compiler::CompilerOutput;
-use serde::{Deserialize, Serialize};
-
-use crate::reporter::CompilationTask;
-
-/// Provides insights into how well the compilers perform.
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, PartialOrd)]
-pub struct CompilerStatistics {
-    /// The sum of contracts observed.
-    pub n_contracts: usize,
-    /// The mean size of compiled contracts.
-    pub mean_code_size: usize,
-    /// The mean size of the optimized YUL IR.
-    pub mean_yul_size: usize,
-    /// Is a proxy because the YUL also contains a lot of comments.
-    pub yul_to_bytecode_size_ratio: f32,
-}
-
-impl CompilerStatistics {
-    /// Cumulatively update the statistics with the next compiler task.
-    pub fn sample(&mut self, compilation_task: &CompilationTask) {
-        let Some(CompilerOutput { contracts }) = &compilation_task.json_output else {
-            return;
-        };
-
-        for (_solidity, contracts) in contracts.iter() {
-            for (_name, (bytecode, _)) in contracts.iter() {
-                // The EVM bytecode can be unlinked and thus is not necessarily a decodable hex
-                // string; for our statistics this is a good enough approximation.
-                let bytecode_size = bytecode.len() / 2;
-
-                // TODO: for the time being we set the yul_size to be zero. We need to change this
-                // when we overhaul the reporting.
-
-                self.update_sizes(bytecode_size, 0);
-            }
-        }
-    }
-
-    /// Updates the size statistics cumulatively.
-    fn update_sizes(&mut self, bytecode_size: usize, yul_size: usize) {
-        let n_previous = self.n_contracts;
-        let n_current = self.n_contracts + 1;
-
-        self.n_contracts = n_current;
-
-        self.mean_code_size = (n_previous * self.mean_code_size + bytecode_size) / n_current;
-        self.mean_yul_size = (n_previous * self.mean_yul_size + yul_size) / n_current;
-
-        if self.mean_code_size > 0 {
-            self.yul_to_bytecode_size_ratio =
-                self.mean_yul_size as f32 / self.mean_code_size as f32;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::CompilerStatistics;
-
-    #[test]
-    fn compiler_statistics() {
-        let mut received = CompilerStatistics::default();
-        received.update_sizes(0, 0);
-        received.update_sizes(3, 37);
-        received.update_sizes(123, 456);
-
-        let mean_code_size = 41; // rounding error from integer truncation
-        let mean_yul_size = 164;
-        let expected = CompilerStatistics {
-            n_contracts: 3,
-            mean_code_size,
-            mean_yul_size,
-            yul_to_bytecode_size_ratio: mean_yul_size as f32 / mean_code_size as f32,
-        };
-
-        assert_eq!(received, expected);
-    }
-}

crates/report/src/common.rs

@@ -0,0 +1,37 @@
+//! Common types and functions used throughout the crate.
+
+use std::{path::PathBuf, sync::Arc};
+
+use revive_dt_common::{define_wrapper_type, types::PlatformIdentifier};
+use revive_dt_compiler::Mode;
+use revive_dt_format::{case::CaseIdx, steps::StepPath};
+use serde::{Deserialize, Serialize};
+
+define_wrapper_type!(
+	#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+	#[serde(transparent)]
+	pub struct MetadataFilePath(PathBuf);
+);
+
+/// An absolute specifier for a test.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct TestSpecifier {
+	pub solc_mode: Mode,
+	pub metadata_file_path: PathBuf,
+	pub case_idx: CaseIdx,
+}
+
+/// An absolute path for a test that also includes information about the node that it's assigned to
+/// and what platform it belongs to.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct ExecutionSpecifier {
+	pub test_specifier: Arc<TestSpecifier>,
+	pub node_id: usize,
+	pub platform_identifier: PlatformIdentifier,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct StepExecutionSpecifier {
+	pub execution_specifier: Arc<ExecutionSpecifier>,
+	pub step_idx: StepPath,
+}

crates/report/src/lib.rs

@@ -1,4 +1,11 @@
-//! The revive differential tests reporting facility.
+//! This crate implements the reporting infrastructure for the differential testing tool.
 
-pub mod analyzer;
+mod aggregator;
-pub mod reporter;
+mod common;
+mod reporter_event;
+mod runner_event;
+
+pub use aggregator::*;
+pub use common::*;
+pub use reporter_event::*;
+pub use runner_event::*;

crates/report/src/reporter.rs

@@ -1,236 +0,0 @@
-//! The reporter is the central place observing test execution by collecting data.
-//!
-//! The data collected gives useful insights into the outcome of the test run
-//! and helps identifying and reproducing failing cases.
-
-use std::{
-    collections::HashMap,
-    fs::{self, File, create_dir_all},
-    path::PathBuf,
-    sync::{Mutex, OnceLock},
-    time::{SystemTime, UNIX_EPOCH},
-};
-
-use anyhow::Context;
-use serde::Serialize;
-
-use revive_dt_common::types::Mode;
-use revive_dt_compiler::{CompilerInput, CompilerOutput};
-use revive_dt_config::{Arguments, TestingPlatform};
-use revive_dt_format::corpus::Corpus;
-
-use crate::analyzer::CompilerStatistics;
-
-pub(crate) static REPORTER: OnceLock<Mutex<Report>> = OnceLock::new();
-
-/// The `Report` datastructure stores all relevant inforamtion required for generating reports.
-#[derive(Clone, Debug, Default, Serialize)]
-pub struct Report {
-    /// The configuration used during the test.
-    pub config: Arguments,
-    /// The observed test corpora.
-    pub corpora: Vec<Corpus>,
-    /// The observed test definitions.
-    pub metadata_files: Vec<PathBuf>,
-    /// The observed compilation results.
-    pub compiler_results: HashMap<TestingPlatform, Vec<CompilationResult>>,
-    /// The observed compilation statistics.
-    pub compiler_statistics: HashMap<TestingPlatform, CompilerStatistics>,
-    /// The file name this is serialized to.
-    #[serde(skip)]
-    directory: PathBuf,
-}
-
-/// Contains a compiled contract.
-#[derive(Clone, Debug, Serialize)]
-pub struct CompilationTask {
-    /// The observed compiler input.
-    pub json_input: CompilerInput,
-    /// The observed compiler output.
-    pub json_output: Option<CompilerOutput>,
-    /// The observed compiler mode.
-    pub mode: Mode,
-    /// The observed compiler version.
-    pub compiler_version: String,
-    /// The observed error, if any.
-    pub error: Option<String>,
-}
-
-/// Represents a report about a compilation task.
-#[derive(Clone, Debug, Serialize)]
-pub struct CompilationResult {
-    /// The observed compilation task.
-    pub compilation_task: CompilationTask,
-    /// The linked span.
-    pub span: Span,
-}
-
-/// The [Span] struct indicates the context of what is being reported.
-#[derive(Clone, Copy, Debug, Serialize)]
-pub struct Span {
-    /// The corpus index this belongs to.
-    corpus: usize,
-    /// The metadata file this belongs to.
-    metadata_file: usize,
-    /// The index of the case definition this belongs to.
-    case: usize,
-    /// The index of the case input this belongs to.
-    input: usize,
-}
-
-impl Report {
-    /// The file name where this report will be written to.
-    pub const FILE_NAME: &str = "report.json";
-
-    /// The [Span] is expected to initialize the reporter by providing the config.
-    const INITIALIZED_VIA_SPAN: &str = "requires a Span which initializes the reporter";
-
-    /// Create a new [Report].
-    fn new(config: Arguments) -> anyhow::Result<Self> {
-        let now = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_millis();
-
-        let directory = config.directory().join("report").join(format!("{now}"));
-        if !directory.exists() {
-            create_dir_all(&directory)?;
-        }
-
-        Ok(Self {
-            config,
-            directory,
-            ..Default::default()
-        })
-    }
-
-    /// Add a compilation task to the report.
-    pub fn compilation(span: Span, platform: TestingPlatform, compilation_task: CompilationTask) {
-        let mut report = REPORTER
-            .get()
-            .expect(Report::INITIALIZED_VIA_SPAN)
-            .lock()
-            .unwrap();
-
-        report
-            .compiler_statistics
-            .entry(platform)
-            .or_default()
-            .sample(&compilation_task);
-
-        report
-            .compiler_results
-            .entry(platform)
-            .or_default()
-            .push(CompilationResult {
-                compilation_task,
-                span,
-            });
-    }
-
-    /// Write the report to disk.
-    pub fn save() -> anyhow::Result<()> {
-        let Some(reporter) = REPORTER.get() else {
-            return Ok(());
-        };
-        let report = reporter.lock().unwrap();
-
-        if let Err(error) = report.write_to_file() {
-            anyhow::bail!("can not write report: {error}");
-        }
-
-        if report.config.extract_problems {
-            if let Err(error) = report.save_compiler_problems() {
-                anyhow::bail!("can not write compiler problems: {error}");
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Write compiler problems to disk for later debugging.
-    pub fn save_compiler_problems(&self) -> anyhow::Result<()> {
-        for (platform, results) in self.compiler_results.iter() {
-            for result in results {
-                // ignore if there were no errors
-                if result.compilation_task.error.is_none() {
-                    continue;
-                }
-
-                let path = &self.metadata_files[result.span.metadata_file]
-                    .parent()
-                    .unwrap()
-                    .join(format!("{platform}_errors"));
-                if !path.exists() {
-                    create_dir_all(path)?;
-                }
-
-                if let Some(error) = result.compilation_task.error.as_ref() {
-                    fs::write(path.join("compiler_error.txt"), error)?;
-                }
-
-                if let Some(errors) = result.compilation_task.json_output.as_ref() {
-                    let file = File::create(path.join("compiler_output.txt"))?;
-                    serde_json::to_writer_pretty(file, &errors)?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn write_to_file(&self) -> anyhow::Result<()> {
-        let path = self.directory.join(Self::FILE_NAME);
-
-        let file = File::create(&path).context(path.display().to_string())?;
-        serde_json::to_writer_pretty(file, &self)?;
-
-        tracing::info!("report written to: {}", path.display());
-
-        Ok(())
-    }
-}
-
-impl Span {
-    /// Create a new [Span] with case and input index at 0.
-    ///
-    /// Initializes the reporting facility on the first call.
-    pub fn new(corpus: Corpus, config: Arguments) -> anyhow::Result<Self> {
-        let report = Mutex::new(Report::new(config)?);
-        let mut reporter = REPORTER.get_or_init(|| report).lock().unwrap();
-        reporter.corpora.push(corpus);
-
-        Ok(Self {
-            corpus: reporter.corpora.len() - 1,
-            metadata_file: 0,
-            case: 0,
-            input: 0,
-        })
-    }
-
-    /// Advance to the next metadata file: Resets the case input index to 0.
-    pub fn next_metadata(&mut self, metadata_file: PathBuf) {
-        let mut reporter = REPORTER
-            .get()
-            .expect(Report::INITIALIZED_VIA_SPAN)
-            .lock()
-            .unwrap();
-
-        reporter.metadata_files.push(metadata_file);
-
-        self.metadata_file = reporter.metadata_files.len() - 1;
-        self.case = 0;
-        self.input = 0;
-    }
-
-    /// Advance to the next case: Increas the case index by one and resets the input index to 0.
-    pub fn next_case(&mut self) {
-        self.case += 1;
-        self.input = 0;
-    }
-
-    /// Advance to the next input.
-    pub fn next_input(&mut self) {
-        self.input += 1;
-    }
-}

crates/report/src/reporter_event.rs

@@ -0,0 +1,22 @@
+//! A reporter event sent by the report aggregator to the various listeners.
+
+use std::collections::BTreeMap;
+
+use revive_dt_compiler::Mode;
+use revive_dt_format::case::CaseIdx;
+
+use crate::{MetadataFilePath, TestCaseStatus};
+
+#[derive(Clone, Debug)]
+pub enum ReporterEvent {
+	/// An event sent by the reporter once an entire metadata file and solc mode combination has
+	/// finished execution.
+	MetadataFileSolcModeCombinationExecutionCompleted {
+		/// The path of the metadata file.
+		metadata_file_path: MetadataFilePath,
+		/// The Solc mode that this metadata file was executed in.
+		mode: Mode,
+		/// The status of each one of the cases.
+		case_status: BTreeMap<CaseIdx, TestCaseStatus>,
+	},
+}

crates/report/src/runner_event.rs

@@ -0,0 +1,635 @@
+//! The types associated with the events sent by the runner to the reporter.
+#![allow(dead_code)]
+
+use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
+
+use alloy::primitives::Address;
+use anyhow::Context as _;
+use indexmap::IndexMap;
+use revive_dt_common::types::PlatformIdentifier;
+use revive_dt_compiler::{CompilerInput, CompilerOutput};
+use revive_dt_format::{
+	corpus::Corpus,
+	metadata::{ContractInstance, Metadata},
+};
+use semver::Version;
+use tokio::sync::{broadcast, oneshot};
+
+use crate::{ExecutionSpecifier, ReporterEvent, TestSpecifier, common::MetadataFilePath};
+
+macro_rules! __report_gen_emit_test_specific {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )*
+        ;
+        $( $aname:ident : $aty:ty, )*
+    ) => {
+        paste::paste! {
+            pub fn [< report_ $variant_ident:snake _event >](
+                &self
+                $(, $bname: impl Into<$bty> )*
+                $(, $aname: impl Into<$aty> )*
+            ) -> anyhow::Result<()> {
+                self.report([< $variant_ident Event >] {
+                    $skip_field: self.test_specifier.clone()
+                    $(, $bname: $bname.into() )*
+                    $(, $aname: $aname.into() )*
+                })
+            }
+        }
+    };
+}
+
+macro_rules! __report_gen_emit_test_specific_by_parse {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )* ; $( $aname:ident : $aty:ty, )*
+    ) => {
+        __report_gen_emit_test_specific!(
+            $ident, $variant_ident, $skip_field;
+            $( $bname : $bty, )* ; $( $aname : $aty, )*
+        );
+    };
+}
+
+macro_rules! __report_gen_scan_before {
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        test_specifier : $skip_ty:ty,
+        $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_emit_test_specific_by_parse!(
+            $ident, $variant_ident, test_specifier;
+            $( $before : $bty, )* ; $( $after : $aty, )*
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        $name:ident : $ty:ty, $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_scan_before!(
+            $ident, $variant_ident;
+            $( $before : $bty, )* $name : $ty,
+            ;
+            $( $after : $aty, )*
+            ;
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        ;
+    ) => {};
+}
+
+macro_rules! __report_gen_for_variant {
+    (
+        $ident:ident,
+        $variant_ident:ident;
+    ) => {};
+    (
+        $ident:ident,
+        $variant_ident:ident;
+        $( $field_ident:ident : $field_ty:ty ),+ $(,)?
+    ) => {
+        __report_gen_scan_before!(
+            $ident, $variant_ident;
+            ;
+            $( $field_ident : $field_ty, )*
+            ;
+        );
+    };
+}
+
+macro_rules! __report_gen_emit_execution_specific {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )*
+        ;
+        $( $aname:ident : $aty:ty, )*
+    ) => {
+        paste::paste! {
+            pub fn [< report_ $variant_ident:snake _event >](
+                &self
+                $(, $bname: impl Into<$bty> )*
+                $(, $aname: impl Into<$aty> )*
+            ) -> anyhow::Result<()> {
+                self.report([< $variant_ident Event >] {
+                    $skip_field: self.execution_specifier.clone()
+                    $(, $bname: $bname.into() )*
+                    $(, $aname: $aname.into() )*
+                })
+            }
+        }
+    };
+}
+
+macro_rules! __report_gen_emit_execution_specific_by_parse {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )* ; $( $aname:ident : $aty:ty, )*
+    ) => {
+        __report_gen_emit_execution_specific!(
+            $ident, $variant_ident, $skip_field;
+            $( $bname : $bty, )* ; $( $aname : $aty, )*
+        );
+    };
+}
+
+macro_rules! __report_gen_scan_before_exec {
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        execution_specifier : $skip_ty:ty,
+        $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_emit_execution_specific_by_parse!(
+            $ident, $variant_ident, execution_specifier;
+            $( $before : $bty, )* ; $( $after : $aty, )*
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        $name:ident : $ty:ty, $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_scan_before_exec!(
+            $ident, $variant_ident;
+            $( $before : $bty, )* $name : $ty,
+            ;
+            $( $after : $aty, )*
+            ;
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        ;
+    ) => {};
+}
+
+macro_rules! __report_gen_for_variant_exec {
+    (
+        $ident:ident,
+        $variant_ident:ident;
+    ) => {};
+    (
+        $ident:ident,
+        $variant_ident:ident;
+        $( $field_ident:ident : $field_ty:ty ),+ $(,)?
+    ) => {
+        __report_gen_scan_before_exec!(
+            $ident, $variant_ident;
+            ;
+            $( $field_ident : $field_ty, )*
+            ;
+        );
+    };
+}
+
+macro_rules! __report_gen_emit_step_execution_specific {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )*
+        ;
+        $( $aname:ident : $aty:ty, )*
+    ) => {
+        paste::paste! {
+            pub fn [< report_ $variant_ident:snake _event >](
+                &self
+                $(, $bname: impl Into<$bty> )*
+                $(, $aname: impl Into<$aty> )*
+            ) -> anyhow::Result<()> {
+                self.report([< $variant_ident Event >] {
+                    $skip_field: self.step_specifier.clone()
+                    $(, $bname: $bname.into() )*
+                    $(, $aname: $aname.into() )*
+                })
+            }
+        }
+    };
+}
+
+macro_rules! __report_gen_emit_step_execution_specific_by_parse {
+    (
+        $ident:ident,
+        $variant_ident:ident,
+        $skip_field:ident;
+        $( $bname:ident : $bty:ty, )* ; $( $aname:ident : $aty:ty, )*
+    ) => {
+        __report_gen_emit_step_execution_specific!(
+            $ident, $variant_ident, $skip_field;
+            $( $bname : $bty, )* ; $( $aname : $aty, )*
+        );
+    };
+}
+
+macro_rules! __report_gen_scan_before_step {
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        step_specifier : $skip_ty:ty,
+        $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_emit_step_execution_specific_by_parse!(
+            $ident, $variant_ident, step_specifier;
+            $( $before : $bty, )* ; $( $after : $aty, )*
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        $name:ident : $ty:ty, $( $after:ident : $aty:ty, )*
+        ;
+    ) => {
+        __report_gen_scan_before_step!(
+            $ident, $variant_ident;
+            $( $before : $bty, )* $name : $ty,
+            ;
+            $( $after : $aty, )*
+            ;
+        );
+    };
+    (
+        $ident:ident, $variant_ident:ident;
+        $( $before:ident : $bty:ty, )*
+        ;
+        ;
+    ) => {};
+}
+
+macro_rules! __report_gen_for_variant_step {
+    (
+        $ident:ident,
+        $variant_ident:ident;
+    ) => {};
+    (
+        $ident:ident,
+        $variant_ident:ident;
+        $( $field_ident:ident : $field_ty:ty ),+ $(,)?
+    ) => {
+        __report_gen_scan_before_step!(
+            $ident, $variant_ident;
+            ;
+            $( $field_ident : $field_ty, )*
+            ;
+        );
+    };
+}
+
+/// Defines the runner-event which is sent from the test runners to the report aggregator.
+///
+/// This macro defines a number of things related to the reporting infrastructure and the interface
+/// used. First of all, it defines the enum of all of the possible events that the runners can send
+/// to the aggregator. For each one of the variants it defines a separate struct for it to allow the
+/// variant field in the enum to be put in a [`Box`].
+///
+/// In addition to the above, it defines [`From`] implementations for the various event types for
+/// the [`RunnerEvent`] enum essentially allowing for events such as [`CorpusFileDiscoveryEvent`] to
+/// be converted into a [`RunnerEvent`].
+///
+/// In addition to the above, it also defines the [`RunnerEventReporter`] which is a wrapper around
+/// an [`UnboundedSender`] allowing for events to be sent to the report aggregator.
+///
+/// With the above description, we can see that this macro defines almost all of the interface of
+/// the reporting infrastructure, from the enum itself, to its associated types, and also to the
+/// reporter that's used to report events to the aggregator.
+///
+/// [`UnboundedSender`]: tokio::sync::mpsc::UnboundedSender
+macro_rules! define_event {
+    (
+        $(#[$enum_meta: meta])*
+        $vis: vis enum $ident: ident {
+            $(
+                $(#[$variant_meta: meta])*
+                $variant_ident: ident {
+                    $(
+                        $(#[$field_meta: meta])*
+                        $field_ident: ident: $field_ty: ty
+                    ),* $(,)?
+                }
+            ),* $(,)?
+        }
+    ) => {
+        paste::paste! {
+            $(#[$enum_meta])*
+            #[derive(Debug)]
+            $vis enum $ident {
+                $(
+                    $(#[$variant_meta])*
+                    $variant_ident(Box<[<$variant_ident Event>]>)
+                ),*
+            }
+
+            $(
+                #[derive(Debug)]
+                $(#[$variant_meta])*
+                $vis struct [<$variant_ident Event>] {
+                    $(
+                        $(#[$field_meta])*
+                        $vis $field_ident: $field_ty
+                    ),*
+                }
+            )*
+
+            $(
+                impl From<[<$variant_ident Event>]> for $ident {
+                    fn from(value: [<$variant_ident Event>]) -> Self {
+                        Self::$variant_ident(Box::new(value))
+                    }
+                }
+            )*
+
+            /// Provides a way to report events to the aggregator.
+            ///
+            /// Under the hood, this is a wrapper around an [`UnboundedSender`] which abstracts away
+            /// the fact that channels are used and that implements high-level methods for reporting
+            /// various events to the aggregator.
+            #[derive(Clone, Debug)]
+            pub struct [< $ident Reporter >]($vis tokio::sync::mpsc::UnboundedSender<$ident>);
+
+            impl From<tokio::sync::mpsc::UnboundedSender<$ident>> for [< $ident Reporter >] {
+                fn from(value: tokio::sync::mpsc::UnboundedSender<$ident>) -> Self {
+                    Self(value)
+                }
+            }
+
+            impl [< $ident Reporter >] {
+                pub fn test_specific_reporter(
+                    &self,
+                    test_specifier: impl Into<std::sync::Arc<crate::common::TestSpecifier>>
+                ) -> [< $ident TestSpecificReporter >] {
+                    [< $ident TestSpecificReporter >] {
+                        reporter: self.clone(),
+                        test_specifier: test_specifier.into(),
+                    }
+                }
+
+                fn report(&self, event: impl Into<$ident>) -> anyhow::Result<()> {
+                    self.0.send(event.into()).map_err(Into::into)
+                }
+
+                $(
+                    pub fn [< report_ $variant_ident:snake _event >](&self, $($field_ident: impl Into<$field_ty>),*) -> anyhow::Result<()> {
+                        self.report([< $variant_ident Event >] {
+                            $($field_ident: $field_ident.into()),*
+                        })
+                    }
+                )*
+            }
+
+            /// A reporter that's tied to a specific test case.
+            #[derive(Clone, Debug)]
+            pub struct [< $ident TestSpecificReporter >] {
+                $vis reporter: [< $ident Reporter >],
+                $vis test_specifier: std::sync::Arc<crate::common::TestSpecifier>,
+            }
+
+            impl [< $ident TestSpecificReporter >] {
+                pub fn execution_specific_reporter(
+                    &self,
+                    node_id: impl Into<usize>,
+                    platform_identifier: impl Into<PlatformIdentifier>
+                ) -> [< $ident ExecutionSpecificReporter >] {
+                    [< $ident ExecutionSpecificReporter >] {
+                        reporter: self.reporter.clone(),
+                        execution_specifier: Arc::new($crate::common::ExecutionSpecifier {
+                            test_specifier: self.test_specifier.clone(),
+                            node_id: node_id.into(),
+                            platform_identifier: platform_identifier.into(),
+                        })
+                    }
+                }
+
+                fn report(&self, event: impl Into<$ident>) -> anyhow::Result<()> {
+                    self.reporter.report(event)
+                }
+
+                $(
+                    __report_gen_for_variant! { $ident, $variant_ident; $( $field_ident : $field_ty ),* }
+                )*
+            }
+
+            /// A reporter that's tied to a specific execution of the test case such as execution on
+            /// a specific node from a specific platform.
+            #[derive(Clone, Debug)]
+            pub struct [< $ident ExecutionSpecificReporter >] {
+                $vis reporter: [< $ident Reporter >],
+                $vis execution_specifier: std::sync::Arc<$crate::common::ExecutionSpecifier>,
+            }
+
+            impl [< $ident ExecutionSpecificReporter >] {
+                fn report(&self, event: impl Into<$ident>) -> anyhow::Result<()> {
+                    self.reporter.report(event)
+                }
+
+                $(
+                    __report_gen_for_variant_exec! { $ident, $variant_ident; $( $field_ident : $field_ty ),* }
+                )*
+            }
+
+            /// A reporter that's tied to a specific step execution
+            #[derive(Clone, Debug)]
+            pub struct [< $ident StepExecutionSpecificReporter >] {
+                $vis reporter: [< $ident Reporter >],
+                $vis step_specifier: std::sync::Arc<$crate::common::StepExecutionSpecifier>,
+            }
+
+            impl [< $ident StepExecutionSpecificReporter >] {
+                fn report(&self, event: impl Into<$ident>) -> anyhow::Result<()> {
+                    self.reporter.report(event)
+                }
+
+                $(
+                    __report_gen_for_variant_step! { $ident, $variant_ident; $( $field_ident : $field_ty ),* }
+                )*
+            }
+        }
+    };
+}
+
+define_event! {
+	/// An event type that's sent by the test runners/drivers to the report aggregator.
+	pub(crate) enum RunnerEvent {
+		/// An event emitted by the reporter when it wishes to listen to events emitted by the
+		/// aggregator.
+		SubscribeToEvents {
+			/// The channel that the aggregator is to send the receive side of the channel on.
+			tx: oneshot::Sender<broadcast::Receiver<ReporterEvent>>
+		},
+		/// An event emitted by runners when they've discovered a corpus file.
+		CorpusFileDiscovery {
+			/// The contents of the corpus file.
+			corpus: Corpus
+		},
+		/// An event emitted by runners when they've discovered a metadata file.
+		MetadataFileDiscovery {
+			/// The path of the metadata file discovered.
+			path: MetadataFilePath,
+			/// The content of the metadata file.
+			metadata: Metadata
+		},
+		/// An event emitted by the runners when they discover a test case.
+		TestCaseDiscovery {
+			/// A specifier for the test that was discovered.
+			test_specifier: Arc<TestSpecifier>,
+		},
+		/// An event emitted by the runners when a test case is ignored.
+		TestIgnored {
+			/// A specifier for the test that's been ignored.
+			test_specifier: Arc<TestSpecifier>,
+			/// A reason for the test to be ignored.
+			reason: String,
+			/// Additional fields that describe more information on why the test was ignored.
+			additional_fields: IndexMap<String, serde_json::Value>
+		},
+		/// An event emitted by the runners when a test case has succeeded.
+		TestSucceeded {
+			/// A specifier for the test that succeeded.
+			test_specifier: Arc<TestSpecifier>,
+			/// The number of steps of the case that were executed by the driver.
+			steps_executed: usize,
+		},
+		/// An event emitted by the runners when a test case has failed.
+		TestFailed {
+			/// A specifier for the test that succeeded.
+			test_specifier: Arc<TestSpecifier>,
+			/// A reason for the failure of the test.
+			reason: String,
+		},
+		/// An event emitted when the test case is assigned a platform node.
+		NodeAssigned {
+			/// A specifier for the test that the assignment is for.
+			test_specifier: Arc<TestSpecifier>,
+			/// The ID of the node that this case is being executed on.
+			id: usize,
+			/// The identifier of the platform used.
+			platform_identifier: PlatformIdentifier,
+			/// The connection string of the node.
+			connection_string: String,
+		},
+		/// An event emitted by the runners when the compilation of the contracts has succeeded
+		/// on the pre-link contracts.
+		PreLinkContractsCompilationSucceeded {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The version of the compiler used to compile the contracts.
+			compiler_version: Version,
+			/// The path of the compiler used to compile the contracts.
+			compiler_path: PathBuf,
+			/// A flag of whether the contract bytecode and ABI were cached or if they were compiled
+			/// anew.
+			is_cached: bool,
+			/// The input provided to the compiler - this is optional and not provided if the
+			/// contracts were obtained from the cache.
+			compiler_input: Option<CompilerInput>,
+			/// The output of the compiler.
+			compiler_output: CompilerOutput
+		},
+		/// An event emitted by the runners when the compilation of the contracts has succeeded
+		/// on the post-link contracts.
+		PostLinkContractsCompilationSucceeded {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The version of the compiler used to compile the contracts.
+			compiler_version: Version,
+			/// The path of the compiler used to compile the contracts.
+			compiler_path: PathBuf,
+			/// A flag of whether the contract bytecode and ABI were cached or if they were compiled
+			/// anew.
+			is_cached: bool,
+			/// The input provided to the compiler - this is optional and not provided if the
+			/// contracts were obtained from the cache.
+			compiler_input: Option<CompilerInput>,
+			/// The output of the compiler.
+			compiler_output: CompilerOutput
+		},
+		/// An event emitted by the runners when the compilation of the pre-link contract has
+		/// failed.
+		PreLinkContractsCompilationFailed {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The version of the compiler used to compile the contracts.
+			compiler_version: Option<Version>,
+			/// The path of the compiler used to compile the contracts.
+			compiler_path: Option<PathBuf>,
+			/// The input provided to the compiler - this is optional and not provided if the
+			/// contracts were obtained from the cache.
+			compiler_input: Option<CompilerInput>,
+			/// The failure reason.
+			reason: String,
+		},
+		/// An event emitted by the runners when the compilation of the post-link contract has
+		/// failed.
+		PostLinkContractsCompilationFailed {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The version of the compiler used to compile the contracts.
+			compiler_version: Option<Version>,
+			/// The path of the compiler used to compile the contracts.
+			compiler_path: Option<PathBuf>,
+			/// The input provided to the compiler - this is optional and not provided if the
+			/// contracts were obtained from the cache.
+			compiler_input: Option<CompilerInput>,
+			/// The failure reason.
+			reason: String,
+		},
+		/// An event emitted by the runners when a library has been deployed.
+		LibrariesDeployed {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The addresses of the libraries that were deployed.
+			libraries: BTreeMap<ContractInstance, Address>
+		},
+		/// An event emitted by the runners when they've deployed a new contract.
+		ContractDeployed {
+			/// A specifier for the execution that's taking place.
+			execution_specifier: Arc<ExecutionSpecifier>,
+			/// The instance name of the contract.
+			contract_instance: ContractInstance,
+			/// The address of the contract.
+			address: Address
+		},
+		/// Reports the completion of the run.
+		Completion {}
+	}
+}
+
+/// An extension to the [`Reporter`] implemented by the macro.
+impl RunnerEventReporter {
+	pub async fn subscribe(&self) -> anyhow::Result<broadcast::Receiver<ReporterEvent>> {
+		let (tx, rx) = oneshot::channel::<broadcast::Receiver<ReporterEvent>>();
+		self.report_subscribe_to_events_event(tx)
+			.context("Failed to send subscribe request to reporter task")?;
+		rx.await.map_err(Into::into)
+	}
+}
+
+pub type Reporter = RunnerEventReporter;
+pub type TestSpecificReporter = RunnerEventTestSpecificReporter;
+pub type ExecutionSpecificReporter = RunnerEventExecutionSpecificReporter;

crates/solc-binaries/Cargo.toml

@@ -19,3 +19,6 @@ reqwest = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 sha2 = { workspace = true }
+
+[lints]
+workspace = true

crates/solc-binaries/src/cache.rs

@@ -1,73 +1,89 @@
 //! Helper for caching the solc binaries.
 
 use std::{
-    collections::HashSet,
+	collections::HashSet,
-    fs::{File, create_dir_all},
+	fs::{File, create_dir_all},
-    io::{BufWriter, Write},
+	io::{BufWriter, Write},
-    os::unix::fs::PermissionsExt,
+	os::unix::fs::PermissionsExt,
-    path::{Path, PathBuf},
+	path::{Path, PathBuf},
-    sync::LazyLock,
+	sync::LazyLock,
 };
 
+use semver::Version;
 use tokio::sync::Mutex;
 
 use crate::download::SolcDownloader;
+use anyhow::Context as _;
 
 pub const SOLC_CACHE_DIRECTORY: &str = "solc";
 pub(crate) static SOLC_CACHER: LazyLock<Mutex<HashSet<PathBuf>>> = LazyLock::new(Default::default);
 
 pub(crate) async fn get_or_download(
-    working_directory: &Path,
+	working_directory: &Path,
-    downloader: &SolcDownloader,
+	downloader: &SolcDownloader,
-) -> anyhow::Result<PathBuf> {
+) -> anyhow::Result<(Version, PathBuf)> {
-    let target_directory = working_directory
+	let target_directory = working_directory
-        .join(SOLC_CACHE_DIRECTORY)
+		.join(SOLC_CACHE_DIRECTORY)
-        .join(downloader.version.to_string());
+		.join(downloader.version.to_string());
-    let target_file = target_directory.join(downloader.target);
+	let target_file = target_directory.join(downloader.target);
 
-    let mut cache = SOLC_CACHER.lock().await;
+	let mut cache = SOLC_CACHER.lock().await;
-    if cache.contains(&target_file) {
+	if cache.contains(&target_file) {
-        tracing::debug!("using cached solc: {}", target_file.display());
+		tracing::debug!("using cached solc: {}", target_file.display());
-        return Ok(target_file);
+		return Ok((downloader.version.clone(), target_file));
-    }
+	}
 
-    create_dir_all(target_directory)?;
+	create_dir_all(&target_directory).with_context(|| {
-    download_to_file(&target_file, downloader).await?;
+		format!("Failed to create solc cache directory: {}", target_directory.display())
-    cache.insert(target_file.clone());
+	})?;
+	download_to_file(&target_file, downloader)
+		.await
+		.with_context(|| format!("Failed to write downloaded solc to {}", target_file.display()))?;
+	cache.insert(target_file.clone());
 
-    Ok(target_file)
+	Ok((downloader.version.clone(), target_file))
 }
 
 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 {
+		return Ok(());
+	};
 
-    let Ok(file) = File::create_new(path) else {
+	#[cfg(unix)]
-        tracing::debug!("cache file already exists: {}", path.display());
+	{
-        return Ok(());
+		let mut permissions = file
-    };
+			.metadata()
+			.with_context(|| format!("Failed to read metadata for {}", path.display()))?
+			.permissions();
+		permissions.set_mode(permissions.mode() | 0o111);
+		file.set_permissions(permissions).with_context(|| {
+			format!("Failed to set executable permissions on {}", path.display())
+		})?;
+	}
 
-    #[cfg(unix)]
+	let mut file = BufWriter::new(file);
-    {
+	file.write_all(&downloader.download().await.context("Failed to download solc binary bytes")?)
-        let mut permissions = file.metadata()?.permissions();
+		.with_context(|| format!("Failed to write solc binary to {}", path.display()))?;
-        permissions.set_mode(permissions.mode() | 0o111);
+	file.flush()
-        file.set_permissions(permissions)?;
+		.with_context(|| format!("Failed to flush file {}", path.display()))?;
-    }
+	drop(file);
 
-    let mut file = BufWriter::new(file);
+	#[cfg(target_os = "macos")]
-    file.write_all(&downloader.download().await?)?;
+	std::process::Command::new("xattr")
-    file.flush()?;
+		.arg("-d")
-    drop(file);
+		.arg("com.apple.quarantine")
+		.arg(path)
+		.stderr(std::process::Stdio::null())
+		.stdout(std::process::Stdio::null())
+		.stdout(std::process::Stdio::null())
+		.spawn()
+		.with_context(|| {
+			format!("Failed to spawn xattr to remove quarantine attribute on {}", path.display())
+		})?
+		.wait()
+		.with_context(|| {
+			format!("Failed waiting for xattr operation to complete on {}", path.display())
+		})?;
 
-    #[cfg(target_os = "macos")]
+	Ok(())
-    std::process::Command::new("xattr")
-        .arg("-d")
-        .arg("com.apple.quarantine")
-        .arg(path)
-        .stderr(std::process::Stdio::null())
-        .stdout(std::process::Stdio::null())
-        .stdout(std::process::Stdio::null())
-        .spawn()?
-        .wait()?;
-
-    Ok(())
 }

crates/solc-binaries/src/download.rs

@@ -1,8 +1,8 @@
 //! This module downloads solc binaries.
 
 use std::{
-    collections::HashMap,
+	collections::HashMap,
-    sync::{LazyLock, Mutex},
+	sync::{LazyLock, Mutex},
 };
 
 use revive_dt_common::types::VersionOrRequirement;
@@ -11,181 +11,161 @@ use semver::Version;
 use sha2::{Digest, Sha256};
 
 use crate::list::List;
+use anyhow::Context as _;
 
 pub static LIST_CACHE: LazyLock<Mutex<HashMap<&'static str, List>>> =
-    LazyLock::new(Default::default);
+	LazyLock::new(Default::default);
 
 impl List {
-    pub const LINUX_URL: &str = "https://binaries.soliditylang.org/linux-amd64/list.json";
+	pub const LINUX_URL: &str = "https://binaries.soliditylang.org/linux-amd64/list.json";
-    pub const WINDOWS_URL: &str = "https://binaries.soliditylang.org/windows-amd64/list.json";
+	pub const WINDOWS_URL: &str = "https://binaries.soliditylang.org/windows-amd64/list.json";
-    pub const MACOSX_URL: &str = "https://binaries.soliditylang.org/macosx-amd64/list.json";
+	pub const MACOSX_URL: &str = "https://binaries.soliditylang.org/macosx-amd64/list.json";
-    pub const WASM_URL: &str = "https://binaries.soliditylang.org/wasm/list.json";
+	pub const WASM_URL: &str = "https://binaries.soliditylang.org/wasm/list.json";
 
-    /// Try to downloads the list from the given URL.
+	/// Try to downloads the list from the given URL.
-    ///
+	///
-    /// Caches the list retrieved from the `url` into [LIST_CACHE],
+	/// Caches the list retrieved from the `url` into [LIST_CACHE],
-    /// subsequent calls with the same `url` will return the cached list.
+	/// subsequent calls with the same `url` will return the cached list.
-    pub async 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) {
+		if let Some(list) = LIST_CACHE.lock().unwrap().get(url) {
-            return Ok(list.clone());
+			return Ok(list.clone());
-        }
+		}
 
-        let body: List = reqwest::get(url).await?.json().await?;
+		let body: List = reqwest::get(url)
+			.await
+			.with_context(|| format!("Failed to GET solc list from {url}"))?
+			.json()
+			.await
+			.with_context(|| format!("Failed to deserialize solc list JSON from {url}"))?;
 
-        LIST_CACHE.lock().unwrap().insert(url, body.clone());
+		LIST_CACHE.lock().unwrap().insert(url, body.clone());
 
-        Ok(body)
+		Ok(body)
-    }
+	}
 }
 
 /// Download solc binaries from the official SolidityLang site
 #[derive(Clone, Debug)]
 pub struct SolcDownloader {
-    pub version: Version,
+	pub version: Version,
-    pub target: &'static str,
+	pub target: &'static str,
-    pub list: &'static str,
+	pub list: &'static str,
 }
 
 impl SolcDownloader {
-    pub const BASE_URL: &str = "https://binaries.soliditylang.org";
+	pub const BASE_URL: &str = "https://binaries.soliditylang.org";
 
-    pub const LINUX_NAME: &str = "linux-amd64";
+	pub const LINUX_NAME: &str = "linux-amd64";
-    pub const MACOSX_NAME: &str = "macosx-amd64";
+	pub const MACOSX_NAME: &str = "macosx-amd64";
-    pub const WINDOWS_NAME: &str = "windows-amd64";
+	pub const WINDOWS_NAME: &str = "windows-amd64";
-    pub const WASM_NAME: &str = "wasm";
+	pub const WASM_NAME: &str = "wasm";
 
-    async fn new(
+	async fn new(
-        version: impl Into<VersionOrRequirement>,
+		version: impl Into<VersionOrRequirement>,
-        target: &'static str,
+		target: &'static str,
-        list: &'static str,
+		list: &'static str,
-    ) -> anyhow::Result<Self> {
+	) -> anyhow::Result<Self> {
-        let version_or_requirement = version.into();
+		let version_or_requirement = version.into();
-        match version_or_requirement {
+		match version_or_requirement {
-            VersionOrRequirement::Version(version) => Ok(Self {
+			VersionOrRequirement::Version(version) => Ok(Self { version, target, list }),
-                version,
+			VersionOrRequirement::Requirement(requirement) => {
-                target,
+				let Some(version) = List::download(list)
-                list,
+					.await
-            }),
+					.with_context(|| format!("Failed to download solc builds list from {list}"))?
-            VersionOrRequirement::Requirement(requirement) => {
+					.builds
-                let Some(version) = List::download(list)
+					.into_iter()
-                    .await?
+					.map(|build| build.version)
-                    .builds
+					.filter(|version| requirement.matches(version))
-                    .into_iter()
+					.max()
-                    .map(|build| build.version)
+				else {
-                    .filter(|version| requirement.matches(version))
+					anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
-                    .max()
+				};
-                else {
+				Ok(Self { version, target, list })
-                    anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
+			},
-                };
+		}
-                Ok(Self {
+	}
-                    version,
-                    target,
-                    list,
-                })
-            }
-        }
-    }
 
-    pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+	pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
-        Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
+		Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
-    }
+	}
 
-    pub async 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).await
+		Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL).await
-    }
+	}
 
-    pub async 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).await
+		Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL).await
-    }
+	}
 
-    pub async 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).await
+		Self::new(version, Self::WASM_NAME, List::WASM_URL).await
-    }
+	}
 
-    /// Download the solc binary.
+	/// Download the solc binary.
-    ///
+	///
-    /// Errors out if the download fails or the digest of the downloaded file
+	/// Errors out if the download fails or the digest of the downloaded file
-    /// mismatches the expected digest from the release [List].
+	/// mismatches the expected digest from the release [List].
-    pub async fn download(&self) -> anyhow::Result<Vec<u8>> {
+	pub async fn download(&self) -> anyhow::Result<Vec<u8>> {
-        tracing::info!("downloading solc: {self:?}");
+		let builds = List::download(self.list)
-        let builds = List::download(self.list).await?.builds;
+			.await
-        let build = builds
+			.with_context(|| format!("Failed to download solc builds list from {}", self.list))?
-            .iter()
+			.builds;
-            .find(|build| build.version == self.version)
+		let build = builds
-            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))?;
+			.iter()
+			.find(|build| build.version == self.version)
+			.ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
+			.with_context(|| {
+				format!(
+					"Requested solc version {} was not found in builds list fetched from {}",
+					self.version, self.list
+				)
+			})?;
 
-        let path = build.path.clone();
+		let path = build.path.clone();
-        let expected_digest = build
+		let expected_digest = build.sha256.strip_prefix("0x").unwrap_or(&build.sha256).to_string();
-            .sha256
+		let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
-            .strip_prefix("0x")
-            .unwrap_or(&build.sha256)
-            .to_string();
-        let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
 
-        let file = reqwest::get(url).await?.bytes().await?.to_vec();
+		let file = reqwest::get(&url)
+			.await
+			.with_context(|| format!("Failed to GET solc binary from {url}"))?
+			.bytes()
+			.await
+			.with_context(|| format!("Failed to read solc binary bytes from {url}"))?
+			.to_vec();
 
-        if hex::encode(Sha256::digest(&file)) != expected_digest {
+		if hex::encode(Sha256::digest(&file)) != expected_digest {
-            anyhow::bail!("sha256 mismatch for solc version {}", self.version);
+			anyhow::bail!("sha256 mismatch for solc version {}", self.version);
-        }
+		}
 
-        Ok(file)
+		Ok(file)
-    }
+	}
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::{download::SolcDownloader, list::List};
+	use crate::{download::SolcDownloader, list::List};
 
-    #[tokio::test]
+	#[tokio::test]
-    async fn try_get_windows() {
+	async fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL)
+		let version = List::download(List::WINDOWS_URL).await.unwrap().latest_release;
-            .await
+		SolcDownloader::windows(version).await.unwrap().download().await.unwrap();
-            .unwrap()
+	}
-            .latest_release;
-        SolcDownloader::windows(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
-    }
 
-    #[tokio::test]
+	#[tokio::test]
-    async fn try_get_macosx() {
+	async fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL)
+		let version = List::download(List::MACOSX_URL).await.unwrap().latest_release;
-            .await
+		SolcDownloader::macosx(version).await.unwrap().download().await.unwrap();
-            .unwrap()
+	}
-            .latest_release;
-        SolcDownloader::macosx(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
-    }
 
-    #[tokio::test]
+	#[tokio::test]
-    async fn try_get_linux() {
+	async fn try_get_linux() {
-        let version = List::download(List::LINUX_URL)
+		let version = List::download(List::LINUX_URL).await.unwrap().latest_release;
-            .await
+		SolcDownloader::linux(version).await.unwrap().download().await.unwrap();
-            .unwrap()
+	}
-            .latest_release;
-        SolcDownloader::linux(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
-    }
 
-    #[tokio::test]
+	#[tokio::test]
-    async fn try_get_wasm() {
+	async fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).await.unwrap().latest_release;
+		let version = List::download(List::WASM_URL).await.unwrap().latest_release;
-        SolcDownloader::wasm(version)
+		SolcDownloader::wasm(version).await.unwrap().download().await.unwrap();
-            .await
+	}
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
-    }
 }

crates/solc-binaries/src/lib.rs

@@ -5,10 +5,12 @@
 
 use std::path::{Path, PathBuf};
 
+use anyhow::Context as _;
 use cache::get_or_download;
 use download::SolcDownloader;
 
 use revive_dt_common::types::VersionOrRequirement;
+use semver::Version;
 
 pub mod cache;
 pub mod download;
@@ -20,21 +22,22 @@ pub mod list;
 /// Subsequent calls for the same version will use a cached artifact
 /// and not download it again.
 pub async fn download_solc(
-    cache_directory: &Path,
+	cache_directory: &Path,
-    version: impl Into<VersionOrRequirement>,
+	version: impl Into<VersionOrRequirement>,
-    wasm: bool,
+	wasm: bool,
-) -> anyhow::Result<PathBuf> {
+) -> anyhow::Result<(Version, PathBuf)> {
-    let downloader = if wasm {
+	let downloader = if wasm {
-        SolcDownloader::wasm(version).await
+		SolcDownloader::wasm(version).await
-    } else if cfg!(target_os = "linux") {
+	} else if cfg!(target_os = "linux") {
-        SolcDownloader::linux(version).await
+		SolcDownloader::linux(version).await
-    } else if cfg!(target_os = "macos") {
+	} else if cfg!(target_os = "macos") {
-        SolcDownloader::macosx(version).await
+		SolcDownloader::macosx(version).await
-    } else if cfg!(target_os = "windows") {
+	} else if cfg!(target_os = "windows") {
-        SolcDownloader::windows(version).await
+		SolcDownloader::windows(version).await
-    } else {
+	} else {
-        unimplemented!()
+		unimplemented!()
-    }?;
+	}
+	.context("Failed to initialize the Solc Downloader")?;
 
-    get_or_download(cache_directory, &downloader).await
+	get_or_download(cache_directory, &downloader).await
 }

crates/solc-binaries/src/list.rs

@@ -7,20 +7,20 @@ use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, Eq, PartialEq)]
 pub struct List {
-    pub builds: Vec<Build>,
+	pub builds: Vec<Build>,
-    pub releases: HashMap<Version, String>,
+	pub releases: HashMap<Version, String>,
-    #[serde(rename = "latestRelease")]
+	#[serde(rename = "latestRelease")]
-    pub latest_release: Version,
+	pub latest_release: Version,
 }
 
 #[derive(Debug, Deserialize, Clone, Eq, PartialEq)]
 pub struct Build {
-    pub path: PathBuf,
+	pub path: PathBuf,
-    pub version: Version,
+	pub version: Version,
-    pub build: String,
+	pub build: String,
-    #[serde(rename = "longVersion")]
+	#[serde(rename = "longVersion")]
-    pub long_version: String,
+	pub long_version: String,
-    pub keccak256: String,
+	pub keccak256: String,
-    pub sha256: String,
+	pub sha256: String,
-    pub urls: Vec<String>,
+	pub urls: Vec<String>,
 }

run_tests.sh

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

schema.json

@@ -0,0 +1,583 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "Metadata",
+  "description": "A MatterLabs metadata file.\n\nThis defines the structure that the MatterLabs metadata files follow for defining the tests or\nthe workloads.\n\nEach metadata file is composed of multiple test cases where each test case is isolated from the\nothers and runs in a completely different address space. Each test case is composed of a number\nof steps and assertions that should be performed as part of the test case.",
+  "type": "object",
+  "properties": {
+    "comment": {
+      "description": "This is an optional comment on the metadata file which has no impact on the execution in any\nway.",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "ignore": {
+      "description": "An optional boolean which defines if the metadata file as a whole should be ignored. If null\nthen the metadata file will not be ignored.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "targets": {
+      "description": "An optional vector of targets that this Metadata file's cases can be executed on. As an\nexample, if we wish for the metadata file's cases to only be run on PolkaVM then we'd\nspecify a target of \"PolkaVM\" in here.",
+      "type": [
+        "array",
+        "null"
+      ],
+      "items": {
+        "$ref": "#/$defs/VmIdentifier"
+      }
+    },
+    "cases": {
+      "description": "A vector of the test cases and workloads contained within the metadata file. This is their\nprimary description.",
+      "type": "array",
+      "items": {
+        "$ref": "#/$defs/Case"
+      }
+    },
+    "contracts": {
+      "description": "A map of all of the contracts that the test requires to run.\n\nThis is a map where the key is the name of the contract instance and the value is the\ncontract's path and ident in the file.\n\nIf any contract is to be used by the test then it must be included in here first so that the\nframework is aware of its path, compiles it, and prepares it.",
+      "type": [
+        "object",
+        "null"
+      ],
+      "additionalProperties": {
+        "$ref": "#/$defs/ContractPathAndIdent"
+      }
+    },
+    "libraries": {
+      "description": "The set of libraries that this metadata file requires.",
+      "type": [
+        "object",
+        "null"
+      ],
+      "additionalProperties": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/$defs/ContractInstance"
+        }
+      }
+    },
+    "modes": {
+      "description": "This represents a mode that has been parsed from test metadata.\n\nMode strings can take the following form (in pseudo-regex):\n\n```text\n[YEILV][+-]? (M[0123sz])? <semver>?\n```",
+      "type": [
+        "array",
+        "null"
+      ],
+      "items": {
+        "$ref": "#/$defs/ParsedMode"
+      }
+    },
+    "required_evm_version": {
+      "description": "This field specifies an EVM version requirement that the test case has where the test might\nbe run of the evm version of the nodes match the evm version specified here.",
+      "anyOf": [
+        {
+          "$ref": "#/$defs/EvmVersionRequirement"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "compiler_directives": {
+      "description": "A set of compilation directives that will be passed to the compiler whenever the contracts\nfor the test are being compiled. Note that this differs from the [`Mode`]s in that a [`Mode`]\nis just a filter for when a test can run whereas this is an instruction to the compiler.",
+      "anyOf": [
+        {
+          "$ref": "#/$defs/CompilationDirectives"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  },
+  "required": [
+    "cases"
+  ],
+  "$defs": {
+    "VmIdentifier": {
+      "description": "An enum representing the identifiers of the supported VMs.",
+      "oneOf": [
+        {
+          "description": "The ethereum virtual machine.",
+          "type": "string",
+          "const": "evm"
+        },
+        {
+          "description": "The EraVM virtual machine.",
+          "type": "string",
+          "const": "eravm"
+        },
+        {
+          "description": "Polkadot's PolaVM Risc-v based virtual machine.",
+          "type": "string",
+          "const": "polkavm"
+        }
+      ]
+    },
+    "Case": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "An optional name of the test case.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "comment": {
+          "description": "An optional comment on the case which has no impact on the execution in any way.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "modes": {
+          "description": "This represents a mode that has been parsed from test metadata.\n\nMode strings can take the following form (in pseudo-regex):\n\n```text\n[YEILV][+-]? (M[0123sz])? <semver>?\n```\n\nIf this is provided then it takes higher priority than the modes specified in the metadata\nfile.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/$defs/ParsedMode"
+          }
+        },
+        "inputs": {
+          "description": "The set of steps to run as part of this test case.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Step"
+          }
+        },
+        "group": {
+          "description": "An optional name of the group of tests that this test belongs to.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "expected": {
+          "description": "An optional set of expectations and assertions to make about the transaction after it ran.\n\nIf this is not specified then the only assertion that will be ran is that the transaction\nwas successful.\n\nThis expectation that's on the case itself will be attached to the final step of the case.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/Expected"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "ignore": {
+          "description": "An optional boolean which defines if the case as a whole should be ignored. If null then the\ncase will not be ignored.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "inputs"
+      ]
+    },
+    "ParsedMode": {
+      "description": "This represents a mode that has been parsed from test metadata.\n\nMode strings can take the following form (in pseudo-regex):\n\n```text\n[YEILV][+-]? (M[0123sz])? <semver>?\n```\n\nWe can parse valid mode strings into [`ParsedMode`] using [`ParsedMode::from_str`].",
+      "type": "string"
+    },
+    "Step": {
+      "description": "A test step.\n\nA test step can be anything. It could be an invocation to a function, an assertion, or any other\naction that needs to be run or executed on the nodes used in the tests.",
+      "anyOf": [
+        {
+          "description": "A function call or an invocation to some function on some smart contract.",
+          "$ref": "#/$defs/FunctionCallStep"
+        },
+        {
+          "description": "A step for performing a balance assertion on some account or contract.",
+          "$ref": "#/$defs/BalanceAssertionStep"
+        },
+        {
+          "description": "A step for asserting that the storage of some contract or account is empty.",
+          "$ref": "#/$defs/StorageEmptyAssertionStep"
+        },
+        {
+          "description": "A special step for repeating a bunch of steps a certain number of times.",
+          "$ref": "#/$defs/RepeatStep"
+        },
+        {
+          "description": "A step type that allows for a new account address to be allocated and to later on be used\nas the caller in another step.",
+          "$ref": "#/$defs/AllocateAccountStep"
+        }
+      ]
+    },
+    "FunctionCallStep": {
+      "description": "This is an input step which is a transaction description that the framework translates into a\ntransaction and executes on the nodes.",
+      "type": "object",
+      "properties": {
+        "caller": {
+          "description": "The address of the account performing the call and paying the fees for it.",
+          "type": "string",
+          "default": "0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1"
+        },
+        "comment": {
+          "description": "An optional comment on the step which has no impact on the execution in any way.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "instance": {
+          "description": "The contract instance that's being called in this transaction step.",
+          "$ref": "#/$defs/ContractInstance",
+          "default": "Test"
+        },
+        "method": {
+          "description": "The method that's being called in this step.",
+          "$ref": "#/$defs/Method"
+        },
+        "calldata": {
+          "description": "The calldata that the function should be invoked with.",
+          "$ref": "#/$defs/Calldata",
+          "default": []
+        },
+        "expected": {
+          "description": "A set of assertions and expectations to have for the transaction.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/Expected"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "value": {
+          "description": "An optional value to provide as part of the transaction.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/EtherValue"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "variable_assignments": {
+          "description": "Variable assignment to perform in the framework allowing us to reference them again later on\nduring the execution.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/VariableAssignments"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": [
+        "method"
+      ]
+    },
+    "ContractInstance": {
+      "description": "Represents a contract instance found a metadata file.\n\nTypically, this is used as the key to the \"contracts\" field of metadata files.",
+      "type": "string"
+    },
+    "Method": {
+      "description": "Specify how the contract is called.",
+      "anyOf": [
+        {
+          "description": "Initiate a deploy transaction, calling contracts constructor.\n\nIndicated by `#deployer`.",
+          "type": "string",
+          "const": "#deployer"
+        },
+        {
+          "description": "Does not calculate and insert a function selector.\n\nIndicated by `#fallback`.",
+          "type": "string",
+          "const": "#fallback"
+        },
+        {
+          "description": "Call the public function with the given name.",
+          "type": "string"
+        }
+      ]
+    },
+    "Calldata": {
+      "description": "A type definition for the calldata supported by the testing framework.\n\nWe choose to document all of the types used in [`Calldata`] in this one doc comment to elaborate\non why they exist and consolidate all of the documentation for calldata in a single place where\nit can be viewed and understood.\n\nThe [`Single`] variant of this enum is quite simple and straightforward: it's a hex-encoded byte\narray of the calldata.\n\nThe [`Compound`] type is more intricate and allows for capabilities such as resolution and some\nsimple arithmetic operations. It houses a vector of [`CalldataItem`]s which is just a wrapper\naround an owned string.\n\nA [`CalldataItem`] could be a simple hex string of a single calldata argument, but it could also\nbe something that requires resolution such as `MyContract.address` which is a variable that is\nunderstood by the resolution logic to mean \"Lookup the address of this particular contract\ninstance\".\n\nIn addition to the above, the format supports some simple arithmetic operations like add, sub,\ndivide, multiply, bitwise AND, bitwise OR, and bitwise XOR. Our parser understands the [reverse\npolish notation] simply because it's easy to write a calculator for that notation and since we\ndo not have plans to use arithmetic too often in tests. In reverse polish notation a typical\n`2 + 4` would be written as `2 4 +` which makes this notation very simple to implement through\na stack.\n\nCombining the above, a single [`CalldataItem`] could employ both resolution and arithmetic at\nthe same time. For example, a [`CalldataItem`] of `$BLOCK_NUMBER $BLOCK_NUMBER +` means that\nthe block number should be retrieved and then it should be added to itself.\n\nInternally, we split the [`CalldataItem`] by spaces. Therefore, `$BLOCK_NUMBER $BLOCK_NUMBER+`\nis invalid but `$BLOCK_NUMBER $BLOCK_NUMBER +` is valid and can be understood by the parser and\ncalculator. After the split is done, each token is parsed into a [`CalldataToken<&str>`] forming\nan [`Iterator`] over [`CalldataToken<&str>`]. A [`CalldataToken<&str>`] can then be resolved\ninto a [`CalldataToken<U256>`] through the resolution logic. Finally, after resolution is done,\nthis iterator of [`CalldataToken<U256>`] is collapsed into the final result by applying the\narithmetic operations requested.\n\nFor example, supplying a [`Compound`] calldata of `0xdeadbeef` produces an iterator of a single\n[`CalldataToken<&str>`] items of the value [`CalldataToken::Item`] of the string value 12 which\nwe can then resolve into the appropriate [`U256`] value and convert into calldata.\n\nIn summary, the various types used in [`Calldata`] represent the following:\n- [`CalldataItem`]: A calldata string from the metadata files.\n- [`CalldataToken<&str>`]: Typically used in an iterator of items from the space splitted\n  [`CalldataItem`] and represents a token that has not yet been resolved into its value.\n- [`CalldataToken<U256>`]: Represents a token that's been resolved from being a string and into\n  the word-size calldata argument on which we can perform arithmetic.\n\n[`Single`]: Calldata::Single\n[`Compound`]: Calldata::Compound\n[reverse polish notation]: https://en.wikipedia.org/wiki/Reverse_Polish_notation",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/CalldataItem"
+          }
+        }
+      ]
+    },
+    "CalldataItem": {
+      "description": "This represents an item in the [`Calldata::Compound`] variant. Each item will be resolved\naccording to the resolution rules of the tool.",
+      "type": "string"
+    },
+    "Expected": {
+      "description": "A set of expectations and assertions to make about the transaction after it ran.\n\nIf this is not specified then the only assertion that will be ran is that the transaction\nwas successful.",
+      "anyOf": [
+        {
+          "description": "An assertion that the transaction succeeded and returned the provided set of data.",
+          "$ref": "#/$defs/Calldata"
+        },
+        {
+          "description": "A more complex assertion.",
+          "$ref": "#/$defs/ExpectedOutput"
+        },
+        {
+          "description": "A set of assertions.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/ExpectedOutput"
+          }
+        }
+      ]
+    },
+    "ExpectedOutput": {
+      "description": "A set of assertions to run on the transaction.",
+      "type": "object",
+      "properties": {
+        "compiler_version": {
+          "description": "An optional compiler version that's required in order for this assertion to run.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "return_data": {
+          "description": "An optional field of the expected returns from the invocation.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/Calldata"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "events": {
+          "description": "An optional set of assertions to run on the emitted events from the transaction.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/$defs/Event"
+          }
+        },
+        "exception": {
+          "description": "A boolean which defines whether we expect the transaction to succeed or fail.",
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "Event": {
+      "type": "object",
+      "properties": {
+        "address": {
+          "description": "An optional field of the address of the emitter of the event.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/StepAddress"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "topics": {
+          "description": "The set of topics to expect the event to have.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "values": {
+          "description": "The set of values to expect the event to have.",
+          "$ref": "#/$defs/Calldata"
+        }
+      },
+      "required": [
+        "topics",
+        "values"
+      ]
+    },
+    "StepAddress": {
+      "description": "An address type that might either be an address literal or a resolvable address.",
+      "type": "string"
+    },
+    "EtherValue": {
+      "description": "Defines an Ether value.\n\nThis is an unsigned 256 bit integer that's followed by some denomination which can either be\neth, ether, gwei, or wei.",
+      "type": "string"
+    },
+    "VariableAssignments": {
+      "type": "object",
+      "properties": {
+        "return_data": {
+          "description": "A vector of the variable names to assign to the return data.\n\nExample: `UniswapV3PoolAddress`",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "return_data"
+      ]
+    },
+    "BalanceAssertionStep": {
+      "description": "This represents a balance assertion step where the framework needs to query the balance of some\naccount or contract and assert that it's some amount.",
+      "type": "object",
+      "properties": {
+        "comment": {
+          "description": "An optional comment on the balance assertion.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "address": {
+          "description": "The address that the balance assertion should be done on.\n\nThis is a string which will be resolved into an address when being processed. Therefore,\nthis could be a normal hex address, a variable such as `Test.address`, or perhaps even a\nfull on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are\nfollowed in the calldata.",
+          "$ref": "#/$defs/StepAddress"
+        },
+        "expected_balance": {
+          "description": "The amount of balance to assert that the account or contract has. This is a 256 bit string\nthat's serialized and deserialized into a decimal string.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "address",
+        "expected_balance"
+      ]
+    },
+    "StorageEmptyAssertionStep": {
+      "description": "This represents an assertion for the storage of some contract or account and whether it's empty\nor not.",
+      "type": "object",
+      "properties": {
+        "comment": {
+          "description": "An optional comment on the storage empty assertion.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "address": {
+          "description": "The address that the balance assertion should be done on.\n\nThis is a string which will be resolved into an address when being processed. Therefore,\nthis could be a normal hex address, a variable such as `Test.address`, or perhaps even a\nfull on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are\nfollowed in the calldata.",
+          "$ref": "#/$defs/StepAddress"
+        },
+        "is_storage_empty": {
+          "description": "A boolean of whether the storage of the address is empty or not.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "address",
+        "is_storage_empty"
+      ]
+    },
+    "RepeatStep": {
+      "description": "This represents a repetition step which is a special step type that allows for a sequence of\nsteps to be repeated (on different drivers) a certain number of times.",
+      "type": "object",
+      "properties": {
+        "comment": {
+          "description": "An optional comment on the repetition step.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "repeat": {
+          "description": "The number of repetitions that the steps should be repeated for.",
+          "type": "integer",
+          "format": "uint",
+          "minimum": 0
+        },
+        "steps": {
+          "description": "The sequence of steps to repeat for the above defined number of repetitions.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Step"
+          }
+        }
+      },
+      "required": [
+        "repeat",
+        "steps"
+      ]
+    },
+    "AllocateAccountStep": {
+      "type": "object",
+      "properties": {
+        "comment": {
+          "description": "An optional comment on the account allocation step.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "allocate_account": {
+          "description": "An instruction to allocate a new account with the value being the variable name of that\naccount. This must start with `$VARIABLE:` and then be followed by the variable name of the\naccount.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "allocate_account"
+      ]
+    },
+    "ContractPathAndIdent": {
+      "description": "Represents an identifier used for contracts.\n\nThe type supports serialization from and into the following string format:\n\n```text\n${path}:${contract_ident}\n```",
+      "type": "string"
+    },
+    "EvmVersionRequirement": {
+      "description": "An EVM version requirement that the test case has. This gets serialized and deserialized from\nand into [`String`]. This follows a simple format of (>=|<=|=|>|<) followed by a string of the\nEVM version.\n\nWhen specified, the framework will only run the test if the node's EVM version matches that\nrequired by the metadata file.",
+      "type": "string"
+    },
+    "CompilationDirectives": {
+      "description": "A set of compilation directives that will be passed to the compiler whenever the contracts for\nthe test are being compiled. Note that this differs from the [`Mode`]s in that a [`Mode`] is\njust a filter for when a test can run whereas this is an instruction to the compiler.\nDefines how the compiler should handle revert strings.",
+      "type": "object",
+      "properties": {
+        "revert_string_handling": {
+          "description": "Defines how the revert strings should be handled.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/RevertString"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      }
+    },
+    "RevertString": {
+      "description": "Defines how the compiler should handle revert strings.",
+      "oneOf": [
+        {
+          "description": "The default handling of the revert strings.",
+          "type": "string",
+          "const": "default"
+        },
+        {
+          "description": "The debug handling of the revert strings.",
+          "type": "string",
+          "const": "debug"
+        },
+        {
+          "description": "Strip the revert strings.",
+          "type": "string",
+          "const": "strip"
+        },
+        {
+          "description": "Provide verbose debug strings for the revert string.",
+          "type": "string",
+          "const": "verboseDebug"
+        }
+      ]
+    }
+  }
+}