fix clippy warning

This commit adds the `--dev` argument to the `substrate-node` to allow
the chain to keep advancing as time goes own. We have found that if this
option is not added then the chain won't advance forward.

.github/workflows/test.yml

@@ -99,28 +99,9 @@ jobs:
       - name: Install Geth on Ubuntu
         if: matrix.os == 'ubuntu-24.04'
         run: |
+          sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
-          sudo apt-get install -y protobuf-compiler
+          sudo apt-get install -y ethereum 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'

Cargo.lock

@@ -67,9 +67,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "1.0.20"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae58d888221eecf621595e2096836ce7cfc37be06bfa39d7f64aa6a3ea4c9e5b"
+checksum = "0093d23bf026b580c1f66ed3a053d8209c104a446c5264d3ad99587f6edef24e"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-core"
-version = "1.2.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad31216895d27d307369daa1393f5850b50bbbd372478a9fa951c095c210627e"
+checksum = "a3c5a28f166629752f2e7246b813cdea3243cca59aab2d4264b1fd68392c10eb"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.2.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b95b3deca680efc7e9cba781f1a1db352fa1ea50e6384a514944dcf4419e652"
+checksum = "18cc14d832bc3331ca22a1c7819de1ede99f58f61a7d123952af7dde8de124a6"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -3998,6 +3998,7 @@ dependencies = [
  "anyhow",
  "revive-dt-config",
  "revive-dt-node-interaction",
+ "serde",
  "serde_json",
  "sp-core",
  "sp-runtime",

crates/config/src/lib.rs

@@ -1,4 +1,4 @@
-//! The global configuration used across all revive differential testing crates.
+//! The global configuration used accross all revive differential testing crates.
 
 use std::{
     fmt::Display,

crates/core/src/driver/mod.rs

@@ -1,11 +1,11 @@
 //! The test driver handles the compilation and execution of the test cases.
 
 use alloy::json_abi::JsonAbi;
-use alloy::network::TransactionBuilder;
+use alloy::primitives::Bytes;
-use alloy::rpc::types::TransactionReceipt;
 use alloy::rpc::types::trace::geth::GethTrace;
+use alloy::rpc::types::{TransactionInput, TransactionReceipt};
 use alloy::{
-    primitives::{Address, map::HashMap},
+    primitives::{Address, TxKind, map::HashMap},
     rpc::types::{
         TransactionRequest,
         trace::geth::{AccountState, DiffMode},
@@ -135,17 +135,21 @@ where
             std::any::type_name::<T>()
         );
 
-        let tx =
+        let tx = match input.legacy_transaction(
-            match input.legacy_transaction(nonce, &self.deployed_contracts, &self.deployed_abis) {
+            self.config.network_id,
-                Ok(tx) => {
+            nonce,
-                    tracing::debug!("Legacy transaction data: {tx:#?}");
+            &self.deployed_contracts,
-                    tx
+            &self.deployed_abis,
-                }
+        ) {
-                Err(err) => {
+            Ok(tx) => {
-                    tracing::error!("Failed to construct legacy transaction: {err:?}");
+                tracing::debug!("Legacy transaction data: {tx:#?}");
-                    return Err(err);
+                tx
-                }
+            }
-            };
+            Err(err) => {
+                tracing::error!("Failed to construct legacy transaction: {err:?}");
+                return Err(err);
+            }
+        };
 
         tracing::trace!("Executing transaction for input: {input:?}");
 
@@ -197,9 +201,6 @@ where
 
             for contracts in contract_map.values() {
                 for (contract_name, contract) in contracts {
-                    let tracing_span = tracing::info_span!("Deploying contract", contract_name);
-                    let _guard = tracing_span.enter();
-
                     tracing::debug!(
                         "Contract name is: {:?} and the input name is: {:?}",
                         &contract_name,
@@ -227,14 +228,16 @@ where
                         std::any::type_name::<T>()
                     );
 
-                    // We are using alloy for building and submitting the transactions and it will
+                    let tx = TransactionRequest {
-                    // automatically fill in all of the missing fields from the provider that we
+                        from: Some(input.caller),
-                    // are using.
+                        to: Some(TxKind::Create),
-                    let code = alloy::hex::decode(&code)?;
+                        gas_price: Some(5_000_000),
-                    let tx = TransactionRequest::default()
+                        gas: Some(5_000_000),
-                        .nonce(nonce)
+                        chain_id: Some(self.config.network_id),
-                        .from(input.caller)
+                        nonce: Some(nonce),
-                        .with_deploy_code(code);
+                        input: TransactionInput::new(Bytes::from(code.into_bytes())),
+                        ..Default::default()
+                    };
 
                     let receipt = match node.execute_transaction(tx) {
                         Ok(receipt) => receipt,

crates/format/src/input.rs

@@ -1,13 +1,15 @@
 use std::collections::HashMap;
 
 use alloy::{
-    json_abi::JsonAbi,
+    hex,
-    network::TransactionBuilder,
+    json_abi::{Function, JsonAbi},
-    primitives::{Address, Bytes, U256},
+    primitives::{Address, Bytes, TxKind},
-    rpc::types::TransactionRequest,
+    rpc::types::{TransactionInput, TransactionRequest},
 };
+use alloy_primitives::U256;
+use alloy_sol_types::SolValue;
 use semver::VersionReq;
-use serde::Deserialize;
+use serde::{Deserialize, de::Deserializer};
 use serde_json::Value;
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
@@ -17,6 +19,7 @@ pub struct Input {
     pub comment: Option<String>,
     #[serde(default = "default_instance")]
     pub instance: String,
+    #[serde(deserialize_with = "deserialize_method")]
     pub method: Method,
     pub calldata: Option<Calldata>,
     pub expected: Option<Expected>,
@@ -44,28 +47,58 @@ 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.
-#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Clone, Eq, PartialEq)]
 pub enum Method {
     /// Initiate a deploy transaction, calling contracts constructor.
     ///
     /// Indicated by `#deployer`.
-    #[serde(rename = "#deployer")]
     Deployer,
-
     /// Does not calculate and insert a function selector.
     ///
     /// Indicated by `#fallback`.
     #[default]
-    #[serde(rename = "#fallback")]
     Fallback,
+    /// Call the public function with this selector.
+    ///
+    /// Calculates the selector if neither deployer or fallback matches.
+    Function([u8; 4]),
+}
 
-    /// Call the public function with the given name.
+fn deserialize_method<'de, D>(deserializer: D) -> Result<Method, D::Error>
-    #[serde(untagged)]
+where
-    FunctionName(String),
+    D: Deserializer<'de>,
+{
+    Ok(match String::deserialize(deserializer)?.as_str() {
+        "#deployer" => Method::Deployer,
+        "#fallback" => Method::Fallback,
+        signature => {
+            let signature = if signature.ends_with(')') {
+                signature.to_string()
+            } else {
+                format!("{signature}()")
+            };
+            match Function::parse(&signature) {
+                Ok(function) => Method::Function(function.selector().0),
+                Err(error) => {
+                    return Err(serde::de::Error::custom(format!(
+                        "parsing function signature '{signature}' error: {error}"
+                    )));
+                }
+            }
+        }
+    })
 }
 
 impl Input {
@@ -85,7 +118,7 @@ impl Input {
         deployed_abis: &HashMap<String, JsonAbi>,
         deployed_contracts: &HashMap<String, Address>,
     ) -> anyhow::Result<Bytes> {
-        let Method::FunctionName(ref function_name) = self.method else {
+        let Method::Function(selector) = self.method else {
             return Ok(Bytes::default()); // fallback or deployer — no input
         };
 
@@ -95,17 +128,14 @@ impl Input {
 
         tracing::trace!("ABI found for instance: {}", &self.instance);
 
-        // We follow the same logic that's implemented in the matter-labs-tester where they resolve
+        // Find function by selector
-        // the function name into a function selector and they assume that he function doesn't have
-        // any existing overloads.
-        // https://github.com/matter-labs/era-compiler-tester/blob/1dfa7d07cba0734ca97e24704f12dd57f6990c2c/compiler_tester/src/test/case/input/mod.rs#L158-L190
         let function = abi
             .functions()
-            .find(|function| function.name.starts_with(function_name))
+            .find(|f| f.selector().0 == selector)
             .ok_or_else(|| {
                 anyhow::anyhow!(
-                    "Function with name {:?} not found in ABI for the instance {:?}",
+                    "Function with selector {:?} not found in ABI for the instance {:?}",
-                    function_name,
+                    selector,
                     &self.instance
                 )
             })?;
@@ -130,45 +160,90 @@ impl Input {
             &self.instance
         );
 
-        // Allocating a vector that we will be using for the calldata. The vector size will be:
+        let mut encoded = selector.to_vec();
-        // 4 bytes for the function selector.
-        // function.inputs.len() * 32 bytes for the arguments (each argument is a U256).
-        //
-        // We're using indices in the following code in order to avoid the need for us to allocate
-        // a new buffer for each one of the resolved arguments.
-        let mut calldata = Vec::<u8>::with_capacity(4 + calldata_args.len() * 32);
-        calldata.extend(function.selector().0);
 
-        for (arg_idx, arg) in calldata_args.iter().enumerate() {
+        for (i, param) in function.inputs.iter().enumerate() {
-            match resolve_argument(arg, deployed_contracts) {
+            let arg = calldata_args.get(i).unwrap();
-                Ok(resolved) => {
+            let encoded_arg = match arg {
-                    calldata.extend(resolved.to_be_bytes::<32>());
+                CalldataArg::Literal(value) => match param.ty.as_str() {
-                }
+                    "uint256" | "uint" => {
-                Err(error) => {
+                        let val: U256 = value.parse()?;
-                    tracing::error!(arg, arg_idx, ?error, "Failed to resolve argument");
+                        val.abi_encode()
-                    return Err(error);
+                    }
+                    "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(calldata.into())
+        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 => Some(TxKind::Create),
+            _ => Some(TxKind::Call(
+                self.instance_to_address(&self.instance, deployed_contracts)?,
+            )),
+        };
+
         let input_data = self.encoded_input(deployed_abis, deployed_contracts)?;
-        let transaction_request = TransactionRequest::default().nonce(nonce);
+
-        match self.method {
+        Ok(TransactionRequest {
-            Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
+            from: Some(self.caller),
-            _ => Ok(transaction_request
+            to,
-                .to(self.instance_to_address(&self.instance, deployed_contracts)?)
+            nonce: Some(nonce),
-                .input(input_data.into())),
+            chain_id: Some(chain_id),
-        }
+            gas_price: Some(5_000_000),
+            gas: Some(5_000_000),
+            input: TransactionInput::new(input_data),
+            ..Default::default()
+        })
     }
 }
 
@@ -180,72 +255,12 @@ fn default_caller() -> Address {
     "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap()
 }
 
-/// This function takes in the string calldata argument provided in the JSON input and resolves it
-/// into a [`U256`] which is later used to construct the calldata.
-///
-/// # Note
-///
-/// This piece of code is taken from the matter-labs-tester repository which is licensed under MIT
-/// or Apache. The original source code can be found here:
-/// https://github.com/matter-labs/era-compiler-tester/blob/0ed598a27f6eceee7008deab3ff2311075a2ec69/compiler_tester/src/test/case/input/value.rs#L43-L146
-fn resolve_argument(
-    value: &str,
-    deployed_contracts: &HashMap<String, Address>,
-) -> anyhow::Result<U256> {
-    if let Some(instance) = value.strip_suffix(".address") {
-        Ok(U256::from_be_slice(
-            deployed_contracts
-                .get(instance)
-                .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))?
-                .as_ref(),
-        ))
-    } else if let Some(value) = value.strip_prefix('-') {
-        let value = U256::from_str_radix(value, 10)
-            .map_err(|error| anyhow::anyhow!("Invalid decimal literal after `-`: {}", error))?;
-        if value > U256::ONE << 255u8 {
-            anyhow::bail!("Decimal literal after `-` is too big");
-        }
-        let value = value
-            .checked_sub(U256::ONE)
-            .ok_or_else(|| anyhow::anyhow!("`-0` is invalid literal"))?;
-        Ok(U256::MAX.checked_sub(value).expect("Always valid"))
-    } else if let Some(value) = value.strip_prefix("0x") {
-        Ok(U256::from_str_radix(value, 16)
-            .map_err(|error| anyhow::anyhow!("Invalid hexadecimal literal: {}", error))?)
-    } else {
-        // TODO: This is a set of "variables" that we need to be able to resolve to be fully in
-        // compliance with the matter labs tester but we currently do not resolve them. We need to
-        // add logic that does their resolution in the future, perhaps through some kind of system
-        // context API that we pass down to the resolution function that allows it to make calls to
-        // the node to perform these resolutions.
-        let is_unsupported = [
-            "$CHAIN_ID",
-            "$GAS_LIMIT",
-            "$COINBASE",
-            "$DIFFICULTY",
-            "$BLOCK_HASH",
-            "$BLOCK_TIMESTAMP",
-        ]
-        .iter()
-        .any(|var| value.starts_with(var));
-
-        if is_unsupported {
-            tracing::error!(value, "Unsupported variable used");
-            anyhow::bail!("Encountered {value} which is currently unsupported by the framework");
-        } else {
-            Ok(U256::from_str_radix(value, 10)
-                .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))?)
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
 
     use super::*;
     use alloy::json_abi::JsonAbi;
-    use alloy_primitives::address;
+    use alloy_primitives::{address, keccak256};
-    use alloy_sol_types::SolValue;
     use std::collections::HashMap;
 
     #[test]
@@ -263,18 +278,16 @@ mod tests {
         "#;
 
         let parsed_abi: JsonAbi = serde_json::from_str(raw_metadata).unwrap();
-        let selector = parsed_abi
+        let selector = keccak256("store(uint256)".as_bytes())[0..4]
-            .function("store")
+            .try_into()
-            .unwrap()
+            .unwrap();
-            .first()
-            .unwrap()
-            .selector()
-            .0;
 
         let input = Input {
             instance: "Contract".to_string(),
-            method: Method::FunctionName("store".to_owned()),
+            method: Method::Function(selector),
-            calldata: Some(Calldata::Compound(vec!["42".into()])),
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
+                "42".to_string(),
+            )])),
             ..Default::default()
         };
 
@@ -292,6 +305,112 @@ mod tests {
         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#"[
@@ -305,20 +424,16 @@ mod tests {
         ]"#;
 
         let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
-        let selector = parsed_abi
+        let selector = keccak256("send(address)".as_bytes())[0..4]
-            .function("send")
+            .try_into()
-            .unwrap()
+            .unwrap();
-            .first()
-            .unwrap()
-            .selector()
-            .0;
 
-        let input: Input = Input {
+        let input = Input {
             instance: "Contract".to_string(),
-            method: Method::FunctionName("send".to_owned()),
+            method: Method::Function(selector),
-            calldata: Some(Calldata::Compound(vec![
+            calldata: Some(Calldata::Compound(vec![CalldataArg::Literal(
                 "0x1000000000000000000000000000000000000001".to_string(),
-            ])),
+            )])),
             ..Default::default()
         };
 

crates/node/Cargo.toml

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

crates/node/src/geth.rs

@@ -2,7 +2,7 @@
 
 use std::{
     collections::HashMap,
-    fs::{File, OpenOptions, create_dir_all, remove_dir_all},
+    fs::{File, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
     path::PathBuf,
     process::{Child, Command, Stdio},
@@ -10,6 +10,7 @@ use std::{
         Mutex,
         atomic::{AtomicU32, Ordering},
     },
+    thread,
     time::{Duration, Instant},
 };
 
@@ -27,7 +28,6 @@ use revive_dt_node_interaction::{
     EthereumNode, nonce::fetch_onchain_nonce, trace::trace_transaction,
     transaction::execute_transaction,
 };
-use tracing::Level;
 
 use crate::Node;
 
@@ -45,7 +45,6 @@ pub struct Instance {
     connection_string: String,
     base_directory: PathBuf,
     data_directory: PathBuf,
-    logs_directory: PathBuf,
     geth: PathBuf,
     id: u32,
     handle: Option<Child>,
@@ -53,17 +52,11 @@ pub struct Instance {
     start_timeout: u64,
     wallet: EthereumWallet,
     nonces: Mutex<HashMap<Address, u64>>,
-    /// This vector stores [`File`] objects that we use for logging which we want to flush when the
-    /// node object is dropped. We do not store them in a structured fashion at the moment (in
-    /// separate fields) as the logic that we need to apply to them is all the same regardless of
-    /// what it belongs to, we just want to flush them on [`Drop`] of the node.
-    logs_file_to_flush: Vec<File>,
 }
 
 impl Instance {
     const BASE_DIRECTORY: &str = "geth";
     const DATA_DIRECTORY: &str = "data";
-    const LOGS_DIRECTORY: &str = "logs";
 
     const IPC_FILE: &str = "geth.ipc";
     const GENESIS_JSON_FILE: &str = "genesis.json";
@@ -71,14 +64,9 @@ impl Instance {
     const READY_MARKER: &str = "IPC endpoint opened";
     const ERROR_MARKER: &str = "Fatal:";
 
-    const GETH_STDOUT_LOG_FILE_NAME: &str = "node_stdout.log";
-    const GETH_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
-
     /// Create the node directory and call `geth init` to configure the genesis.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn init(&mut self, genesis: String) -> anyhow::Result<&mut Self> {
         create_dir_all(&self.base_directory)?;
-        create_dir_all(&self.logs_directory)?;
 
         let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
         File::create(&genesis_path)?.write_all(genesis.as_bytes())?;
@@ -108,24 +96,8 @@ impl Instance {
 
     /// Spawn the go-ethereum node child process.
     ///
-    /// [Instance::init] must be called prior.
+    /// [Instance::init] must be called priorly.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn spawn_process(&mut self) -> anyhow::Result<&mut Self> {
-        // This is the `OpenOptions` that we wish to use for all of the log files that we will be
-        // opening in this method. We need to construct it in this way to:
-        // 1. Be consistent
-        // 2. Less verbose and more dry
-        // 3. Because the builder pattern uses mutable references so we need to get around that.
-        let open_options = {
-            let mut options = OpenOptions::new();
-            options.create(true).truncate(true).write(true);
-            options
-        };
-
-        let stdout_logs_file = open_options
-            .clone()
-            .open(self.geth_stdout_log_file_path())?;
-        let stderr_logs_file = open_options.open(self.geth_stderr_log_file_path())?;
         self.handle = Command::new(&self.geth)
             .arg("--dev")
             .arg("--datadir")
@@ -137,67 +109,49 @@ impl Instance {
             .arg("--nodiscover")
             .arg("--maxpeers")
             .arg("0")
-            .stderr(stderr_logs_file.try_clone()?)
+            .stderr(Stdio::piped())
-            .stdout(stdout_logs_file.try_clone()?)
+            .stdout(Stdio::null())
             .spawn()?
             .into();
-
-        if let Err(error) = self.wait_ready() {
-            tracing::error!(?error, "Failed to start geth, shutting down gracefully");
-            self.shutdown()?;
-            return Err(error);
-        }
-
-        self.logs_file_to_flush
-            .extend([stderr_logs_file, stdout_logs_file]);
-
         Ok(self)
     }
 
     /// Wait for the g-ethereum node child process getting ready.
     ///
     /// [Instance::spawn_process] must be called priorly.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn wait_ready(&mut self) -> anyhow::Result<&mut Self> {
+        // Thanks clippy but geth is a server; we don't `wait` but eventually kill it.
+        #[allow(clippy::zombie_processes)]
+        let mut child = self.handle.take().expect("should be spawned");
         let start_time = Instant::now();
-
-        let logs_file = OpenOptions::new()
-            .read(true)
-            .write(false)
-            .append(false)
-            .truncate(false)
-            .open(self.geth_stderr_log_file_path())?;
-
         let maximum_wait_time = Duration::from_millis(self.start_timeout);
-        let mut stderr = BufReader::new(logs_file).lines();
+        let mut stderr = BufReader::new(child.stderr.take().expect("should be piped")).lines();
-        loop {
+        let error = loop {
-            if let Some(Ok(line)) = stderr.next() {
+            let Some(Ok(line)) = stderr.next() else {
-                if line.contains(Self::ERROR_MARKER) {
+                break "child process stderr reading error".to_string();
-                    anyhow::bail!("Failed to start geth {line}");
+            };
-                }
+            if line.contains(Self::ERROR_MARKER) {
-                if line.contains(Self::READY_MARKER) {
+                break line;
-                    return Ok(self);
+            }
-                }
+            if line.contains(Self::READY_MARKER) {
+                // Keep stderr alive
+                // https://github.com/alloy-rs/alloy/issues/2091#issuecomment-2676134147
+                thread::spawn(move || for _ in stderr.by_ref() {});
+
+                self.handle = child.into();
+                return Ok(self);
             }
             if Instant::now().duration_since(start_time) > maximum_wait_time {
-                anyhow::bail!("Timeout in starting geth");
+                break "spawn timeout".to_string();
             }
-        }
+        };
-    }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
+        let _ = child.kill();
-    fn geth_stdout_log_file_path(&self) -> PathBuf {
+        anyhow::bail!("geth node #{} spawn error: {error}", self.id)
-        self.logs_directory.join(Self::GETH_STDOUT_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
-    fn geth_stderr_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::GETH_STDERR_LOG_FILE_NAME)
     }
 }
 
 impl EthereumNode for Instance {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn execute_transaction(
         &self,
         transaction: TransactionRequest,
@@ -205,89 +159,20 @@ impl EthereumNode for Instance {
         let connection_string = self.connection_string();
         let wallet = self.wallet.clone();
 
-        execute_transaction(Box::pin(async move {
+        tracing::debug!("Submitting transaction: {transaction:#?}");
-            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction,);
-            let _outer_guard = outer_span.enter();
 
-            let provider = ProviderBuilder::new()
+        execute_transaction(Box::pin(async move {
+            Ok(ProviderBuilder::new()
                 .wallet(wallet)
                 .connect(&connection_string)
-                .await?;
+                .await?
-
+                .send_transaction(transaction)
-            let pending_transaction = provider.send_transaction(transaction).await?;
+                .await?
-            let transaction_hash = pending_transaction.tx_hash();
+                .get_receipt()
-
+                .await?)
-            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());
-                        }
-                    }
-                }
-            }
         }))
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn trace_transaction(
         &self,
         transaction: TransactionReceipt,
@@ -310,7 +195,6 @@ impl EthereumNode for Instance {
         }))
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn state_diff(
         &self,
         transaction: alloy::rpc::types::TransactionReceipt,
@@ -324,7 +208,6 @@ impl EthereumNode for Instance {
         }
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
         let connection_string = self.connection_string.clone();
         let wallet = self.wallet.clone();
@@ -348,7 +231,6 @@ impl Node for Instance {
         Self {
             connection_string: base_directory.join(Self::IPC_FILE).display().to_string(),
             data_directory: base_directory.join(Self::DATA_DIRECTORY),
-            logs_directory: base_directory.join(Self::LOGS_DIRECTORY),
             base_directory,
             geth: config.geth.clone(),
             id,
@@ -357,46 +239,22 @@ impl Node for Instance {
             start_timeout: config.geth_start_timeout,
             wallet: config.wallet(),
             nonces: Mutex::new(HashMap::new()),
-            // We know that we only need to be storing 2 files so we can specify that when creating
-            // the vector. It's the stdout and stderr of the geth node.
-            logs_file_to_flush: Vec::with_capacity(2),
         }
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn connection_string(&self) -> String {
         self.connection_string.clone()
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn shutdown(self) -> anyhow::Result<()> {
-    fn shutdown(&mut self) -> anyhow::Result<()> {
-        // Terminate the processes in a graceful manner to allow for the output to be flushed.
-        if let Some(mut child) = self.handle.take() {
-            child
-                .kill()
-                .map_err(|error| anyhow::anyhow!("Failed to kill the geth process: {error:?}"))?;
-        }
-
-        // Flushing the files that we're using for keeping the logs before shutdown.
-        for file in self.logs_file_to_flush.iter_mut() {
-            file.flush()?
-        }
-
-        // Remove the node's database so that subsequent runs do not run on the same database. We
-        // ignore the error just in case the directory didn't exist in the first place and therefore
-        // there's nothing to be deleted.
-        let _ = remove_dir_all(self.base_directory.join(Self::DATA_DIRECTORY));
-
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn spawn(&mut self, genesis: String) -> anyhow::Result<()> {
-        self.init(genesis)?.spawn_process()?;
+        self.init(genesis)?.spawn_process()?.wait_ready()?;
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn version(&self) -> anyhow::Result<String> {
         let output = Command::new(&self.geth)
             .arg("--version")
@@ -411,9 +269,13 @@ impl Node for Instance {
 }
 
 impl Drop for Instance {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn drop(&mut self) {
-        self.shutdown().expect("Failed to shutdown")
+        if let Some(child) = self.handle.as_mut() {
+            let _ = child.kill();
+        }
+        if self.base_directory.exists() {
+            let _ = remove_dir_all(&self.base_directory);
+        }
     }
 }
 

crates/node/src/kitchensink.rs

@@ -1,8 +1,8 @@
 use std::{
     collections::HashMap,
-    fs::{File, OpenOptions, create_dir_all, remove_dir_all},
+    fs::create_dir_all,
-    io::{BufRead, Write},
+    io::BufRead,
-    path::{Path, PathBuf},
+    path::PathBuf,
     process::{Child, Command, Stdio},
     sync::{
         Mutex,
@@ -12,19 +12,24 @@ use std::{
 };
 
 use alloy::{
+    consensus::{BlockHeader, TxEnvelope},
     hex,
-    network::EthereumWallet,
+    network::{
-    primitives::Address,
+        Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError,
+        UnbuiltTransactionError,
+    },
+    primitives::{Address, B64, B256, BlockNumber, Bloom, Bytes, U256},
     providers::{Provider, ProviderBuilder, ext::DebugApi},
     rpc::types::{
         TransactionReceipt,
+        eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
 };
+use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
 use sp_core::crypto::Ss58Codec;
 use sp_runtime::AccountId32;
-use tracing::Level;
 
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{
@@ -44,22 +49,13 @@ pub struct KitchensinkNode {
     rpc_url: String,
     wallet: EthereumWallet,
     base_directory: PathBuf,
-    logs_directory: PathBuf,
     process_substrate: Option<Child>,
     process_proxy: Option<Child>,
     nonces: Mutex<HashMap<Address, u64>>,
-    /// This vector stores [`File`] objects that we use for logging which we want to flush when the
-    /// node object is dropped. We do not store them in a structured fashion at the moment (in
-    /// separate fields) as the logic that we need to apply to them is all the same regardless of
-    /// what it belongs to, we just want to flush them on [`Drop`] of the node.
-    logs_file_to_flush: Vec<File>,
 }
 
 impl KitchensinkNode {
     const BASE_DIRECTORY: &str = "kitchensink";
-    const LOGS_DIRECTORY: &str = "logs";
-    const DATA_DIRECTORY: &str = "chains";
-
     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";
@@ -69,21 +65,11 @@ impl KitchensinkNode {
     const SUBSTRATE_LOG_ENV: &str = "error,evm=debug,sc_rpc_server=info,runtime::revive=debug";
     const PROXY_LOG_ENV: &str = "info,eth-rpc=debug";
 
-    const KITCHENSINK_STDOUT_LOG_FILE_NAME: &str = "node_stdout.log";
-    const KITCHENSINK_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
-
-    const PROXY_STDOUT_LOG_FILE_NAME: &str = "proxy_stdout.log";
-    const PROXY_STDERR_LOG_FILE_NAME: &str = "proxy_stderr.log";
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn init(&mut self, genesis: &str) -> anyhow::Result<&mut Self> {
         create_dir_all(&self.base_directory)?;
-        create_dir_all(&self.logs_directory)?;
 
         let template_chainspec_path = self.base_directory.join(Self::CHAIN_SPEC_JSON_FILE);
 
-        // Note: we do not pipe the logs of this process to a separate file since this is just a
-        // once-off export of the default chain spec and not part of the long-running node process.
         let output = Command::new(&self.substrate_binary)
             .arg("export-chain-spec")
             .arg("--chain")
@@ -132,7 +118,6 @@ impl KitchensinkNode {
         Ok(self)
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     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;
@@ -141,25 +126,9 @@ impl KitchensinkNode {
 
         let chainspec_path = self.base_directory.join(Self::CHAIN_SPEC_JSON_FILE);
 
-        // This is the `OpenOptions` that we wish to use for all of the log files that we will be
-        // opening in this method. We need to construct it in this way to:
-        // 1. Be consistent
-        // 2. Less verbose and more dry
-        // 3. Because the builder pattern uses mutable references so we need to get around that.
-        let open_options = {
-            let mut options = OpenOptions::new();
-            options.create(true).truncate(true).write(true);
-            options
-        };
-
         // Start Substrate node
-        let kitchensink_stdout_logs_file = open_options
+        let mut substrate_process = Command::new(&self.substrate_binary)
-            .clone()
+            .arg("--dev")
-            .open(self.kitchensink_stdout_log_file_path())?;
-        let kitchensink_stderr_logs_file = open_options
-            .clone()
-            .open(self.kitchensink_stderr_log_file_path())?;
-        self.process_substrate = Command::new(&self.substrate_binary)
             .arg("--chain")
             .arg(chainspec_path)
             .arg("--base-path")
@@ -174,61 +143,40 @@ impl KitchensinkNode {
             .arg("--rpc-cors")
             .arg("all")
             .env("RUST_LOG", Self::SUBSTRATE_LOG_ENV)
-            .stdout(kitchensink_stdout_logs_file.try_clone()?)
+            .stdout(Stdio::null())
-            .stderr(kitchensink_stderr_logs_file.try_clone()?)
+            .stderr(Stdio::piped())
-            .spawn()?
+            .spawn()?;
-            .into();
 
         // Give the node a moment to boot
-        if let Err(error) = Self::wait_ready(
+        Self::wait_ready(
-            self.kitchensink_stderr_log_file_path().as_path(),
+            &mut substrate_process,
             Self::SUBSTRATE_READY_MARKER,
             Duration::from_secs(30),
-        ) {
+        )?;
-            tracing::error!(
-                ?error,
-                "Failed to start substrate, shutting down gracefully"
-            );
-            self.shutdown()?;
-            return Err(error);
-        };
 
-        let eth_proxy_stdout_logs_file = open_options
+        let mut proxy_process = Command::new(&self.eth_proxy_binary)
-            .clone()
-            .open(self.proxy_stdout_log_file_path())?;
-        let eth_proxy_stderr_logs_file = open_options.open(self.proxy_stderr_log_file_path())?;
-        self.process_proxy = 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(eth_proxy_stdout_logs_file.try_clone()?)
+            .stdout(Stdio::null())
-            .stderr(eth_proxy_stderr_logs_file.try_clone()?)
+            .stderr(Stdio::piped())
-            .spawn()?
+            .spawn()?;
-            .into();
 
-        if let Err(error) = Self::wait_ready(
+        Self::wait_ready(
-            self.proxy_stderr_log_file_path().as_path(),
+            &mut proxy_process,
             Self::ETH_PROXY_READY_MARKER,
             Duration::from_secs(30),
-        ) {
+        )?;
-            tracing::error!(?error, "Failed to start proxy, shutting down gracefully");
-            self.shutdown()?;
-            return Err(error);
-        };
 
-        self.logs_file_to_flush.extend([
+        self.process_substrate = Some(substrate_process);
-            kitchensink_stdout_logs_file,
+        self.process_proxy = Some(proxy_process);
-            kitchensink_stderr_logs_file,
-            eth_proxy_stdout_logs_file,
-            eth_proxy_stderr_logs_file,
-        ]);
 
         Ok(())
     }
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+
     fn extract_balance_from_genesis_file(
         &self,
         genesis_str: &str,
@@ -269,30 +217,27 @@ impl KitchensinkNode {
         Ok(account_id.to_ss58check())
     }
 
-    fn wait_ready(logs_file_path: &Path, marker: &str, timeout: Duration) -> anyhow::Result<()> {
+    fn wait_ready(child: &mut Child, marker: &str, timeout: Duration) -> anyhow::Result<()> {
         let start_time = std::time::Instant::now();
-        let logs_file = OpenOptions::new()
+        let stderr = child.stderr.take().expect("stderr must be piped");
-            .read(true)
-            .write(false)
-            .append(false)
-            .truncate(false)
-            .open(logs_file_path)?;
 
-        let mut lines = std::io::BufReader::new(logs_file).lines();
+        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}");
             }
         }
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     pub fn eth_rpc_version(&self) -> anyhow::Result<String> {
         let output = Command::new(&self.eth_proxy_binary)
             .arg("--version")
@@ -304,32 +249,9 @@ impl KitchensinkNode {
             .stdout;
         Ok(String::from_utf8_lossy(&output).trim().to_string())
     }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id), level = Level::TRACE)]
-    fn kitchensink_stdout_log_file_path(&self) -> PathBuf {
-        self.logs_directory
-            .join(Self::KITCHENSINK_STDOUT_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id), level = Level::TRACE)]
-    fn kitchensink_stderr_log_file_path(&self) -> PathBuf {
-        self.logs_directory
-            .join(Self::KITCHENSINK_STDERR_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id), level = Level::TRACE)]
-    fn proxy_stdout_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::PROXY_STDOUT_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id), level = Level::TRACE)]
-    fn proxy_stderr_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::PROXY_STDERR_LOG_FILE_NAME)
-    }
 }
 
 impl EthereumNode for KitchensinkNode {
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn execute_transaction(
         &self,
         transaction: alloy::rpc::types::TransactionRequest,
@@ -342,6 +264,7 @@ impl EthereumNode for KitchensinkNode {
         tracing::info!("Submitting tx to kitchensink");
         let receipt = execute_transaction(Box::pin(async move {
             Ok(ProviderBuilder::new()
+                .network::<KitchenSinkNetwork>()
                 .wallet(wallet)
                 .connect(&url)
                 .await?
@@ -354,7 +277,6 @@ impl EthereumNode for KitchensinkNode {
         receipt
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn trace_transaction(
         &self,
         transaction: TransactionReceipt,
@@ -370,6 +292,7 @@ impl EthereumNode for KitchensinkNode {
 
         trace_transaction(Box::pin(async move {
             Ok(ProviderBuilder::new()
+                .network::<KitchenSinkNetwork>()
                 .wallet(wallet)
                 .connect(&url)
                 .await?
@@ -378,7 +301,6 @@ impl EthereumNode for KitchensinkNode {
         }))
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode> {
         match self
             .trace_transaction(transaction)?
@@ -389,7 +311,6 @@ impl EthereumNode for KitchensinkNode {
         }
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
         let url = self.rpc_url.clone();
         let wallet = self.wallet.clone();
@@ -409,7 +330,6 @@ impl Node for KitchensinkNode {
         let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
         let base_directory = kitchensink_directory.join(id.to_string());
-        let logs_directory = base_directory.join(Self::LOGS_DIRECTORY);
 
         Self {
             id,
@@ -418,54 +338,30 @@ impl Node for KitchensinkNode {
             rpc_url: String::new(),
             wallet: config.wallet(),
             base_directory,
-            logs_directory,
             process_substrate: None,
             process_proxy: None,
             nonces: Mutex::new(HashMap::new()),
-            // We know that we only need to be storing 4 files so we can specify that when creating
-            // the vector. It's the stdout and stderr of the substrate-node and the eth-rpc.
-            logs_file_to_flush: Vec::with_capacity(4),
         }
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn connection_string(&self) -> String {
         self.rpc_url.clone()
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    fn shutdown(mut self) -> anyhow::Result<()> {
-    fn shutdown(&mut self) -> anyhow::Result<()> {
-        // Terminate the processes in a graceful manner to allow for the output to be flushed.
         if let Some(mut child) = self.process_proxy.take() {
-            child
+            let _ = child.kill();
-                .kill()
-                .map_err(|error| anyhow::anyhow!("Failed to kill the proxy process: {error:?}"))?;
         }
         if let Some(mut child) = self.process_substrate.take() {
-            child.kill().map_err(|error| {
+            let _ = child.kill();
-                anyhow::anyhow!("Failed to kill the substrate process: {error:?}")
-            })?;
         }
-
-        // Flushing the files that we're using for keeping the logs before shutdown.
-        for file in self.logs_file_to_flush.iter_mut() {
-            file.flush()?
-        }
-
-        // Remove the node's database so that subsequent runs do not run on the same database. We
-        // ignore the error just in case the directory didn't exist in the first place and therefore
-        // there's nothing to be deleted.
-        let _ = remove_dir_all(self.base_directory.join(Self::DATA_DIRECTORY));
-
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn spawn(&mut self, genesis: String) -> anyhow::Result<()> {
         self.init(&genesis)?.spawn_process()
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn version(&self) -> anyhow::Result<String> {
         let output = Command::new(&self.substrate_binary)
             .arg("--version")
@@ -480,21 +376,447 @@ impl Node for KitchensinkNode {
 }
 
 impl Drop for KitchensinkNode {
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn drop(&mut self) {
-        self.shutdown().expect("Failed to shutdown")
+        if let Some(mut child) = self.process_proxy.take() {
+            let _ = child.kill();
+        }
+        if let Some(mut child) = self.process_substrate.take() {
+            let _ = child.kill();
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+struct KitchenSinkNetwork;
+
+impl Network for KitchenSinkNetwork {
+    type TxType = <Ethereum as Network>::TxType;
+
+    type TxEnvelope = <Ethereum as Network>::TxEnvelope;
+
+    type UnsignedTx = <Ethereum as Network>::UnsignedTx;
+
+    type ReceiptEnvelope = <Ethereum as Network>::ReceiptEnvelope;
+
+    type Header = KitchenSinkHeader;
+
+    type TransactionRequest = <Ethereum as Network>::TransactionRequest;
+
+    type TransactionResponse = <Ethereum as Network>::TransactionResponse;
+
+    type ReceiptResponse = <Ethereum as Network>::ReceiptResponse;
+
+    type HeaderResponse = Header<KitchenSinkHeader>;
+
+    type BlockResponse = Block<Transaction<TxEnvelope>, Header<KitchenSinkHeader>>;
+}
+
+impl TransactionBuilder<KitchenSinkNetwork> for <Ethereum as Network>::TransactionRequest {
+    fn chain_id(&self) -> Option<alloy::primitives::ChainId> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::chain_id(self)
+    }
+
+    fn set_chain_id(&mut self, chain_id: alloy::primitives::ChainId) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_chain_id(
+            self, chain_id,
+        )
+    }
+
+    fn nonce(&self) -> Option<u64> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::nonce(self)
+    }
+
+    fn set_nonce(&mut self, nonce: u64) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_nonce(
+            self, nonce,
+        )
+    }
+
+    fn input(&self) -> Option<&alloy::primitives::Bytes> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::input(self)
+    }
+
+    fn set_input<T: Into<alloy::primitives::Bytes>>(&mut self, input: T) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_input(
+            self, input,
+        )
+    }
+
+    fn from(&self) -> Option<Address> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::from(self)
+    }
+
+    fn set_from(&mut self, from: Address) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_from(
+            self, from,
+        )
+    }
+
+    fn kind(&self) -> Option<alloy::primitives::TxKind> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::kind(self)
+    }
+
+    fn clear_kind(&mut self) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::clear_kind(
+            self,
+        )
+    }
+
+    fn set_kind(&mut self, kind: alloy::primitives::TxKind) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_kind(
+            self, kind,
+        )
+    }
+
+    fn value(&self) -> Option<alloy::primitives::U256> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::value(self)
+    }
+
+    fn set_value(&mut self, value: alloy::primitives::U256) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_value(
+            self, value,
+        )
+    }
+
+    fn gas_price(&self) -> Option<u128> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::gas_price(self)
+    }
+
+    fn set_gas_price(&mut self, gas_price: u128) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_gas_price(
+            self, gas_price,
+        )
+    }
+
+    fn max_fee_per_gas(&self) -> Option<u128> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::max_fee_per_gas(
+            self,
+        )
+    }
+
+    fn set_max_fee_per_gas(&mut self, max_fee_per_gas: u128) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_max_fee_per_gas(
+            self, max_fee_per_gas
+        )
+    }
+
+    fn max_priority_fee_per_gas(&self) -> Option<u128> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::max_priority_fee_per_gas(
+            self,
+        )
+    }
+
+    fn set_max_priority_fee_per_gas(&mut self, max_priority_fee_per_gas: u128) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_max_priority_fee_per_gas(
+            self, max_priority_fee_per_gas
+        )
+    }
+
+    fn gas_limit(&self) -> Option<u64> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::gas_limit(self)
+    }
+
+    fn set_gas_limit(&mut self, gas_limit: u64) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_gas_limit(
+            self, gas_limit,
+        )
+    }
+
+    fn access_list(&self) -> Option<&alloy::rpc::types::AccessList> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::access_list(
+            self,
+        )
+    }
+
+    fn set_access_list(&mut self, access_list: alloy::rpc::types::AccessList) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::set_access_list(
+            self,
+            access_list,
+        )
+    }
+
+    fn complete_type(
+        &self,
+        ty: <KitchenSinkNetwork as Network>::TxType,
+    ) -> Result<(), Vec<&'static str>> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::complete_type(
+            self, ty,
+        )
+    }
+
+    fn can_submit(&self) -> bool {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::can_submit(
+            self,
+        )
+    }
+
+    fn can_build(&self) -> bool {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::can_build(self)
+    }
+
+    fn output_tx_type(&self) -> <KitchenSinkNetwork as Network>::TxType {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::output_tx_type(
+            self,
+        )
+    }
+
+    fn output_tx_type_checked(&self) -> Option<<KitchenSinkNetwork as Network>::TxType> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::output_tx_type_checked(
+            self,
+        )
+    }
+
+    fn prep_for_submission(&mut self) {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::prep_for_submission(
+            self,
+        )
+    }
+
+    fn build_unsigned(
+        self,
+    ) -> alloy::network::BuildResult<<KitchenSinkNetwork as Network>::UnsignedTx, KitchenSinkNetwork>
+    {
+        let result = <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::build_unsigned(
+            self,
+        );
+        match result {
+            Ok(unsigned_tx) => Ok(unsigned_tx),
+            Err(UnbuiltTransactionError { request, error }) => {
+                Err(UnbuiltTransactionError::<KitchenSinkNetwork> {
+                    request,
+                    error: match error {
+                        TransactionBuilderError::InvalidTransactionRequest(tx_type, items) => {
+                            TransactionBuilderError::InvalidTransactionRequest(tx_type, items)
+                        }
+                        TransactionBuilderError::UnsupportedSignatureType => {
+                            TransactionBuilderError::UnsupportedSignatureType
+                        }
+                        TransactionBuilderError::Signer(error) => {
+                            TransactionBuilderError::Signer(error)
+                        }
+                        TransactionBuilderError::Custom(error) => {
+                            TransactionBuilderError::Custom(error)
+                        }
+                    },
+                })
+            }
+        }
+    }
+
+    async fn build<W: alloy::network::NetworkWallet<KitchenSinkNetwork>>(
+        self,
+        wallet: &W,
+    ) -> Result<
+        <KitchenSinkNetwork as Network>::TxEnvelope,
+        TransactionBuilderError<KitchenSinkNetwork>,
+    > {
+        Ok(wallet.sign_request(self).await?)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct KitchenSinkHeader {
+    /// The Keccak 256-bit hash of the parent
+    /// block’s header, in its entirety; formally Hp.
+    pub parent_hash: B256,
+    /// The Keccak 256-bit hash of the ommers list portion of this block; formally Ho.
+    #[serde(rename = "sha3Uncles", alias = "ommersHash")]
+    pub ommers_hash: B256,
+    /// The 160-bit address to which all fees collected from the successful mining of this block
+    /// be transferred; formally Hc.
+    #[serde(rename = "miner", alias = "beneficiary")]
+    pub beneficiary: Address,
+    /// The Keccak 256-bit hash of the root node of the state trie, after all transactions are
+    /// executed and finalisations applied; formally Hr.
+    pub state_root: B256,
+    /// The Keccak 256-bit hash of the root node of the trie structure populated with each
+    /// transaction in the transactions list portion of the block; formally Ht.
+    pub transactions_root: B256,
+    /// The Keccak 256-bit hash of the root node of the trie structure populated with the receipts
+    /// of each transaction in the transactions list portion of the block; formally He.
+    pub receipts_root: B256,
+    /// The Bloom filter composed from indexable information (logger address and log topics)
+    /// contained in each log entry from the receipt of each transaction in the transactions list;
+    /// formally Hb.
+    pub logs_bloom: Bloom,
+    /// A scalar value corresponding to the difficulty level of this block. This can be calculated
+    /// from the previous block’s difficulty level and the timestamp; formally Hd.
+    pub difficulty: U256,
+    /// A scalar value equal to the number of ancestor blocks. The genesis block has a number of
+    /// zero; formally Hi.
+    #[serde(with = "alloy::serde::quantity")]
+    pub number: BlockNumber,
+    /// A scalar value equal to the current limit of gas expenditure per block; formally Hl.
+    // This is the main difference over the Ethereum network implementation. We use u128 here and
+    // not u64.
+    #[serde(with = "alloy::serde::quantity")]
+    pub gas_limit: u128,
+    /// A scalar value equal to the total gas used in transactions in this block; formally Hg.
+    #[serde(with = "alloy::serde::quantity")]
+    pub gas_used: u64,
+    /// A scalar value equal to the reasonable output of Unix’s time() at this block’s inception;
+    /// formally Hs.
+    #[serde(with = "alloy::serde::quantity")]
+    pub timestamp: u64,
+    /// An arbitrary byte array containing data relevant to this block. This must be 32 bytes or
+    /// fewer; formally Hx.
+    pub extra_data: Bytes,
+    /// A 256-bit hash which, combined with the
+    /// nonce, proves that a sufficient amount of computation has been carried out on this block;
+    /// formally Hm.
+    pub mix_hash: B256,
+    /// A 64-bit value which, combined with the mixhash, proves that a sufficient amount of
+    /// computation has been carried out on this block; formally Hn.
+    pub nonce: B64,
+    /// A scalar representing EIP1559 base fee which can move up or down each block according
+    /// to a formula which is a function of gas used in parent block and gas target
+    /// (block gas limit divided by elasticity multiplier) of parent block.
+    /// The algorithm results in the base fee per gas increasing when blocks are
+    /// above the gas target, and decreasing when blocks are below the gas target. The base fee per
+    /// gas is burned.
+    #[serde(
+        default,
+        with = "alloy::serde::quantity::opt",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub base_fee_per_gas: Option<u64>,
+    /// The Keccak 256-bit hash of the withdrawals list portion of this block.
+    /// <https://eips.ethereum.org/EIPS/eip-4895>
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub withdrawals_root: Option<B256>,
+    /// The total amount of blob gas consumed by the transactions within the block, added in
+    /// EIP-4844.
+    #[serde(
+        default,
+        with = "alloy::serde::quantity::opt",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub blob_gas_used: Option<u64>,
+    /// A running total of blob gas consumed in excess of the target, prior to the block. Blocks
+    /// with above-target blob gas consumption increase this value, blocks with below-target blob
+    /// gas consumption decrease it (bounded at 0). This was added in EIP-4844.
+    #[serde(
+        default,
+        with = "alloy::serde::quantity::opt",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub excess_blob_gas: Option<u64>,
+    /// The hash of the parent beacon block's root is included in execution blocks, as proposed by
+    /// EIP-4788.
+    ///
+    /// This enables trust-minimized access to consensus state, supporting staking pools, bridges,
+    /// and more.
+    ///
+    /// The beacon roots contract handles root storage, enhancing Ethereum's functionalities.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub parent_beacon_block_root: Option<B256>,
+    /// The Keccak 256-bit hash of the an RLP encoded list with each
+    /// [EIP-7685] request in the block body.
+    ///
+    /// [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub requests_hash: Option<B256>,
+}
+
+impl BlockHeader for KitchenSinkHeader {
+    fn parent_hash(&self) -> B256 {
+        self.parent_hash
+    }
+
+    fn ommers_hash(&self) -> B256 {
+        self.ommers_hash
+    }
+
+    fn beneficiary(&self) -> Address {
+        self.beneficiary
+    }
+
+    fn state_root(&self) -> B256 {
+        self.state_root
+    }
+
+    fn transactions_root(&self) -> B256 {
+        self.transactions_root
+    }
+
+    fn receipts_root(&self) -> B256 {
+        self.receipts_root
+    }
+
+    fn withdrawals_root(&self) -> Option<B256> {
+        self.withdrawals_root
+    }
+
+    fn logs_bloom(&self) -> Bloom {
+        self.logs_bloom
+    }
+
+    fn difficulty(&self) -> U256 {
+        self.difficulty
+    }
+
+    fn number(&self) -> BlockNumber {
+        self.number
+    }
+
+    // There's sadly nothing that we can do about this. We're required to implement this trait on
+    // any type that represents a header and the gas limit type used here is a u64.
+    fn gas_limit(&self) -> u64 {
+        self.gas_limit.try_into().unwrap_or(u64::MAX)
+    }
+
+    fn gas_used(&self) -> u64 {
+        self.gas_used
+    }
+
+    fn timestamp(&self) -> u64 {
+        self.timestamp
+    }
+
+    fn mix_hash(&self) -> Option<B256> {
+        Some(self.mix_hash)
+    }
+
+    fn nonce(&self) -> Option<B64> {
+        Some(self.nonce)
+    }
+
+    fn base_fee_per_gas(&self) -> Option<u64> {
+        self.base_fee_per_gas
+    }
+
+    fn blob_gas_used(&self) -> Option<u64> {
+        self.blob_gas_used
+    }
+
+    fn excess_blob_gas(&self) -> Option<u64> {
+        self.excess_blob_gas
+    }
+
+    fn parent_beacon_block_root(&self) -> Option<B256> {
+        self.parent_beacon_block_root
+    }
+
+    fn requests_hash(&self) -> Option<B256> {
+        self.requests_hash
+    }
+
+    fn extra_data(&self) -> &Bytes {
+        &self.extra_data
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use alloy::rpc::types::TransactionRequest;
     use revive_dt_config::Arguments;
     use std::path::PathBuf;
     use temp_dir::TempDir;
 
     use std::fs;
 
-    use super::KitchensinkNode;
+    use super::*;
     use crate::{GENESIS_JSON, Node};
 
     fn test_config() -> (Arguments, TempDir) {
@@ -509,6 +831,37 @@ mod tests {
         (config, temp_dir)
     }
 
+    #[tokio::test]
+    async fn node_mines_simple_transfer_transaction_and_returns_receipt() {
+        // Arrange
+        let (args, _temp_dir) = test_config();
+        let mut node = KitchensinkNode::new(&args);
+        node.spawn(GENESIS_JSON.to_owned())
+            .expect("Failed to spawn the node");
+
+        let provider = ProviderBuilder::new()
+            .network::<KitchenSinkNetwork>()
+            .wallet(args.wallet())
+            .connect(&node.rpc_url)
+            .await
+            .expect("Failed to create provider");
+
+        let account_address = args.wallet().default_signer().address();
+        let transaction = TransactionRequest::default()
+            .to(account_address)
+            .value(U256::from(100_000_000_000_000u128));
+
+        // Act
+        let receipt = provider.send_transaction(transaction).await;
+
+        // Assert
+        let _ = receipt
+            .expect("Failed to send the transfer transaction")
+            .get_receipt()
+            .await
+            .expect("Failed to get the receipt for the transfer");
+    }
+
     #[test]
     fn test_init_generates_chainspec_with_balances() {
         let genesis_content = r#"

crates/node/src/lib.rs

@@ -23,7 +23,7 @@ pub trait Node: EthereumNode {
     /// Prune the node instance and related data.
     ///
     /// Blocking until it's completely stopped.
-    fn shutdown(&mut self) -> anyhow::Result<()>;
+    fn shutdown(self) -> anyhow::Result<()>;
 
     /// Returns the nodes connection string.
     fn connection_string(&self) -> String;