Remove unneeded dependency

* Retry getting transaction receipt

* Small fix to logging consistency

* Introduce a custom kitchensink network

* Fix formtting and clippy

.github/workflows/test.yml

@@ -0,0 +1,147 @@
+name: Test workflow
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  cache-polkadot:
+    name: Build and cache Polkadot binaries on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, macos-14]
+
+    steps:
+      - name: Checkout repo and submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies (Linux)
+        if: matrix.os == 'ubuntu-24.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y protobuf-compiler clang libclang-dev
+          rustup target add wasm32-unknown-unknown
+          rustup component add rust-src
+
+      - name: Install dependencies (macOS)
+        if: matrix.os == 'macos-14'
+        run: |
+          brew install protobuf
+          rustup target add wasm32-unknown-unknown
+          rustup component add rust-src
+
+      - name: Cache binaries
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/substrate-node
+            ~/.cargo/bin/eth-rpc
+          key: polkadot-binaries-${{ matrix.os }}-${{ hashFiles('polkadot-sdk/.git') }}
+
+      - name: Build substrate-node
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd polkadot-sdk
+          cargo install --locked --force --profile=production --path substrate/bin/node/cli --bin substrate-node --features cli
+
+      - name: Build eth-rpc
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          cd polkadot-sdk
+          cargo install --path substrate/frame/revive/rpc --bin eth-rpc
+
+  ci:
+    name: CI on ${{ matrix.os }}
+    needs: cache-polkadot
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, macos-14]
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Restore binaries from cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/substrate-node
+            ~/.cargo/bin/eth-rpc
+          key: polkadot-binaries-${{ matrix.os }}-${{ hashFiles('polkadot-sdk/.git') }}
+
+      - name: Setup Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          rustflags: ""
+
+      - name: Add wasm32 target
+        run: |
+          rustup target add wasm32-unknown-unknown
+          rustup component add rust-src
+
+      - name: Install Geth on Ubuntu
+        if: matrix.os == 'ubuntu-24.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y protobuf-compiler
+
+          # We were facing some issues in CI with the 1.16.* versions of geth, and specifically on
+          # Ubuntu. Eventually, we found out that the last version of geth that worked in our CI was
+          # version 1.15.11. Thus, this is the version that we want to use in CI. The PPA sadly does
+          # not have historic versions of Geth and therefore we need to resort to downloading pre
+          # built binaries for Geth and the surrounding tools which is what the following parts of 
+          # the script do.
+
+          sudo apt-get install -y wget ca-certificates tar
+          ARCH=$(uname -m)
+          if [ "$ARCH" = "x86_64" ]; then
+            URL="https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.15.11-36b2371c.tar.gz"
+          elif [ "$ARCH" = "aarch64" ]; then
+            URL="https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-arm64-1.15.11-36b2371c.tar.gz"
+          else
+            echo "Unsupported architecture: $ARCH"
+            exit 1
+          fi
+          wget -qO- "$URL" | sudo tar xz -C /usr/local/bin --strip-components=1
+          geth --version
+
+      - name: Install Geth on macOS
+        if: matrix.os == 'macos-14'
+        run: |
+          brew tap ethereum/ethereum
+          brew install ethereum protobuf
+
+      - name: Machete
+        uses: bnjbvr/cargo-machete@v0.7.1
+
+      - name: Format
+        run: make format
+
+      - name: Clippy
+        run: make clippy
+
+      - name: Check substrate-node version
+        run: substrate-node --version
+
+      - name: Check eth-rpc version
+        run: eth-rpc --version
+
+      - name: Test cargo workspace
+        run: make test

.gitignore

@@ -3,3 +3,7 @@
 .DS_Store
 node_modules
 /*.json
+
+# 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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "polkadot-sdk"]
+	path = polkadot-sdk
+	url = https://github.com/paritytech/polkadot-sdk.git

Cargo.toml

@@ -4,9 +4,7 @@ members = ["crates/*"]
 
 [workspace.package]
 version = "0.1.0"
-authors = [
-    "Parity Technologies <admin@parity.io>",
-]
+authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT/Apache-2.0"
 edition = "2024"
 repository = "https://github.com/paritytech/revive-differential-testing.git"
@@ -20,30 +18,46 @@ revive-dt-format = { version = "0.1.0", path = "crates/format" }
 revive-dt-node = { version = "0.1.0", path = "crates/node" }
 revive-dt-node-interaction = { version = "0.1.0", path = "crates/node-interaction" }
 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"
 clap = { version = "4", features = ["derive"] }
-env_logger = "0.11.7"
 hex = "0.4.3"
 reqwest = { version = "0.12.15", features = ["blocking", "json"] }
-log = "0.4.26"
 once_cell = "1.21"
 rayon = { version = "1.10" }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-serde_json = { version = "1.0", default-features = false, features = ["arbitrary_precision", "std"] }
-sha2 = { version = "0.10.8" }
-temp-dir = { version = "0.1.14" }
-tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
+serde_json = { version = "1.0", default-features = false, features = [
+    "arbitrary_precision",
+    "std",
+] }
+sha2 = { version = "0.10.9" }
+sp-core = "36.1.0"
+sp-runtime = "41.1.0"
+temp-dir = { version = "0.1.16" }
+tempfile = "3.3"
+tokio = { version = "1", default-features = false, features = [
+    "rt-multi-thread",
+] }
+uuid = { version = "1.8", features = ["v4"] }
+tracing = "0.1.41"
+tracing-subscriber = { version = "0.3.19", default-features = false, features = [
+    "fmt",
+    "json",
+    "env-filter",
+] }
 
 # revive compiler
-revive-solc-json-interface = { git = "https://github.com/paritytech/revive", rev = "497dae2494dabe12d1af32d6d687122903cb2ada" }
-revive-common = { git = "https://github.com/paritytech/revive", rev = "497dae2494dabe12d1af32d6d687122903cb2ada" }
-revive-differential = { git = "https://github.com/paritytech/revive", rev = "497dae2494dabe12d1af32d6d687122903cb2ada" }
+revive-solc-json-interface = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
+revive-common = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
+revive-differential = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
 
 [workspace.dependencies.alloy]
-version = "0.13.0"
+version = "1.0"
 default-features = false
 features = [
     "json-abi",
@@ -54,6 +68,9 @@ features = [
     "rpc-types",
     "signer-local",
     "std",
+    "network",
+    "serde",
+    "rpc-types-eth",
 ]
 
 [profile.bench]

Makefile

@@ -0,0 +1,15 @@
+.PHONY: format clippy test machete
+
+format:
+	cargo fmt --all -- --check
+
+clippy:
+	cargo clippy --all-features --workspace -- --deny warnings
+
+machete:
+	cargo install cargo-machete
+	cargo machete crates
+
+test: format clippy machete
+	cargo test --workspace -- --nocapture
+

README.md

@@ -1,2 +1,34 @@
 # revive-differential-tests
-revive differential testing framework
+
+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:
+- 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.
+- Collect and compare benchmark metrics such as code size, gas usage or transaction throughput per seconds (TPS) of different blockchain implementations.
+- Ensure reproducible contract builds across multiple compiler implementations or multiple host platforms.
+- Implement end-to-end regression tests for Ethereum-compatible smart contract stacks.
+
+# Declarative test format
+
+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.
+
+# The `retester` utility
+
+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: 
+
+```
+cargo run -p revive-dt-core -- --help
+```
+
+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:
+
+```json
+{
+    "name": "ML Solidity Complex",
+    "path": "/path/to/era-compiler-tests/solidity/complex"
+}
+```
+
+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:
+
+```bash
+RUST_LOG=debug cargo r --release -p revive-dt-core  -- --corpus ml-solidity-complex.json 
+```

crates/compiler/Cargo.toml

@@ -11,6 +11,9 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 revive-solc-json-interface = { workspace = true }
+revive-dt-config = { workspace = true }
+revive-dt-solc-binaries = { workspace = true }
 revive-common = { workspace = true }
 semver = { workspace = true }
 serde_json = { workspace = true }
+tracing = { workspace = true }

crates/compiler/src/lib.rs

@@ -9,6 +9,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use revive_dt_config::Arguments;
+
 use revive_common::EVMVersion;
 use revive_solc_json_interface::{
     SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
@@ -33,6 +35,8 @@ pub trait SolidityCompiler {
     ) -> anyhow::Result<CompilerOutput<Self::Options>>;
 
     fn new(solc_executable: PathBuf) -> Self;
+
+    fn get_compiler_executable(config: &Arguments, version: Version) -> anyhow::Result<PathBuf>;
 }
 
 /// The generic compilation input configuration.
@@ -44,8 +48,12 @@ pub struct CompilerInput<T: PartialEq + Eq + Hash> {
 
 /// The generic compilation output configuration.
 pub struct CompilerOutput<T: PartialEq + Eq + Hash> {
+    /// The solc standard JSON input.
     pub input: CompilerInput<T>,
+    /// The produced solc standard JSON output.
     pub output: SolcStandardJsonOutput,
+    /// The error message in case the compiler returns abnormally.
+    pub error: Option<String>,
 }
 
 impl<T> PartialEq for CompilerInput<T>
@@ -106,6 +114,7 @@ where
                         false,
                     ),
                     None,
+                    None,
                 ),
             },
             extra_options: Default::default(),
@@ -152,4 +161,9 @@ where
             input: self.input,
         })
     }
+
+    /// Returns the compiler JSON input.
+    pub fn input(&self) -> SolcStandardJsonInput {
+        self.input.clone()
+    }
 }

crates/compiler/src/revive_resolc.rs

@@ -1,2 +1,86 @@
-//! Implements the [crate::SolidityCompiler] trait with resolc for
-//! compiling contracts to PVM bytecode.
+//! Implements the [SolidityCompiler] trait with `resolc` for
+//! compiling contracts to PolkaVM (PVM) bytecode.
+
+use std::{
+    path::PathBuf,
+    process::{Command, Stdio},
+};
+
+use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
+use revive_dt_config::Arguments;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
+/// A wrapper around the `resolc` binary, emitting PVM-compatible bytecode.
+pub struct Resolc {
+    /// Path to the `resolc` executable
+    resolc_path: PathBuf,
+}
+
+impl SolidityCompiler for Resolc {
+    type Options = Vec<String>;
+
+    fn build(
+        &self,
+        input: CompilerInput<Self::Options>,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
+        let mut child = Command::new(&self.resolc_path)
+            .arg("--standard-json")
+            .args(&input.extra_options)
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .spawn()?;
+
+        let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
+        serde_json::to_writer(stdin_pipe, &input.input)?;
+
+        let json_in = serde_json::to_string_pretty(&input.input)?;
+
+        let output = child.wait_with_output()?;
+        let stdout = output.stdout;
+        let stderr = output.stderr;
+
+        if !output.status.success() {
+            let message = String::from_utf8_lossy(&stderr);
+            tracing::error!(
+                "resolc failed exit={} stderr={} JSON-in={} ",
+                output.status,
+                &message,
+                json_in,
+            );
+            return Ok(CompilerOutput {
+                input,
+                output: Default::default(),
+                error: Some(message.into()),
+            });
+        }
+
+        let parsed: SolcStandardJsonOutput = serde_json::from_slice(&stdout).map_err(|e| {
+            anyhow::anyhow!(
+                "failed to parse resolc JSON output: {e}\nstderr: {}",
+                String::from_utf8_lossy(&stderr)
+            )
+        })?;
+
+        Ok(CompilerOutput {
+            input,
+            output: parsed,
+            error: None,
+        })
+    }
+
+    fn new(resolc_path: PathBuf) -> Self {
+        Resolc { resolc_path }
+    }
+
+    fn get_compiler_executable(
+        config: &Arguments,
+        _version: semver::Version,
+    ) -> anyhow::Result<PathBuf> {
+        if !config.resolc.as_os_str().is_empty() {
+            return Ok(config.resolc.clone());
+        }
+
+        Ok(PathBuf::from("resolc"))
+    }
+}

crates/compiler/src/solc.rs

@@ -7,6 +7,8 @@ use std::{
 };
 
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
+use revive_dt_config::Arguments;
+use revive_dt_solc_binaries::download_solc;
 
 pub struct Solc {
     solc_path: PathBuf,
@@ -28,15 +30,34 @@ impl SolidityCompiler for Solc {
 
         let stdin = child.stdin.as_mut().expect("should be piped");
         serde_json::to_writer(stdin, &input.input)?;
+        let output = child.wait_with_output()?;
+
+        if !output.status.success() {
+            let message = String::from_utf8_lossy(&output.stderr);
+            tracing::error!("solc failed exit={} stderr={}", output.status, &message);
+            return Ok(CompilerOutput {
+                input,
+                output: Default::default(),
+                error: Some(message.into()),
+            });
+        }
 
-        let output = child.wait_with_output()?.stdout;
         Ok(CompilerOutput {
             input,
-            output: serde_json::from_slice(&output)?,
+            output: serde_json::from_slice(&output.stdout)?,
+            error: None,
         })
     }
 
     fn new(solc_path: PathBuf) -> Self {
         Self { solc_path }
     }
+
+    fn get_compiler_executable(
+        config: &Arguments,
+        version: semver::Version,
+    ) -> anyhow::Result<PathBuf> {
+        let path = download_solc(config.directory(), version, config.wasm)?;
+        Ok(path)
+    }
 }

crates/config/Cargo.toml

@@ -13,3 +13,5 @@ alloy = { workspace = true }
 clap = { workspace = true }
 semver = { workspace = true }
 temp-dir = { workspace = true }
+serde = { workspace = true }
+

crates/config/src/lib.rs

@@ -1,13 +1,17 @@
-//! The global configuration used accross all revive differential testing crates.
+//! The global configuration used across all revive differential testing crates.
 
-use std::path::{Path, PathBuf};
+use std::{
+    fmt::Display,
+    path::{Path, PathBuf},
+};
 
 use alloy::{network::EthereumWallet, signers::local::PrivateKeySigner};
 use clap::{Parser, ValueEnum};
 use semver::Version;
+use serde::{Deserialize, Serialize};
 use temp_dir::TempDir;
 
-#[derive(Debug, Parser, Clone)]
+#[derive(Debug, Parser, Clone, Serialize, Deserialize)]
 #[command(name = "retester")]
 pub struct Arguments {
     /// The `solc` version to use if the test didn't specify it explicitly.
@@ -40,6 +44,7 @@ pub struct Arguments {
     ///
     /// We attach it here because [TempDir] prunes itself on drop.
     #[clap(skip)]
+    #[serde(skip)]
     pub temp_dir: Option<&'static TempDir>,
 
     /// The path to the `geth` executable.
@@ -83,6 +88,22 @@ pub struct Arguments {
     /// Determines the amount of tests that are executed in parallel.
     #[arg(long = "workers", default_value = "12")]
     pub workers: usize,
+
+    /// Extract problems back to the test corpus.
+    #[arg(short, long = "extract-problems")]
+    pub extract_problems: bool,
+
+    /// The path to the `kitchensink` executable.
+    ///
+    /// By default it uses `substrate-node` binary found in `$PATH`.
+    #[arg(short, long = "kitchensink", default_value = "substrate-node")]
+    pub kitchensink: PathBuf,
+
+    /// The path to the `eth_proxy` executable.
+    ///
+    /// By default it uses `eth-rpc` binary found in `$PATH`.
+    #[arg(short = 'p', long = "eth_proxy", default_value = "eth-rpc")]
+    pub eth_proxy: PathBuf,
 }
 
 impl Arguments {
@@ -124,7 +145,7 @@ impl Default for Arguments {
 /// The Solidity compatible node implementation.
 ///
 /// This describes the solutions to be tested against on a high level.
-#[derive(Clone, Debug, Eq, Hash, PartialEq, ValueEnum)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Serialize, Deserialize)]
 #[clap(rename_all = "lower")]
 pub enum TestingPlatform {
     /// The go-ethereum reference full node EVM implementation.
@@ -132,3 +153,12 @@ pub enum TestingPlatform {
     /// The kitchensink runtime provides the PolkaVM (PVM) based node implentation.
     Kitchensink,
 }
+
+impl Display for TestingPlatform {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Geth => f.write_str("geth"),
+            Self::Kitchensink => f.write_str("revive"),
+        }
+    }
+}

crates/core/Cargo.toml

@@ -18,16 +18,14 @@ revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }
 revive-dt-node = { workspace = true }
 revive-dt-node-interaction = { workspace = true }
-revive-dt-solc-binaries = { workspace = true }
+revive-dt-report = { workspace = true }
 
 alloy = { workspace = true }
 anyhow = { workspace = true }
 clap = { workspace = true }
-log = { workspace = true }
-env_logger = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
 rayon = { workspace = true }
 revive-solc-json-interface = { workspace = true }
-semver = { workspace = true }
-serde = { workspace = true, features = [ "derive" ] }
 serde_json = { workspace = true }
 temp-dir = { workspace = true }

crates/core/src/driver/mod.rs

@@ -1,15 +1,25 @@
 //! The test driver handles the compilation and execution of the test cases.
 
+use alloy::json_abi::JsonAbi;
+use alloy::primitives::Bytes;
+use alloy::rpc::types::trace::geth::GethTrace;
+use alloy::rpc::types::{TransactionInput, TransactionReceipt};
 use alloy::{
-    primitives::{Address, map::HashMap},
-    rpc::types::trace::geth::GethTrace,
+    primitives::{Address, TxKind, map::HashMap},
+    rpc::types::{
+        TransactionRequest,
+        trace::geth::{AccountState, DiffMode},
+    },
 };
 use revive_dt_compiler::{Compiler, CompilerInput, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_dt_format::{input::Input, metadata::Metadata, mode::SolcMode};
 use revive_dt_node_interaction::EthereumNode;
-use revive_dt_solc_binaries::download_solc;
+use revive_dt_report::reporter::{CompilationTask, Report, Span};
 use revive_solc_json_interface::SolcStandardJsonOutput;
+use serde_json::Value;
+use std::collections::HashMap as StdHashMap;
+use tracing::Level;
 
 use crate::Platform;
 
@@ -20,58 +30,311 @@ type Contracts<T> = HashMap<
 
 pub struct State<'a, T: Platform> {
     config: &'a Arguments,
+    span: Span,
     contracts: Contracts<T>,
-    deployed_contracts: HashMap<String, Address>,
+    deployed_contracts: StdHashMap<String, Address>,
+    deployed_abis: StdHashMap<String, JsonAbi>,
 }
 
 impl<'a, T> State<'a, T>
 where
     T: Platform,
 {
-    pub fn new(config: &'a Arguments) -> Self {
+    pub fn new(config: &'a Arguments, span: Span) -> Self {
         Self {
             config,
+            span,
             contracts: Default::default(),
             deployed_contracts: Default::default(),
+            deployed_abis: Default::default(),
         }
     }
 
+    /// Returns a copy of the current span.
+    fn span(&self) -> Span {
+        self.span
+    }
+
     pub fn build_contracts(&mut self, mode: &SolcMode, metadata: &Metadata) -> anyhow::Result<()> {
+        let mut span = self.span();
+        span.next_metadata(
+            metadata
+                .file_path
+                .as_ref()
+                .expect("metadata should have been read from a file")
+                .clone(),
+        );
+
         let Some(version) = mode.last_patch_version(&self.config.solc) else {
-            anyhow::bail!("unsupported solc version: {:?}", mode.solc_version);
+            anyhow::bail!("unsupported solc version: {:?}", &mode.solc_version);
         };
 
-        let sources = metadata.contract_sources()?;
-        let base_path = metadata.directory()?.display().to_string();
-        let mut compiler = Compiler::<T::Compiler>::new().base_path(base_path.clone());
-        for (file, _contract) in sources.values() {
-            log::debug!("contract source {}", file.display());
+        let mut compiler = Compiler::<T::Compiler>::new()
+            .base_path(metadata.directory()?.display().to_string())
+            .solc_optimizer(mode.solc_optimize());
+
+        for (file, _contract) in metadata.contract_sources()?.values() {
+            tracing::debug!("contract source {}", file.display());
             compiler = compiler.with_source(file)?;
         }
 
-        let solc_path = download_solc(self.config.directory(), version, self.config.wasm)?;
-        let output = compiler
-            .solc_optimizer(mode.solc_optimize())
-            .try_build(solc_path)?;
+        let mut task = CompilationTask {
+            json_input: compiler.input(),
+            json_output: None,
+            mode: mode.clone(),
+            compiler_version: format!("{}", &version),
+            error: None,
+        };
 
-        self.contracts.insert(output.input, output.output);
+        let compiler_path = T::Compiler::get_compiler_executable(self.config, version)?;
+        match compiler.try_build(compiler_path) {
+            Ok(output) => {
+                task.json_output = Some(output.output.clone());
+                task.error = output.error;
+                self.contracts.insert(output.input, output.output);
 
-        Ok(())
+                if let Some(last_output) = self.contracts.values().last() {
+                    if let Some(contracts) = &last_output.contracts {
+                        for (file, contracts_map) in contracts {
+                            for contract_name in contracts_map.keys() {
+                                tracing::debug!(
+                                    "Compiled contract: {contract_name} from file: {file}"
+                                );
+                            }
+                        }
+                    } else {
+                        tracing::warn!("Compiled contracts field is None");
+                    }
+                }
+
+                Report::compilation(span, T::config_id(), task);
+                Ok(())
+            }
+            Err(error) => {
+                tracing::error!("Failed to compile contract: {:?}", error.to_string());
+                task.error = Some(error.to_string());
+                Err(error)
+            }
+        }
     }
 
     pub fn execute_input(
         &mut self,
         input: &Input,
         node: &T::Blockchain,
-    ) -> anyhow::Result<GethTrace> {
-        let receipt = node.execute_transaction(input.legacy_transaction(
+    ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
+        tracing::trace!("Calling execute_input for input: {input:?}");
+
+        let nonce = node.fetch_add_nonce(input.caller)?;
+
+        tracing::debug!(
+            "Nonce calculated on the execute contract, calculated nonce {}, for contract {}, having address {} on node: {}",
+            &nonce,
+            &input.instance,
+            &input.caller,
+            std::any::type_name::<T>()
+        );
+
+        let tx = match input.legacy_transaction(
             self.config.network_id,
-            0,
+            nonce,
             &self.deployed_contracts,
-        )?)?;
-        dbg!(&receipt);
-        //node.trace_transaction(receipt)
-        todo!()
+            &self.deployed_abis,
+        ) {
+            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:?}");
+
+        let receipt = match node.execute_transaction(tx) {
+            Ok(receipt) => receipt,
+            Err(err) => {
+                tracing::error!(
+                    "Failed to execute transaction when executing the contract: {}, {:?}",
+                    &input.instance,
+                    err
+                );
+                return Err(err);
+            }
+        };
+
+        tracing::trace!(
+            "Transaction receipt for executed contract: {} - {:?}",
+            &input.instance,
+            receipt,
+        );
+
+        let trace = node.trace_transaction(receipt.clone())?;
+        tracing::trace!(
+            "Trace result for contract: {} - {:?}",
+            &input.instance,
+            trace
+        );
+
+        let diff = node.state_diff(receipt.clone())?;
+
+        Ok((receipt, trace, diff))
+    }
+
+    pub fn deploy_contracts(&mut self, input: &Input, node: &T::Blockchain) -> anyhow::Result<()> {
+        tracing::debug!(
+            "Deploying contracts {}, having address {} on node: {}",
+            &input.instance,
+            &input.caller,
+            std::any::type_name::<T>()
+        );
+        for output in self.contracts.values() {
+            let Some(contract_map) = &output.contracts else {
+                tracing::debug!(
+                    "No contracts in output — skipping deployment for this input {}",
+                    &input.instance
+                );
+                continue;
+            };
+
+            for contracts in contract_map.values() {
+                for (contract_name, contract) in contracts {
+                    tracing::debug!(
+                        "Contract name is: {:?} and the input name is: {:?}",
+                        &contract_name,
+                        &input.instance
+                    );
+
+                    let bytecode = contract
+                        .evm
+                        .as_ref()
+                        .and_then(|evm| evm.bytecode.as_ref())
+                        .map(|b| b.object.clone());
+
+                    let Some(code) = bytecode else {
+                        tracing::error!("no bytecode for contract {contract_name}");
+                        continue;
+                    };
+
+                    let nonce = node.fetch_add_nonce(input.caller)?;
+
+                    tracing::debug!(
+                        "Calculated nonce {}, for contract {}, having address {} on node: {}",
+                        &nonce,
+                        &input.instance,
+                        &input.caller,
+                        std::any::type_name::<T>()
+                    );
+
+                    let tx = TransactionRequest {
+                        from: Some(input.caller),
+                        to: Some(TxKind::Create),
+                        gas_price: Some(5_000_000),
+                        gas: Some(5_000_000),
+                        chain_id: Some(self.config.network_id),
+                        nonce: Some(nonce),
+                        input: TransactionInput::new(Bytes::from(code.into_bytes())),
+                        ..Default::default()
+                    };
+
+                    let receipt = match node.execute_transaction(tx) {
+                        Ok(receipt) => receipt,
+                        Err(err) => {
+                            tracing::error!(
+                                "Failed to execute transaction when deploying the contract on node : {:?}, {:?}, {:?}",
+                                std::any::type_name::<T>(),
+                                &contract_name,
+                                err
+                            );
+                            return Err(err);
+                        }
+                    };
+
+                    tracing::debug!(
+                        "Deployment tx sent for {} with nonce {} → tx hash: {:?}, on node: {:?}",
+                        contract_name,
+                        nonce,
+                        receipt.transaction_hash,
+                        std::any::type_name::<T>(),
+                    );
+
+                    tracing::trace!(
+                        "Deployed transaction receipt for contract: {} - {:?}, on node: {:?}",
+                        &contract_name,
+                        receipt,
+                        std::any::type_name::<T>(),
+                    );
+
+                    let Some(address) = receipt.contract_address else {
+                        tracing::error!(
+                            "contract {contract_name} deployment did not return an address"
+                        );
+                        continue;
+                    };
+
+                    self.deployed_contracts
+                        .insert(contract_name.clone(), address);
+                    tracing::trace!(
+                        "deployed contract `{}` at {:?}, on node {:?}",
+                        contract_name,
+                        address,
+                        std::any::type_name::<T>()
+                    );
+
+                    if let Some(Value::String(metadata_json_str)) = &contract.metadata {
+                        tracing::trace!(
+                            "metadata found for contract {contract_name}, {metadata_json_str}"
+                        );
+
+                        match serde_json::from_str::<serde_json::Value>(metadata_json_str) {
+                            Ok(metadata_json) => {
+                                if let Some(abi_value) =
+                                    metadata_json.get("output").and_then(|o| o.get("abi"))
+                                {
+                                    match serde_json::from_value::<JsonAbi>(abi_value.clone()) {
+                                        Ok(parsed_abi) => {
+                                            tracing::trace!(
+                                                "ABI found in metadata for contract {}",
+                                                &contract_name
+                                            );
+                                            self.deployed_abis
+                                                .insert(contract_name.clone(), parsed_abi);
+                                        }
+                                        Err(err) => {
+                                            anyhow::bail!(
+                                                "Failed to parse ABI from metadata for contract {}: {}",
+                                                contract_name,
+                                                err
+                                            );
+                                        }
+                                    }
+                                } else {
+                                    anyhow::bail!(
+                                        "No ABI found in metadata for contract {}",
+                                        contract_name
+                                    );
+                                }
+                            }
+                            Err(err) => {
+                                anyhow::bail!(
+                                    "Failed to parse metadata JSON string for contract {}: {}",
+                                    contract_name,
+                                    err
+                                );
+                            }
+                        }
+                    } else {
+                        anyhow::bail!("No metadata found for contract {}", contract_name);
+                    }
+                }
+            }
+        }
+
+        tracing::debug!("Available contracts: {:?}", self.deployed_contracts.keys());
+
+        Ok(())
     }
 }
 
@@ -101,18 +364,114 @@ where
         }
     }
 
-    pub fn execute(&mut self) -> anyhow::Result<()> {
+    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 fn execute(&mut self, span: Span) -> anyhow::Result<()> {
         for mode in self.metadata.solc_modes() {
-            let mut leader_state = State::<L>::new(self.config);
+            let mut leader_state = State::<L>::new(self.config, span);
             leader_state.build_contracts(&mode, self.metadata)?;
 
-            let mut follower_state = State::<F>::new(self.config);
+            let mut follower_state = State::<F>::new(self.config, span);
             follower_state.build_contracts(&mode, self.metadata)?;
 
-            for case in &self.metadata.cases {
+            for (case_idx, case) in self.metadata.cases.iter().enumerate() {
+                // Creating a tracing span to know which case within the metadata is being executed
+                // and which one we're getting logs for.
+                let tracing_span = tracing::span!(
+                    Level::INFO,
+                    "Executing case",
+                    case = case.name,
+                    case_idx = case_idx
+                );
+                let _guard = tracing_span.enter();
+
                 for input in &case.inputs {
-                    let _ = leader_state.execute_input(input, self.leader_node)?;
-                    let _ = follower_state.execute_input(input, self.follower_node)?;
+                    tracing::debug!("Starting deploying contract {}", &input.instance);
+                    if let Err(err) = leader_state.deploy_contracts(input, self.leader_node) {
+                        tracing::error!("Leader deployment failed for {}: {err}", input.instance);
+                        continue;
+                    } else {
+                        tracing::debug!("Leader deployment succeeded for {}", &input.instance);
+                    }
+
+                    if let Err(err) = follower_state.deploy_contracts(input, self.follower_node) {
+                        tracing::error!("Follower deployment failed for {}: {err}", input.instance);
+                        continue;
+                    } else {
+                        tracing::debug!("Follower deployment succeeded for {}", &input.instance);
+                    }
+
+                    tracing::debug!("Starting executing contract {}", &input.instance);
+
+                    let (leader_receipt, _, leader_diff) =
+                        match leader_state.execute_input(input, self.leader_node) {
+                            Ok(result) => result,
+                            Err(err) => {
+                                tracing::error!(
+                                    "Leader execution failed for {}: {err}",
+                                    input.instance
+                                );
+                                continue;
+                            }
+                        };
+
+                    let (follower_receipt, _, follower_diff) =
+                        match follower_state.execute_input(input, self.follower_node) {
+                            Ok(result) => result,
+                            Err(err) => {
+                                tracing::error!(
+                                    "Follower execution failed for {}: {err}",
+                                    input.instance
+                                );
+                                continue;
+                            }
+                        };
+
+                    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());
+                    }
+
+                    if leader_receipt.status() != follower_receipt.status() {
+                        tracing::debug!(
+                            "Mismatch in status: leader = {}, follower = {}",
+                            leader_receipt.status(),
+                            follower_receipt.status()
+                        );
+                    }
                 }
             }
         }

crates/core/src/lib.rs

@@ -3,8 +3,9 @@
 //! This crate defines the testing configuration and
 //! provides a helper utilty to execute tests.
 
-use revive_dt_compiler::{SolidityCompiler, solc};
-use revive_dt_node::geth;
+use revive_dt_compiler::{SolidityCompiler, revive_resolc, solc};
+use revive_dt_config::TestingPlatform;
+use revive_dt_node::{geth, kitchensink::KitchensinkNode};
 use revive_dt_node_interaction::EthereumNode;
 
 pub mod driver;
@@ -15,6 +16,9 @@ pub mod driver;
 pub trait Platform {
     type Blockchain: EthereumNode;
     type Compiler: SolidityCompiler;
+
+    /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].
+    fn config_id() -> TestingPlatform;
 }
 
 #[derive(Default)]
@@ -23,12 +27,20 @@ pub struct Geth;
 impl Platform for Geth {
     type Blockchain = geth::Instance;
     type Compiler = solc::Solc;
+
+    fn config_id() -> TestingPlatform {
+        TestingPlatform::Geth
+    }
 }
 
 #[derive(Default)]
 pub struct Kitchensink;
 
 impl Platform for Kitchensink {
-    type Blockchain = geth::Instance;
-    type Compiler = solc::Solc;
+    type Blockchain = KitchensinkNode;
+    type Compiler = revive_resolc::Resolc;
+
+    fn config_id() -> TestingPlatform {
+        TestingPlatform::Kitchensink
+    }
 }

crates/core/src/main.rs

@@ -5,117 +5,169 @@ use rayon::{ThreadPoolBuilder, prelude::*};
 
 use revive_dt_config::*;
 use revive_dt_core::{
-    Geth,
+    Geth, Kitchensink, Platform,
     driver::{Driver, State},
 };
-use revive_dt_format::{corpus::Corpus, metadata::Metadata};
+use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
 use revive_dt_node::pool::NodePool;
+use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
+use tracing::Level;
+use tracing_subscriber::{EnvFilter, FmtSubscriber, fmt::format::FmtSpan};
 
 static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 
 fn main() -> anyhow::Result<()> {
     let args = init_cli()?;
 
-    let corpora = collect_corpora(&args)?;
+    for (corpus, tests) in collect_corpora(&args)? {
+        let span = Span::new(corpus, args.clone())?;
 
-    if let Some(platform) = &args.compile_only {
-        for tests in corpora.values() {
-            main_compile_only(&args, tests, platform)?;
+        match &args.compile_only {
+            Some(platform) => compile_corpus(&args, &tests, platform, span),
+            None => execute_corpus(&args, &tests, span)?,
         }
 
-        return Ok(());
-    }
-
-    for tests in corpora.values() {
-        main_execute_differential(&args, tests)?;
+        Report::save()?;
     }
 
     Ok(())
 }
 
 fn init_cli() -> anyhow::Result<Arguments> {
-    env_logger::init();
+    let subscriber = FmtSubscriber::builder()
+        .with_thread_ids(true)
+        .with_thread_names(true)
+        .with_env_filter(EnvFilter::from_default_env())
+        .with_span_events(FmtSpan::ENTER | FmtSpan::CLOSE)
+        .pretty()
+        .finish();
+    tracing::subscriber::set_global_default(subscriber)?;
 
     let mut args = Arguments::parse();
+
     if args.corpus.is_empty() {
         anyhow::bail!("no test corpus specified");
     }
-    if args.working_directory.is_none() {
-        args.temp_dir = Some(&TEMP_DIR);
+
+    match args.working_directory.as_ref() {
+        Some(dir) => {
+            if !dir.exists() {
+                anyhow::bail!("workdir {} does not exist", dir.display());
+            }
+        }
+        None => {
+            args.temp_dir = Some(&TEMP_DIR);
+        }
     }
+    tracing::info!("workdir: {}", args.directory().display());
 
     ThreadPoolBuilder::new()
         .num_threads(args.workers)
-        .build_global()
-        .unwrap();
+        .build_global()?;
 
     Ok(args)
 }
 
-fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metadata>>> {
+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)?;
-        log::info!("found corpus: {}", path.display());
+        tracing::info!("found corpus: {}", path.display());
         let tests = corpus.enumerate_tests();
-        log::info!("corpus '{}' contains {} tests", &corpus.name, tests.len());
+        tracing::info!("corpus '{}' contains {} tests", &corpus.name, tests.len());
         corpora.insert(corpus, tests);
     }
 
     Ok(corpora)
 }
 
-fn main_execute_differential(args: &Arguments, tests: &[Metadata]) -> anyhow::Result<()> {
-    let leader_nodes = NodePool::new(args)?;
-    let follower_nodes = NodePool::new(args)?;
+fn run_driver<L, F>(args: &Arguments, tests: &[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 leader_nodes = NodePool::<L::Blockchain>::new(args)?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
 
-    tests.par_iter().for_each(|metadata| {
-        let mut driver = match (&args.leader, &args.follower) {
-            (TestingPlatform::Geth, TestingPlatform::Kitchensink) => Driver::<Geth, Geth>::new(
+    tests.par_iter().for_each(
+        |MetadataFile {
+             content: metadata,
+             path: metadata_file_path,
+         }| {
+            // Starting a new tracing span for this metadata file. This allows our logs to be clear
+            // about which metadata file the logs belong to. We can add other information into this
+            // as well to be able to associate the logs with the correct metadata file and case
+            // that's being executed.
+            let tracing_span = tracing::span!(
+                Level::INFO,
+                "Running driver",
+                metadata_file_path = metadata_file_path.display().to_string(),
+            );
+            let _guard = tracing_span.enter();
+
+            let mut driver = Driver::<L, F>::new(
                 metadata,
                 args,
                 leader_nodes.round_robbin(),
                 follower_nodes.round_robbin(),
-            ),
-            _ => unimplemented!(),
-        };
+            );
 
-        match driver.execute() {
-            Ok(build) => {
-                log::info!(
-                    "metadata {} success",
-                    metadata.directory().as_ref().unwrap().display()
-                );
-                build
+            match driver.execute(span) {
+                Ok(_) => {
+                    tracing::info!(
+                        "metadata {} success",
+                        metadata.directory().as_ref().unwrap().display()
+                    );
+                }
+                Err(error) => {
+                    tracing::warn!(
+                        "metadata {} failure: {error:?}",
+                        metadata.file_path.as_ref().unwrap().display()
+                    );
+                }
             }
-            Err(error) => {
-                log::warn!(
-                    "metadata {} failure: {error:?}",
-                    metadata.file_path.as_ref().unwrap().display()
-                );
-            }
-        }
-    });
+        },
+    );
 
     Ok(())
 }
 
-fn main_compile_only(
+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)?
+        }
+        (TestingPlatform::Geth, TestingPlatform::Geth) => {
+            run_driver::<Geth, Geth>(args, tests, span)?
+        }
+        _ => unimplemented!(),
+    }
+
+    Ok(())
+}
+
+fn compile_corpus(
     config: &Arguments,
-    tests: &[Metadata],
+    tests: &[MetadataFile],
     platform: &TestingPlatform,
-) -> anyhow::Result<()> {
+    span: Span,
+) {
     tests.par_iter().for_each(|metadata| {
         for mode in &metadata.solc_modes() {
-            let mut state = match platform {
-                TestingPlatform::Geth => State::<Geth>::new(config),
-                _ => todo!(),
+            match platform {
+                TestingPlatform::Geth => {
+                    let mut state = State::<Geth>::new(config, span);
+                    let _ = state.build_contracts(mode, metadata);
+                }
+                TestingPlatform::Kitchensink => {
+                    let mut state = State::<Kitchensink>::new(config, span);
+                    let _ = state.build_contracts(mode, metadata);
+                }
             };
-            let _ = state.build_contracts(mode, metadata);
         }
     });
-
-    Ok(())
 }

crates/format/Cargo.toml

@@ -10,8 +10,10 @@ rust-version.workspace = true
 
 [dependencies]
 alloy = { workspace = true }
+alloy-primitives = { workspace = true }
+alloy-sol-types = { workspace = true }
 anyhow = { workspace = true }
-log = { workspace = true }
+tracing = { workspace = true }
 semver = { workspace = true }
-serde = { workspace = true, features = [ "derive" ] }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

crates/format/src/corpus.rs

@@ -3,11 +3,11 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-use crate::metadata::Metadata;
+use crate::metadata::MetadataFile;
 
-#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq, Hash)]
 pub struct Corpus {
     pub name: String,
     pub path: PathBuf,
@@ -21,7 +21,7 @@ impl Corpus {
     }
 
     /// Scan the corpus base directory and return all tests found.
-    pub fn enumerate_tests(&self) -> Vec<Metadata> {
+    pub fn enumerate_tests(&self) -> Vec<MetadataFile> {
         let mut tests = Vec::new();
         collect_metadata(&self.path, &mut tests);
         tests
@@ -34,11 +34,11 @@ impl Corpus {
 /// Found tests are inserted into `tests`.
 ///
 /// `path` is expected to be a directory.
-pub fn collect_metadata(path: &Path, tests: &mut Vec<Metadata>) {
+pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
     let dir_entry = match std::fs::read_dir(path) {
         Ok(dir_entry) => dir_entry,
         Err(error) => {
-            log::error!("failed to read dir '{}': {error}", path.display());
+            tracing::error!("failed to read dir '{}': {error}", path.display());
             return;
         }
     };
@@ -47,7 +47,7 @@ pub fn collect_metadata(path: &Path, tests: &mut Vec<Metadata>) {
         let entry = match entry {
             Ok(entry) => entry,
             Err(error) => {
-                log::error!("error reading dir entry: {error}");
+                tracing::error!("error reading dir entry: {error}");
                 continue;
             }
         };
@@ -59,7 +59,7 @@ pub fn collect_metadata(path: &Path, tests: &mut Vec<Metadata>) {
         }
 
         if path.is_file() {
-            if let Some(metadata) = Metadata::try_from_file(&path) {
+            if let Some(metadata) = MetadataFile::try_from_file(&path) {
                 tests.push(metadata)
             }
         }

crates/format/src/input.rs

@@ -1,9 +1,13 @@
 use std::collections::HashMap;
 
 use alloy::{
-    json_abi::Function, network::TransactionBuilder, primitives::Address,
-    rpc::types::TransactionRequest,
+    hex,
+    json_abi::{Function, JsonAbi},
+    primitives::{Address, Bytes, TxKind},
+    rpc::types::{TransactionInput, TransactionRequest},
 };
+use alloy_primitives::U256;
+use alloy_sol_types::SolValue;
 use semver::VersionReq;
 use serde::{Deserialize, de::Deserializer};
 use serde_json::Value;
@@ -43,7 +47,15 @@ pub struct ExpectedOutput {
 #[serde(untagged)]
 pub enum Calldata {
     Single(String),
-    Compound(Vec<String>),
+    Compound(Vec<CalldataArg>),
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
+#[serde(untagged)]
+pub enum CalldataArg {
+    Literal(String),
+    /// For example: `Contract.address`
+    AddressRef(String),
 }
 
 /// Specify how the contract is called.
@@ -101,25 +113,137 @@ impl Input {
             .ok_or_else(|| anyhow::anyhow!("instance {instance} not deployed"))
     }
 
+    pub fn encoded_input(
+        &self,
+        deployed_abis: &HashMap<String, JsonAbi>,
+        deployed_contracts: &HashMap<String, Address>,
+    ) -> anyhow::Result<Bytes> {
+        let Method::Function(selector) = self.method else {
+            return Ok(Bytes::default()); // fallback or deployer — no input
+        };
+
+        let abi = deployed_abis
+            .get(&self.instance)
+            .ok_or_else(|| anyhow::anyhow!("ABI for instance '{}' not found", &self.instance))?;
+
+        tracing::trace!("ABI found for instance: {}", &self.instance);
+
+        // Find function by selector
+        let function = abi
+            .functions()
+            .find(|f| f.selector().0 == selector)
+            .ok_or_else(|| {
+                anyhow::anyhow!(
+                    "Function with selector {:?} not found in ABI for the instance {:?}",
+                    selector,
+                    &self.instance
+                )
+            })?;
+
+        tracing::trace!("Functions found for instance: {}", &self.instance);
+
+        let calldata_args = match &self.calldata {
+            Some(Calldata::Compound(args)) => args,
+            _ => anyhow::bail!("Expected compound calldata for function call"),
+        };
+
+        if calldata_args.len() != function.inputs.len() {
+            anyhow::bail!(
+                "Function expects {} args, but got {}",
+                function.inputs.len(),
+                calldata_args.len()
+            );
+        }
+
+        tracing::trace!(
+            "Starting encoding ABI's parameters for instance: {}",
+            &self.instance
+        );
+
+        let mut encoded = selector.to_vec();
+
+        for (i, param) in function.inputs.iter().enumerate() {
+            let arg = calldata_args.get(i).unwrap();
+            let encoded_arg = match arg {
+                CalldataArg::Literal(value) => match param.ty.as_str() {
+                    "uint256" | "uint" => {
+                        let val: U256 = value.parse()?;
+                        val.abi_encode()
+                    }
+                    "uint24" => {
+                        let val: u32 = value.parse()?;
+                        (val & 0xFFFFFF).abi_encode()
+                    }
+                    "bool" => {
+                        let val: bool = value.parse()?;
+                        val.abi_encode()
+                    }
+                    "address" => {
+                        let addr: Address = value.parse()?;
+                        addr.abi_encode()
+                    }
+                    "string" => value.abi_encode(),
+                    "bytes32" => {
+                        let val = hex::decode(value.trim_start_matches("0x"))?;
+                        let mut fixed = [0u8; 32];
+                        fixed[..val.len()].copy_from_slice(&val);
+                        fixed.abi_encode()
+                    }
+                    "uint256[]" | "uint[]" => {
+                        let nums: Vec<u64> = serde_json::from_str(value)?;
+                        nums.abi_encode()
+                    }
+                    "bytes" => {
+                        let val = hex::decode(value.trim_start_matches("0x"))?;
+                        val.abi_encode()
+                    }
+                    _ => anyhow::bail!("Unsupported type: {}", param.ty),
+                },
+                CalldataArg::AddressRef(name) => {
+                    let contract_name = name.trim_end_matches(".address");
+                    let addr = deployed_contracts
+                        .get(contract_name)
+                        .copied()
+                        .ok_or_else(|| {
+                            anyhow::anyhow!("Address for '{}' not found", contract_name)
+                        })?;
+                    addr.abi_encode()
+                }
+            };
+
+            encoded.extend(encoded_arg);
+        }
+
+        Ok(Bytes::from(encoded))
+    }
+
     /// Parse this input into a legacy transaction.
     pub fn legacy_transaction(
         &self,
         chain_id: u64,
         nonce: u64,
         deployed_contracts: &HashMap<String, Address>,
+        deployed_abis: &HashMap<String, JsonAbi>,
     ) -> anyhow::Result<TransactionRequest> {
         let to = match self.method {
-            Method::Deployer => Address::ZERO,
-            _ => self.instance_to_address(&self.instance, deployed_contracts)?,
+            Method::Deployer => Some(TxKind::Create),
+            _ => Some(TxKind::Call(
+                self.instance_to_address(&self.instance, deployed_contracts)?,
+            )),
         };
 
-        Ok(TransactionRequest::default()
-            .with_from(self.caller)
-            .with_to(to)
-            .with_nonce(nonce)
-            .with_chain_id(chain_id)
-            .with_gas_price(20_000_000_000)
-            .with_gas_limit(20_000_000_000))
+        let input_data = self.encoded_input(deployed_abis, deployed_contracts)?;
+
+        Ok(TransactionRequest {
+            from: Some(self.caller),
+            to,
+            nonce: Some(nonce),
+            chain_id: Some(chain_id),
+            gas_price: Some(5_000_000),
+            gas: Some(5_000_000),
+            input: TransactionInput::new(input_data),
+            ..Default::default()
+        })
     }
 }
 
@@ -130,3 +254,201 @@ fn default_instance() -> String {
 fn default_caller() -> Address {
     "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap()
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use alloy::json_abi::JsonAbi;
+    use alloy_primitives::{address, keccak256};
+    use std::collections::HashMap;
+
+    #[test]
+    fn test_encoded_input_uint256() {
+        let raw_metadata = r#"
+            [
+                {
+                    "inputs": [{"name": "value", "type": "uint256"}],
+                    "name": "store",
+                    "outputs": [],
+                    "stateMutability": "nonpayable",
+                    "type": "function"
+                }
+            ]
+        "#;
+
+        let parsed_abi: JsonAbi = serde_json::from_str(raw_metadata).unwrap();
+        let selector = keccak256("store(uint256)".as_bytes())[0..4]
+            .try_into()
+            .unwrap();
+
+        let input = Input {
+            instance: "Contract".to_string(),
+            method: Method::Function(selector),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "42".to_string(),
+            )])),
+            ..Default::default()
+        };
+
+        let mut deployed_abis = HashMap::new();
+        deployed_abis.insert("Contract".to_string(), parsed_abi);
+        let deployed_contracts = HashMap::new();
+
+        let encoded = input
+            .encoded_input(&deployed_abis, &deployed_contracts)
+            .unwrap();
+        assert!(encoded.0.starts_with(&selector));
+
+        type T = (u64,);
+        let decoded: T = T::abi_decode(&encoded.0[4..]).unwrap();
+        assert_eq!(decoded.0, 42);
+    }
+
+    #[test]
+    fn test_encoded_input_bool() {
+        let raw_abi = r#"[
+            {
+                "inputs": [{"name": "flag", "type": "bool"}],
+                "name": "toggle",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            }
+        ]"#;
+
+        let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
+        let selector = keccak256("toggle(bool)".as_bytes())[0..4]
+            .try_into()
+            .unwrap();
+
+        let input = Input {
+            instance: "Contract".to_string(),
+            method: Method::Function(selector),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "true".to_string(),
+            )])),
+            ..Default::default()
+        };
+
+        let mut abis = HashMap::new();
+        abis.insert("Contract".to_string(), parsed_abi);
+        let contracts = HashMap::new();
+
+        let encoded = input.encoded_input(&abis, &contracts).unwrap();
+        assert!(encoded.0.starts_with(&selector));
+
+        type T = (bool,);
+        let decoded: T = T::abi_decode(&encoded.0[4..]).unwrap();
+        assert_eq!(decoded.0, true);
+    }
+
+    #[test]
+    fn test_encoded_input_string() {
+        let raw_abi = r#"[
+            {
+                "inputs": [{"name": "msg", "type": "string"}],
+                "name": "echo",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            }
+        ]"#;
+
+        let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
+        let selector = keccak256("echo(string)".as_bytes())[0..4]
+            .try_into()
+            .unwrap();
+
+        let input = Input {
+            instance: "Contract".to_string(),
+            method: Method::Function(selector),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "hello".to_string(),
+            )])),
+            ..Default::default()
+        };
+
+        let mut abis = HashMap::new();
+        abis.insert("Contract".to_string(), parsed_abi);
+        let contracts = HashMap::new();
+
+        let encoded = input.encoded_input(&abis, &contracts).unwrap();
+        assert!(encoded.0.starts_with(&selector));
+    }
+
+    #[test]
+    fn test_encoded_input_uint256_array() {
+        let raw_abi = r#"[
+        {
+            "inputs": [{"name": "arr", "type": "uint256[]"}],
+            "name": "sum",
+            "outputs": [],
+            "stateMutability": "nonpayable",
+            "type": "function"
+        }
+        ]"#;
+
+        let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
+        let selector = keccak256("sum(uint256[])".as_bytes())[0..4]
+            .try_into()
+            .unwrap();
+
+        let input = Input {
+            instance: "Contract".to_string(),
+            method: Method::Function(selector),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "[1,2,3]".to_string(),
+            )])),
+            ..Default::default()
+        };
+
+        let mut abis = HashMap::new();
+        abis.insert("Contract".to_string(), parsed_abi);
+        let contracts = HashMap::new();
+
+        let encoded = input.encoded_input(&abis, &contracts).unwrap();
+        assert!(encoded.0.starts_with(&selector));
+    }
+
+    #[test]
+    fn test_encoded_input_address() {
+        let raw_abi = r#"[
+        {
+            "inputs": [{"name": "recipient", "type": "address"}],
+            "name": "send",
+            "outputs": [],
+            "stateMutability": "nonpayable",
+            "type": "function"
+        }
+        ]"#;
+
+        let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
+        let selector = keccak256("send(address)".as_bytes())[0..4]
+            .try_into()
+            .unwrap();
+
+        let input = Input {
+            instance: "Contract".to_string(),
+            method: Method::Function(selector),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "0x1000000000000000000000000000000000000001".to_string(),
+            )])),
+            ..Default::default()
+        };
+
+        let mut abis = HashMap::new();
+        abis.insert("Contract".to_string(), parsed_abi);
+        let contracts = HashMap::new();
+
+        let encoded = input.encoded_input(&abis, &contracts).unwrap();
+        assert!(encoded.0.starts_with(&selector));
+
+        type T = (alloy_primitives::Address,);
+        let decoded: T = T::abi_decode(&encoded.0[4..]).unwrap();
+        assert_eq!(
+            decoded.0,
+            address!("0x1000000000000000000000000000000000000001")
+        );
+    }
+}

crates/format/src/metadata.rs

@@ -1,6 +1,7 @@
 use std::{
     collections::BTreeMap,
     fs::{File, read_to_string},
+    ops::Deref,
     path::{Path, PathBuf},
 };
 
@@ -15,6 +16,29 @@ pub const METADATA_FILE_EXTENSION: &str = "json";
 pub const SOLIDITY_CASE_FILE_EXTENSION: &str = "sol";
 pub const SOLIDITY_CASE_COMMENT_MARKER: &str = "//!";
 
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
+pub struct MetadataFile {
+    pub path: PathBuf,
+    pub content: Metadata,
+}
+
+impl MetadataFile {
+    pub fn try_from_file(path: &Path) -> Option<Self> {
+        Metadata::try_from_file(path).map(|metadata| Self {
+            path: path.to_owned(),
+            content: metadata,
+        })
+    }
+}
+
+impl Deref for MetadataFile {
+    type Target = Metadata;
+
+    fn deref(&self) -> &Self::Target {
+        &self.content
+    }
+}
+
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
     pub cases: Vec<Case>,
@@ -35,7 +59,7 @@ impl Metadata {
             .filter_map(|mode| match mode {
                 Mode::Solidity(solc_mode) => Some(solc_mode),
                 Mode::Unknown(mode) => {
-                    log::debug!("compiler: ignoring unknown mode '{mode}'");
+                    tracing::debug!("compiler: ignoring unknown mode '{mode}'");
                     None
                 }
             })
@@ -90,7 +114,7 @@ impl Metadata {
         assert!(path.is_file(), "not a file: {}", path.display());
 
         let Some(file_extension) = path.extension() else {
-            log::debug!("skipping corpus file: {}", path.display());
+            tracing::debug!("skipping corpus file: {}", path.display());
             return None;
         };
 
@@ -102,14 +126,14 @@ impl Metadata {
             return Self::try_from_solidity(path);
         }
 
-        log::debug!("ignoring invalid corpus file: {}", path.display());
+        tracing::debug!("ignoring invalid corpus file: {}", path.display());
         None
     }
 
     fn try_from_json(path: &Path) -> Option<Self> {
         let file = File::open(path)
             .inspect_err(|error| {
-                log::error!(
+                tracing::error!(
                     "opening JSON test metadata file '{}' error: {error}",
                     path.display()
                 );
@@ -122,7 +146,7 @@ impl Metadata {
                 Some(metadata)
             }
             Err(error) => {
-                log::error!(
+                tracing::error!(
                     "parsing JSON test metadata file '{}' error: {error}",
                     path.display()
                 );
@@ -132,9 +156,9 @@ impl Metadata {
     }
 
     fn try_from_solidity(path: &Path) -> Option<Self> {
-        let buf = read_to_string(path)
+        let spec = read_to_string(path)
             .inspect_err(|error| {
-                log::error!(
+                tracing::error!(
                     "opening JSON test metadata file '{}' error: {error}",
                     path.display()
                 );
@@ -147,18 +171,24 @@ impl Metadata {
                 buf
             });
 
-        if buf.is_empty() {
+        if spec.is_empty() {
             return None;
         }
 
-        match serde_json::from_str::<Self>(&buf) {
+        match serde_json::from_str::<Self>(&spec) {
             Ok(mut metadata) => {
                 metadata.file_path = Some(path.to_path_buf());
+                let name = path
+                    .file_name()
+                    .expect("this should be the path to a Solidity file")
+                    .to_str()
+                    .expect("the file name should be valid UTF-8k");
+                metadata.contracts = Some([(String::from("Test"), format!("{name}:Test"))].into());
                 Some(metadata)
             }
             Err(error) => {
-                log::error!(
-                    "parsing Solidity test metadata file '{}' error: {error}",
+                tracing::error!(
+                    "parsing Solidity test metadata file '{}' error: '{error}' from data: {spec}",
                     path.display()
                 );
                 None

crates/format/src/mode.rs

@@ -1,16 +1,16 @@
 use semver::Version;
-use serde::Deserialize;
 use serde::de::Deserializer;
+use serde::{Deserialize, Serialize};
 
 /// Specifies the compilation mode of the test artifact.
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Hash, Debug, Clone, Eq, PartialEq)]
 pub enum Mode {
     Solidity(SolcMode),
     Unknown(String),
 }
 
 /// Specify Solidity specific compiler options.
-#[derive(Debug, Default, Clone, Eq, PartialEq)]
+#[derive(Hash, Debug, Default, Clone, Eq, PartialEq, Serialize, Deserialize)]
 pub struct SolcMode {
     pub solc_version: Option<semver::VersionReq>,
     solc_optimize: Option<bool>,

crates/node-interaction/Cargo.toml

@@ -11,8 +11,6 @@ rust-version.workspace = true
 [dependencies]
 alloy = { workspace = true }
 anyhow = { workspace = true }
-hex = { workspace = true }
-log = { workspace = true }
+tracing = { workspace = true }
 once_cell = { workspace = true }
-serde_json = { workspace = true }
 tokio = { workspace = true }

crates/node-interaction/src/lib.rs

@@ -1,9 +1,11 @@
 //! This crate implements all node interactions.
 
-use alloy::rpc::types::trace::geth::GethTrace;
+use alloy::primitives::Address;
+use alloy::rpc::types::trace::geth::{DiffMode, GethTrace};
 use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
 use tokio_runtime::TO_TOKIO;
 
+pub mod nonce;
 mod tokio_runtime;
 pub mod trace;
 pub mod transaction;
@@ -18,4 +20,10 @@ pub trait EthereumNode {
 
     /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
     fn trace_transaction(&self, transaction: TransactionReceipt) -> anyhow::Result<GethTrace>;
+
+    /// Returns the state diff of the transaction hash in the [TransactionReceipt].
+    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode>;
+
+    /// Returns the next available nonce for the given [Address].
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64>;
 }

crates/node-interaction/src/nonce.rs

@@ -0,0 +1,55 @@
+use std::pin::Pin;
+
+use alloy::{
+    primitives::Address,
+    providers::{Provider, ProviderBuilder},
+};
+use tokio::sync::oneshot;
+
+use crate::{TO_TOKIO, tokio_runtime::AsyncNodeInteraction};
+
+pub type Task = Pin<Box<dyn Future<Output = anyhow::Result<u64>> + Send>>;
+
+pub(crate) struct Nonce {
+    sender: oneshot::Sender<anyhow::Result<u64>>,
+    task: Task,
+}
+
+impl AsyncNodeInteraction for Nonce {
+    type Output = anyhow::Result<u64>;
+
+    fn split(
+        self,
+    ) -> (
+        std::pin::Pin<Box<dyn Future<Output = Self::Output> + Send>>,
+        oneshot::Sender<Self::Output>,
+    ) {
+        (self.task, self.sender)
+    }
+}
+
+/// This is like `trace_transaction`, just for nonces.
+pub fn fetch_onchain_nonce(
+    connection: String,
+    wallet: alloy::network::EthereumWallet,
+    address: Address,
+) -> anyhow::Result<u64> {
+    let sender = TO_TOKIO.lock().unwrap().nonce_sender.clone();
+
+    let (tx, rx) = oneshot::channel();
+    let task: Task = Box::pin(async move {
+        let provider = ProviderBuilder::new()
+            .wallet(wallet)
+            .connect(&connection)
+            .await?;
+        let onchain = provider.get_transaction_count(address).await?;
+        Ok(onchain)
+    });
+
+    sender
+        .blocking_send(Nonce { task, sender: tx })
+        .expect("not in async context");
+
+    rx.blocking_recv()
+        .unwrap_or_else(|err| anyhow::bail!("nonce fetch failed: {err}"))
+}

crates/node-interaction/src/tokio_runtime.rs

@@ -10,6 +10,7 @@ use tokio::spawn;
 use tokio::sync::{mpsc, oneshot};
 use tokio::task::JoinError;
 
+use crate::nonce::Nonce;
 use crate::trace::Trace;
 use crate::transaction::Transaction;
 
@@ -33,6 +34,7 @@ pub(crate) trait AsyncNodeInteraction: Send + 'static {
 pub(crate) struct TokioRuntime {
     pub(crate) transaction_sender: mpsc::Sender<Transaction>,
     pub(crate) trace_sender: mpsc::Sender<Trace>,
+    pub(crate) nonce_sender: mpsc::Sender<Nonce>,
 }
 
 impl TokioRuntime {
@@ -40,17 +42,22 @@ impl TokioRuntime {
         let rt = Runtime::new().expect("should be able to create the tokio runtime");
         let (transaction_sender, transaction_receiver) = mpsc::channel::<Transaction>(1024);
         let (trace_sender, trace_receiver) = mpsc::channel::<Trace>(1024);
+        let (nonce_sender, nonce_receiver) = mpsc::channel::<Nonce>(1024);
 
         thread::spawn(move || {
             rt.block_on(async move {
                 let transaction_task = spawn(interaction::<Transaction>(transaction_receiver));
                 let trace_task = spawn(interaction::<Trace>(trace_receiver));
+                let nonce_task = spawn(interaction::<Nonce>(nonce_receiver));
 
                 if let Err(error) = transaction_task.await {
-                    log::error!("tokio transaction task failed: {error}");
+                    tracing::error!("tokio transaction task failed: {error}");
                 }
                 if let Err(error) = trace_task.await {
-                    log::error!("tokio trace transaction task failed: {error}");
+                    tracing::error!("tokio trace transaction task failed: {error}");
+                }
+                if let Err(error) = nonce_task.await {
+                    tracing::error!("tokio nonce task failed: {error}");
                 }
             });
         });
@@ -58,6 +65,7 @@ impl TokioRuntime {
         Self {
             transaction_sender,
             trace_sender,
+            nonce_sender,
         }
     }
 }

crates/node/Cargo.toml

@@ -11,11 +11,16 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 alloy = { workspace = true }
-log = { workspace = true }
-serde_json = { workspace = true }
+tracing = { workspace = true }
+tokio = { workspace = true }
 
 revive-dt-node-interaction = { workspace = true }
 revive-dt-config = { workspace = true }
 
+serde_json = { workspace = true }
+
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
+
 [dev-dependencies]
 temp-dir = { workspace = true }

crates/node/src/geth.rs

@@ -1,17 +1,22 @@
 //! The go-ethereum node implementation.
 
 use std::{
+    collections::HashMap,
     fs::{File, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
     path::PathBuf,
     process::{Child, Command, Stdio},
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        Mutex,
+        atomic::{AtomicU32, Ordering},
+    },
     thread,
     time::{Duration, Instant},
 };
 
 use alloy::{
     network::EthereumWallet,
+    primitives::Address,
     providers::{Provider, ProviderBuilder, ext::DebugApi},
     rpc::types::{
         TransactionReceipt, TransactionRequest,
@@ -20,7 +25,8 @@ use alloy::{
 };
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{
-    EthereumNode, trace::trace_transaction, transaction::execute_transaction,
+    EthereumNode, nonce::fetch_onchain_nonce, trace::trace_transaction,
+    transaction::execute_transaction,
 };
 
 use crate::Node;
@@ -45,6 +51,7 @@ pub struct Instance {
     network_id: u64,
     start_timeout: u64,
     wallet: EthereumWallet,
+    nonces: Mutex<HashMap<Address, u64>>,
 }
 
 impl Instance {
@@ -153,14 +160,84 @@ impl EthereumNode for Instance {
         let wallet = self.wallet.clone();
 
         execute_transaction(Box::pin(async move {
-            Ok(ProviderBuilder::new()
+            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction,);
+            let _outer_guard = outer_span.enter();
+
+            let provider = ProviderBuilder::new()
                 .wallet(wallet)
                 .connect(&connection_string)
-                .await?
-                .send_transaction(transaction)
-                .await?
-                .get_receipt()
-                .await?)
+                .await?;
+
+            let pending_transaction = provider.send_transaction(transaction).await?;
+            let transaction_hash = pending_transaction.tx_hash();
+
+            let span = tracing::info_span!("Awaiting transaction receipt", ?transaction_hash);
+            let _guard = span.enter();
+
+            // The following is a fix for the "transaction indexing is in progress" error that we
+            // used to get. You can find more information on this in the following GH issue in geth
+            // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on,
+            // before we can get the receipt of the transaction it needs to have been indexed by the
+            // node's indexer. Just because the transaction has been confirmed it doesn't mean that
+            // it has been indexed. When we call alloy's `get_receipt` it checks if the transaction
+            // was confirmed. If it has been, then it will call `eth_getTransactionReceipt` method
+            // which _might_ return the above error if the tx has not yet been indexed yet. So, we
+            // need to implement a retry mechanism for the receipt to keep retrying to get it until
+            // it eventually works, but we only do that if the error we get back is the "transaction
+            // indexing is in progress" error or if the receipt is None.
+            //
+            // At the moment we do not allow for the 60 seconds to be modified and we take it as
+            // being an implementation detail that's invisible to anything outside of this module.
+            //
+            // We allow a total of 60 retries for getting the receipt with one second between each
+            // retry and the next which means that we allow for a total of 60 seconds of waiting
+            // before we consider that we're unable to get the transaction receipt.
+            let mut retries = 0;
+            loop {
+                match provider.get_transaction_receipt(*transaction_hash).await {
+                    Ok(Some(receipt)) => {
+                        tracing::info!("Obtained the transaction receipt");
+                        break Ok(receipt);
+                    }
+                    Ok(None) => {
+                        if retries == 60 {
+                            tracing::error!(
+                                "Polled for transaction receipt for 60 seconds but failed to get it"
+                            );
+                            break Err(anyhow::anyhow!("Failed to get the transaction receipt"));
+                        } else {
+                            tracing::trace!(
+                                retries,
+                                "Sleeping for 1 second and trying to get the receipt again"
+                            );
+                            retries += 1;
+                            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                            continue;
+                        }
+                    }
+                    Err(error) => {
+                        let error_string = error.to_string();
+                        if error_string.contains("transaction indexing is in progress") {
+                            if retries == 60 {
+                                tracing::error!(
+                                    "Polled for transaction receipt for 60 seconds but failed to get it"
+                                );
+                                break Err(error.into());
+                            } else {
+                                tracing::trace!(
+                                    retries,
+                                    "Sleeping for 1 second and trying to get the receipt again"
+                                );
+                                retries += 1;
+                                tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                                continue;
+                            }
+                        } else {
+                            break Err(error.into());
+                        }
+                    }
+                }
+            }
         }))
     }
 
@@ -185,6 +262,32 @@ impl EthereumNode for Instance {
                 .await?)
         }))
     }
+
+    fn state_diff(
+        &self,
+        transaction: alloy::rpc::types::TransactionReceipt,
+    ) -> anyhow::Result<DiffMode> {
+        match self
+            .trace_transaction(transaction)?
+            .try_into_pre_state_frame()?
+        {
+            PreStateFrame::Diff(diff) => Ok(diff),
+            _ => anyhow::bail!("expected a diff mode trace"),
+        }
+    }
+
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
+        let connection_string = self.connection_string.clone();
+        let wallet = self.wallet.clone();
+
+        let onchain_nonce = fetch_onchain_nonce(connection_string, wallet, address)?;
+
+        let mut nonces = self.nonces.lock().unwrap();
+        let current = nonces.entry(address).or_insert(onchain_nonce);
+        let value = *current;
+        *current += 1;
+        Ok(value)
+    }
 }
 
 impl Node for Instance {
@@ -203,6 +306,7 @@ impl Node for Instance {
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
             wallet: config.wallet(),
+            nonces: Mutex::new(HashMap::new()),
         }
     }
 
@@ -219,19 +323,6 @@ impl Node for Instance {
         Ok(())
     }
 
-    fn state_diff(
-        &self,
-        transaction: alloy::rpc::types::TransactionReceipt,
-    ) -> anyhow::Result<DiffMode> {
-        match self
-            .trace_transaction(transaction)?
-            .try_into_pre_state_frame()?
-        {
-            PreStateFrame::Diff(diff) => Ok(diff),
-            _ => anyhow::bail!("expected a diff mode trace"),
-        }
-    }
-
     fn version(&self) -> anyhow::Result<String> {
         let output = Command::new(&self.geth)
             .arg("--version")
@@ -247,6 +338,7 @@ impl Node for Instance {
 
 impl Drop for Instance {
     fn drop(&mut self) {
+        tracing::info!(id = self.id, "Dropping node");
         if let Some(child) = self.handle.as_mut() {
             let _ = child.kill();
         }

crates/node/src/kitchensink.rs

@@ -0,0 +1,564 @@
+use std::{
+    collections::HashMap,
+    fs::create_dir_all,
+    io::BufRead,
+    path::PathBuf,
+    process::{Child, Command, Stdio},
+    sync::{
+        Mutex,
+        atomic::{AtomicU32, Ordering},
+    },
+    time::Duration,
+};
+
+use alloy::{
+    hex,
+    network::EthereumWallet,
+    primitives::Address,
+    providers::{Provider, ProviderBuilder, ext::DebugApi},
+    rpc::types::{
+        TransactionReceipt,
+        trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
+    },
+};
+use serde_json::{Value as JsonValue, json};
+use sp_core::crypto::Ss58Codec;
+use sp_runtime::AccountId32;
+
+use revive_dt_config::Arguments;
+use revive_dt_node_interaction::{
+    EthereumNode, nonce::fetch_onchain_nonce, trace::trace_transaction,
+    transaction::execute_transaction,
+};
+
+use crate::Node;
+
+static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
+
+#[derive(Debug)]
+pub struct KitchensinkNode {
+    id: u32,
+    substrate_binary: PathBuf,
+    eth_proxy_binary: PathBuf,
+    rpc_url: String,
+    wallet: EthereumWallet,
+    base_directory: PathBuf,
+    process_substrate: Option<Child>,
+    process_proxy: Option<Child>,
+    nonces: Mutex<HashMap<Address, u64>>,
+}
+
+impl KitchensinkNode {
+    const BASE_DIRECTORY: &str = "kitchensink";
+    const SUBSTRATE_READY_MARKER: &str = "Running JSON-RPC server";
+    const ETH_PROXY_READY_MARKER: &str = "Running JSON-RPC server";
+    const CHAIN_SPEC_JSON_FILE: &str = "template_chainspec.json";
+    const BASE_SUBSTRATE_RPC_PORT: u16 = 9944;
+    const BASE_PROXY_RPC_PORT: u16 = 8545;
+
+    const SUBSTRATE_LOG_ENV: &str = "error,evm=debug,sc_rpc_server=info,runtime::revive=debug";
+    const PROXY_LOG_ENV: &str = "info,eth-rpc=debug";
+
+    fn init(&mut self, genesis: &str) -> anyhow::Result<&mut Self> {
+        create_dir_all(&self.base_directory)?;
+
+        let template_chainspec_path = self.base_directory.join(Self::CHAIN_SPEC_JSON_FILE);
+
+        let output = Command::new(&self.substrate_binary)
+            .arg("export-chain-spec")
+            .arg("--chain")
+            .arg("dev")
+            .output()?;
+
+        if !output.status.success() {
+            anyhow::bail!(
+                "substrate-node export-chain-spec failed: {}",
+                String::from_utf8_lossy(&output.stderr)
+            );
+        }
+
+        let content = String::from_utf8(output.stdout)?;
+        let mut chainspec_json: JsonValue = serde_json::from_str(&content)?;
+
+        let existing_chainspec_balances =
+            chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"]
+                .as_array()
+                .cloned()
+                .unwrap_or_default();
+
+        let mut merged_balances: Vec<(String, u128)> = existing_chainspec_balances
+            .into_iter()
+            .filter_map(|val| {
+                if let Some(arr) = val.as_array() {
+                    if arr.len() == 2 {
+                        let account = arr[0].as_str()?.to_string();
+                        let balance = arr[1].as_f64()? as u128;
+                        return Some((account, balance));
+                    }
+                }
+                None
+            })
+            .collect();
+        let mut eth_balances = self.extract_balance_from_genesis_file(genesis)?;
+        merged_balances.append(&mut eth_balances);
+
+        chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] =
+            json!(merged_balances);
+
+        serde_json::to_writer_pretty(
+            std::fs::File::create(&template_chainspec_path)?,
+            &chainspec_json,
+        )?;
+        Ok(self)
+    }
+
+    fn spawn_process(&mut self) -> anyhow::Result<()> {
+        let substrate_rpc_port = Self::BASE_SUBSTRATE_RPC_PORT + self.id as u16;
+        let proxy_rpc_port = Self::BASE_PROXY_RPC_PORT + self.id as u16;
+
+        self.rpc_url = format!("http://127.0.0.1:{proxy_rpc_port}");
+
+        let chainspec_path = self.base_directory.join(Self::CHAIN_SPEC_JSON_FILE);
+
+        // Start Substrate node
+        let mut substrate_process = Command::new(&self.substrate_binary)
+            .arg("--chain")
+            .arg(chainspec_path)
+            .arg("--base-path")
+            .arg(&self.base_directory)
+            .arg("--rpc-port")
+            .arg(substrate_rpc_port.to_string())
+            .arg("--name")
+            .arg(format!("revive-kitchensink-{}", self.id))
+            .arg("--force-authoring")
+            .arg("--rpc-methods")
+            .arg("Unsafe")
+            .arg("--rpc-cors")
+            .arg("all")
+            .env("RUST_LOG", Self::SUBSTRATE_LOG_ENV)
+            .stdout(Stdio::null())
+            .stderr(Stdio::piped())
+            .spawn()?;
+
+        // Give the node a moment to boot
+        Self::wait_ready(
+            &mut substrate_process,
+            Self::SUBSTRATE_READY_MARKER,
+            Duration::from_secs(30),
+        )?;
+
+        let mut proxy_process = Command::new(&self.eth_proxy_binary)
+            .arg("--dev")
+            .arg("--rpc-port")
+            .arg(proxy_rpc_port.to_string())
+            .arg("--node-rpc-url")
+            .arg(format!("ws://127.0.0.1:{substrate_rpc_port}"))
+            .env("RUST_LOG", Self::PROXY_LOG_ENV)
+            .stdout(Stdio::null())
+            .stderr(Stdio::piped())
+            .spawn()?;
+
+        Self::wait_ready(
+            &mut proxy_process,
+            Self::ETH_PROXY_READY_MARKER,
+            Duration::from_secs(30),
+        )?;
+
+        self.process_substrate = Some(substrate_process);
+        self.process_proxy = Some(proxy_process);
+
+        Ok(())
+    }
+
+    fn extract_balance_from_genesis_file(
+        &self,
+        genesis_str: &str,
+    ) -> anyhow::Result<Vec<(String, u128)>> {
+        let genesis_json: JsonValue = serde_json::from_str(genesis_str)?;
+        let alloc = genesis_json
+            .get("alloc")
+            .and_then(|a| a.as_object())
+            .ok_or_else(|| anyhow::anyhow!("Missing 'alloc' in genesis"))?;
+
+        let mut balances = Vec::new();
+        for (eth_addr, obj) in alloc.iter() {
+            let balance_str = obj.get("balance").and_then(|b| b.as_str()).unwrap_or("0");
+            let balance = if balance_str.starts_with("0x") {
+                u128::from_str_radix(balance_str.trim_start_matches("0x"), 16)?
+            } else {
+                balance_str.parse::<u128>()?
+            };
+            let substrate_addr = Self::eth_to_substrate_address(eth_addr)?;
+            balances.push((substrate_addr.clone(), balance));
+        }
+        Ok(balances)
+    }
+
+    fn eth_to_substrate_address(eth_addr: &str) -> anyhow::Result<String> {
+        let eth_bytes = hex::decode(eth_addr.trim_start_matches("0x"))?;
+        if eth_bytes.len() != 20 {
+            anyhow::bail!(
+                "Invalid Ethereum address length: expected 20 bytes, got {}",
+                eth_bytes.len()
+            );
+        }
+
+        let mut padded = [0xEEu8; 32];
+        padded[..20].copy_from_slice(&eth_bytes);
+
+        let account_id = AccountId32::from(padded);
+        Ok(account_id.to_ss58check())
+    }
+
+    fn wait_ready(child: &mut Child, marker: &str, timeout: Duration) -> anyhow::Result<()> {
+        let start_time = std::time::Instant::now();
+        let stderr = child.stderr.take().expect("stderr must be piped");
+
+        let mut lines = std::io::BufReader::new(stderr).lines();
+        loop {
+            if let Some(Ok(line)) = lines.next() {
+                println!("Kitchensink log: {line:?}");
+                if line.contains(marker) {
+                    std::thread::spawn(move || for _ in lines.by_ref() {});
+                    return Ok(());
+                }
+            }
+
+            if start_time.elapsed() > timeout {
+                let _ = child.kill();
+                anyhow::bail!("Timeout waiting for process readiness: {marker}");
+            }
+        }
+    }
+
+    pub fn eth_rpc_version(&self) -> anyhow::Result<String> {
+        let output = Command::new(&self.eth_proxy_binary)
+            .arg("--version")
+            .stdin(Stdio::null())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::null())
+            .spawn()?
+            .wait_with_output()?
+            .stdout;
+        Ok(String::from_utf8_lossy(&output).trim().to_string())
+    }
+}
+
+impl EthereumNode for KitchensinkNode {
+    fn execute_transaction(
+        &self,
+        transaction: alloy::rpc::types::TransactionRequest,
+    ) -> anyhow::Result<TransactionReceipt> {
+        let url = self.rpc_url.clone();
+        let wallet = self.wallet.clone();
+
+        tracing::debug!("Submitting transaction: {transaction:#?}");
+
+        tracing::info!("Submitting tx to kitchensink");
+        let receipt = execute_transaction(Box::pin(async move {
+            Ok(ProviderBuilder::new()
+                .wallet(wallet)
+                .connect(&url)
+                .await?
+                .send_transaction(transaction)
+                .await?
+                .get_receipt()
+                .await?)
+        }));
+        tracing::info!(?receipt, "Submitted tx to kitchensink");
+        receipt
+    }
+
+    fn trace_transaction(
+        &self,
+        transaction: TransactionReceipt,
+    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
+        let url = self.rpc_url.clone();
+        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+            diff_mode: Some(true),
+            disable_code: None,
+            disable_storage: None,
+        });
+
+        let wallet = self.wallet.clone();
+
+        trace_transaction(Box::pin(async move {
+            Ok(ProviderBuilder::new()
+                .wallet(wallet)
+                .connect(&url)
+                .await?
+                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .await?)
+        }))
+    }
+
+    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode> {
+        match self
+            .trace_transaction(transaction)?
+            .try_into_pre_state_frame()?
+        {
+            PreStateFrame::Diff(diff) => Ok(diff),
+            _ => anyhow::bail!("expected a diff mode trace"),
+        }
+    }
+
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
+        let url = self.rpc_url.clone();
+        let wallet = self.wallet.clone();
+
+        let onchain_nonce = fetch_onchain_nonce(url, wallet, address)?;
+
+        let mut nonces = self.nonces.lock().unwrap();
+        let current = nonces.entry(address).or_insert(onchain_nonce);
+        let value = *current;
+        *current += 1;
+        Ok(value)
+    }
+}
+
+impl Node for KitchensinkNode {
+    fn new(config: &Arguments) -> Self {
+        let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY);
+        let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
+        let base_directory = kitchensink_directory.join(id.to_string());
+
+        Self {
+            id,
+            substrate_binary: config.kitchensink.clone(),
+            eth_proxy_binary: config.eth_proxy.clone(),
+            rpc_url: String::new(),
+            wallet: config.wallet(),
+            base_directory,
+            process_substrate: None,
+            process_proxy: None,
+            nonces: Mutex::new(HashMap::new()),
+        }
+    }
+
+    fn connection_string(&self) -> String {
+        self.rpc_url.clone()
+    }
+
+    fn shutdown(mut self) -> anyhow::Result<()> {
+        if let Some(mut child) = self.process_proxy.take() {
+            let _ = child.kill();
+        }
+        if let Some(mut child) = self.process_substrate.take() {
+            let _ = child.kill();
+        }
+        Ok(())
+    }
+
+    fn spawn(&mut self, genesis: String) -> anyhow::Result<()> {
+        self.init(&genesis)?.spawn_process()
+    }
+
+    fn version(&self) -> anyhow::Result<String> {
+        let output = Command::new(&self.substrate_binary)
+            .arg("--version")
+            .stdin(Stdio::null())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::null())
+            .spawn()?
+            .wait_with_output()?
+            .stdout;
+        Ok(String::from_utf8_lossy(&output).into())
+    }
+}
+
+impl Drop for KitchensinkNode {
+    fn drop(&mut self) {
+        if let Some(mut child) = self.process_proxy.take() {
+            let _ = child.kill();
+        }
+        if let Some(mut child) = self.process_substrate.take() {
+            let _ = child.kill();
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use revive_dt_config::Arguments;
+    use std::path::PathBuf;
+    use temp_dir::TempDir;
+
+    use std::fs;
+
+    use super::KitchensinkNode;
+    use crate::{GENESIS_JSON, Node};
+
+    fn test_config() -> (Arguments, TempDir) {
+        let mut config = Arguments::default();
+        let temp_dir = TempDir::new().unwrap();
+
+        config.working_directory = temp_dir.path().to_path_buf().into();
+
+        config.kitchensink = PathBuf::from("substrate-node");
+        config.eth_proxy = PathBuf::from("eth-rpc");
+
+        (config, temp_dir)
+    }
+
+    #[test]
+    fn test_init_generates_chainspec_with_balances() {
+        let genesis_content = r#"
+        {
+            "alloc": {
+                "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": {
+                    "balance": "1000000000000000000"
+                },
+                "Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2": {
+                    "balance": "2000000000000000000"
+                }
+            }
+        }
+        "#;
+
+        let mut dummy_node = KitchensinkNode::new(&test_config().0);
+
+        // Call `init()`
+        dummy_node.init(genesis_content).expect("init failed");
+
+        // Check that the patched chainspec file was generated
+        let final_chainspec_path = dummy_node
+            .base_directory
+            .join(KitchensinkNode::CHAIN_SPEC_JSON_FILE);
+        assert!(final_chainspec_path.exists(), "Chainspec file should exist");
+
+        let contents = fs::read_to_string(&final_chainspec_path).expect("Failed to read chainspec");
+
+        // Validate that the Substrate addresses derived from the Ethereum addresses are in the file
+        let first_eth_addr =
+            KitchensinkNode::eth_to_substrate_address("90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+                .unwrap();
+        let second_eth_addr =
+            KitchensinkNode::eth_to_substrate_address("Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2")
+                .unwrap();
+
+        assert!(
+            contents.contains(&first_eth_addr),
+            "Chainspec should contain Substrate address for first Ethereum account"
+        );
+        assert!(
+            contents.contains(&second_eth_addr),
+            "Chainspec should contain Substrate address for second Ethereum account"
+        );
+    }
+
+    #[test]
+    fn test_parse_genesis_alloc() {
+        // Create test genesis file
+        let genesis_json = r#"
+        {
+          "alloc": {
+            "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": { "balance": "1000000000000000000" },
+            "0x0000000000000000000000000000000000000000": { "balance": "0xDE0B6B3A7640000" },
+            "0xffffffffffffffffffffffffffffffffffffffff": { "balance": "123456789" }
+          }
+        }
+        "#;
+
+        let node = KitchensinkNode::new(&test_config().0);
+
+        let result = node
+            .extract_balance_from_genesis_file(genesis_json)
+            .unwrap();
+
+        let result_map: std::collections::HashMap<_, _> = result.into_iter().collect();
+
+        assert_eq!(
+            result_map.get("5FLneRcWAfk3X3tg6PuGyLNGAquPAZez5gpqvyuf3yUK8VaV"),
+            Some(&1_000_000_000_000_000_000u128)
+        );
+
+        assert_eq!(
+            result_map.get("5C4hrfjw9DjXZTzV3MwzrrAr9P1MLDHajjSidz9bR544LEq1"),
+            Some(&1_000_000_000_000_000_000u128)
+        );
+
+        assert_eq!(
+            result_map.get("5HrN7fHLXWcFiXPwwtq2EkSGns9eMmoUQnbVKweNz3VVr6N4"),
+            Some(&123_456_789u128)
+        );
+    }
+
+    #[test]
+    fn print_eth_to_substrate_mappings() {
+        let eth_addresses = vec![
+            "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+            "0xffffffffffffffffffffffffffffffffffffffff",
+            "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+        ];
+
+        for eth_addr in eth_addresses {
+            let ss58 = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
+
+            println!("Ethereum: {eth_addr} -> Substrate SS58: {ss58}");
+        }
+    }
+
+    #[test]
+    fn test_eth_to_substrate_address() {
+        let cases = vec![
+            (
+                "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                "5FLneRcWAfk3X3tg6PuGyLNGAquPAZez5gpqvyuf3yUK8VaV",
+            ),
+            (
+                "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
+                "5FLneRcWAfk3X3tg6PuGyLNGAquPAZez5gpqvyuf3yUK8VaV",
+            ),
+            (
+                "0x0000000000000000000000000000000000000000",
+                "5C4hrfjw9DjXZTzV3MwzrrAr9P1MLDHajjSidz9bR544LEq1",
+            ),
+            (
+                "0xffffffffffffffffffffffffffffffffffffffff",
+                "5HrN7fHLXWcFiXPwwtq2EkSGns9eMmoUQnbVKweNz3VVr6N4",
+            ),
+        ];
+
+        for (eth_addr, expected_ss58) in cases {
+            let result = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
+            assert_eq!(
+                result, expected_ss58,
+                "Mismatch for Ethereum address {eth_addr}"
+            );
+        }
+    }
+
+    #[test]
+    fn spawn_works() {
+        let (config, _temp_dir) = test_config();
+
+        let mut node = KitchensinkNode::new(&config);
+        node.spawn(GENESIS_JSON.to_string()).unwrap();
+    }
+
+    #[test]
+    fn version_works() {
+        let (config, _temp_dir) = test_config();
+
+        let node = KitchensinkNode::new(&config);
+        let version = node.version().unwrap();
+
+        assert!(
+            version.starts_with("substrate-node"),
+            "Expected substrate-node version string, got: {version}"
+        );
+    }
+
+    #[test]
+    fn eth_rpc_version_works() {
+        let (config, _temp_dir) = test_config();
+
+        let node = KitchensinkNode::new(&config);
+        let version = node.eth_rpc_version().unwrap();
+
+        assert!(
+            version.starts_with("pallet-revive-eth-rpc"),
+            "Expected eth-rpc version string, got: {version}"
+        );
+    }
+}

crates/node/src/lib.rs

@@ -1,10 +1,10 @@
 //! This crate implements the testing nodes.
 
-use alloy::rpc::types::{TransactionReceipt, trace::geth::DiffMode};
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
 pub mod geth;
+pub mod kitchensink;
 pub mod pool;
 
 /// The default genesis configuration.
@@ -28,9 +28,6 @@ pub trait Node: EthereumNode {
     /// Returns the nodes connection string.
     fn connection_string(&self) -> String;
 
-    /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode>;
-
     /// Returns the node version.
     fn version(&self) -> anyhow::Result<String>;
 }

crates/node/src/pool.rs

@@ -62,7 +62,7 @@ where
 
 fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Result<T> {
     let mut node = T::new(args);
-    log::info!("starting node: {}", node.connection_string());
+    tracing::info!("starting node: {}", node.connection_string());
     node.spawn(genesis)?;
     Ok(node)
 }

crates/report/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "revive-dt-report"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+revive-dt-config = { workspace = true }
+revive-dt-format = { workspace = true }
+
+anyhow = { workspace = true }
+tracing = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+revive-solc-json-interface = { workspace = true }

crates/report/src/analyzer.rs

@@ -0,0 +1,94 @@
+//! The report analyzer enriches the raw report data.
+
+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 containes a lot of comments.
+    pub yul_to_bytecode_size_ratio: f32,
+}
+
+impl CompilerStatistics {
+    /// Cumulatively update the statistics with the next compiler task.
+    pub fn sample(&mut self, compilation_task: &CompilationTask) {
+        let Some(output) = &compilation_task.json_output else {
+            return;
+        };
+
+        let Some(contracts) = &output.contracts else {
+            return;
+        };
+
+        for (_solidity, contracts) in contracts.iter() {
+            for (_name, contract) in contracts.iter() {
+                let Some(evm) = &contract.evm else {
+                    continue;
+                };
+                let Some(deploy_code) = &evm.deployed_bytecode else {
+                    continue;
+                };
+
+                // The EVM bytecode can be unlinked and thus is not necessarily a decodable hex
+                // string; for our statistics this is a good enough approximation.
+                let bytecode_size = deploy_code.object.len() / 2;
+
+                let yul_size = contract
+                    .ir_optimized
+                    .as_ref()
+                    .expect("if the contract has a deploy code it should also have the opimized IR")
+                    .len();
+
+                self.update_sizes(bytecode_size, yul_size);
+            }
+        }
+    }
+
+    /// 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/lib.rs

@@ -0,0 +1,4 @@
+//! The revive differential tests reporting facility.
+
+pub mod analyzer;
+pub mod reporter;

crates/report/src/reporter.rs

@@ -0,0 +1,243 @@
+//! 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::{Deserialize, Serialize};
+
+use revive_dt_config::{Arguments, TestingPlatform};
+use revive_dt_format::{corpus::Corpus, mode::SolcMode};
+use revive_solc_json_interface::{SolcStandardJsonInput, SolcStandardJsonOutput};
+
+use crate::analyzer::CompilerStatistics;
+
+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, Deserialize)]
+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, Deserialize)]
+pub struct CompilationTask {
+    /// The observed compiler input.
+    pub json_input: SolcStandardJsonInput,
+    /// The observed compiler output.
+    pub json_output: Option<SolcStandardJsonOutput>,
+    /// The observed compiler mode.
+    pub mode: SolcMode,
+    /// 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, Deserialize)]
+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, Deserialize)]
+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()
+                    && result
+                        .compilation_task
+                        .json_output
+                        .as_ref()
+                        .and_then(|output| output.errors.as_ref())
+                        .map(|errors| errors.is_empty())
+                        .unwrap_or(true)
+                {
+                    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/solc-binaries/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-dt-solc-binaries"
-dependencies = "Download and cache solc binaries"
+description = "Download and cache solc binaries"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
@@ -11,7 +11,7 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 hex = { workspace = true }
-log = { workspace = true }
+tracing = { workspace = true }
 reqwest = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }

crates/solc-binaries/src/cache.rs

@@ -25,7 +25,7 @@ pub(crate) fn get_or_download(
 
     let mut cache = SOLC_CACHER.lock().unwrap();
     if cache.contains(&target_file) {
-        log::debug!("using cached solc: {}", target_file.display());
+        tracing::debug!("using cached solc: {}", target_file.display());
         return Ok(target_file);
     }
 
@@ -37,10 +37,10 @@ pub(crate) fn get_or_download(
 }
 
 fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()> {
-    log::info!("caching file: {}", path.display());
+    tracing::info!("caching file: {}", path.display());
 
     let Ok(file) = File::create_new(path) else {
-        log::debug!("cache file already exists: {}", path.display());
+        tracing::debug!("cache file already exists: {}", path.display());
         return Ok(());
     };
 
@@ -60,7 +60,7 @@ fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()
     std::process::Command::new("xattr")
         .arg("-d")
         .arg("com.apple.quarantine")
-        .arg(&path)
+        .arg(path)
         .stderr(std::process::Stdio::null())
         .stdout(std::process::Stdio::null())
         .stdout(std::process::Stdio::null())

crates/solc-binaries/src/download.rs

@@ -86,7 +86,7 @@ impl GHDownloader {
     /// Errors out if the download fails or the digest of the downloaded file
     /// mismatches the expected digest from the release [List].
     pub fn download(&self) -> anyhow::Result<Vec<u8>> {
-        log::info!("downloading solc: {self:?}");
+        tracing::info!("downloading solc: {self:?}");
         let expected_digest = List::download(self.list)?
             .builds
             .iter()