Switch to callframe trace for exceptions

* Add support for wrapper types

* Move `FilesWithExtensionIterator` to `core::common`

* Remove unneeded use of two `HashMap`s

* Make metadata structs more typed

* Impl new_from for wrapper types

* Implement the new input handling logic

* Fix edge-case in input handling

* Ignore macro doc comment tests

* Correct comment

* Fix edge-case in deployment order

* Handle calldata better

* Remove todo

Cargo.lock

@@ -346,7 +346,7 @@ dependencies = [
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ruint",
  "rustc-hash",
  "serde",
@@ -3737,9 +3737,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -4131,7 +4131,7 @@ dependencies = [
  "primitive-types 0.12.2",
  "proptest",
  "rand 0.8.5",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rlp",
  "ruint-macro",
  "serde",

crates/config/src/lib.rs

@@ -123,18 +123,16 @@ impl Arguments {
         panic!("should have a workdir configured")
     }
 
-    pub fn signer(&self) -> PrivateKeySigner {
-        self.account
-            .parse::<PrivateKeySigner>()
-            .unwrap_or_else(|error| {
-                panic!("private key '{}' parsing error: {error}", self.account);
-            })
-    }
-
     /// Try to parse `self.account` into a [PrivateKeySigner],
     /// panicing on error.
     pub fn wallet(&self) -> EthereumWallet {
-        EthereumWallet::new(self.signer())
+        let signer = self
+            .account
+            .parse::<PrivateKeySigner>()
+            .unwrap_or_else(|error| {
+                panic!("private key '{}' parsing error: {error}", self.account);
+            });
+        EthereumWallet::new(signer)
     }
 }
 

crates/core/src/driver/mod.rs

@@ -8,7 +8,8 @@ use alloy::network::{Ethereum, TransactionBuilder};
 use alloy::primitives::Bytes;
 use alloy::rpc::types::TransactionReceipt;
 use alloy::rpc::types::trace::geth::{
-    DefaultFrame, GethDebugTracingOptions, GethDefaultTracingOptions, GethTrace, PreStateConfig,
+    CallFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace,
+    PreStateConfig,
 };
 use alloy::{
     primitives::Address,
@@ -365,23 +366,7 @@ where
         let _guard = span.enter();
 
         // Resolving the `input.expected` into a series of expectations that we can then assert on.
-        let expectations = match input {
-            // This is a bit of a special case and we have to support it separately on it's own. If
-            // it's a call to the deployer method, then the tests will assert that it "returns" the
-            // address of the contract. Deployments do not return the address of the contract but
-            // the runtime code of the contracts. Therefore, this assertion would always fail. So,
-            // we replace it with an assertion of "check if it succeeded"
-            Input {
-                expected: Some(Expected::Calldata(Calldata::Compound(compound))),
-                method: Method::Deployer,
-                ..
-            } if compound.len() == 1
-                && compound
-                    .first()
-                    .is_some_and(|first| first.contains(".address")) =>
-            {
-                vec![ExpectedOutput::new().with_success()]
-            }
+        let mut expectations = match input {
             Input {
                 expected: Some(Expected::Calldata(calldata)),
                 ..
@@ -397,6 +382,17 @@ where
             Input { expected: None, .. } => vec![ExpectedOutput::new().with_success()],
         };
 
+        // This is a bit of a special case and we have to support it separately on it's own. If it's
+        // a call to the deployer method, then the tests will assert that it "returns" the address
+        // of the contract. Deployments do not return the address of the contract but the runtime
+        // code of the contracts. Therefore, this assertion would always fail. So, we replace it
+        // with an assertion of "check if it succeeded"
+        if let Method::Deployer = &input.method {
+            for expectation in expectations.iter_mut() {
+                expectation.return_data = None;
+            }
+        }
+
         // Note: we need to do assertions and checks on the output of the last call and this isn't
         // available in the receipt. The only way to get this information is through tracing on the
         // node.
@@ -404,12 +400,14 @@ where
             .trace_transaction(
                 execution_receipt,
                 GethDebugTracingOptions {
-                    config: GethDefaultTracingOptions::default().with_enable_return_data(true),
+                    tracer: Some(GethDebugTracerType::BuiltInTracer(
+                        GethDebugBuiltInTracerType::CallTracer,
+                    )),
                     ..Default::default()
                 },
             )?
-            .try_into_default_frame()
-            .expect("Impossible. We can't request default tracing and get some other type back");
+            .try_into_call_frame()
+            .expect("Impossible - we requested a callframe trace so we must get it back");
 
         for expectation in expectations.iter() {
             self.handle_input_expectation_item(
@@ -430,7 +428,7 @@ where
         execution_receipt: &TransactionReceipt,
         node: &T::Blockchain,
         expectation: &ExpectedOutput,
-        tracing_result: &DefaultFrame,
+        tracing_result: &CallFrame,
     ) -> anyhow::Result<()> {
         // TODO: We want to respect the compiler version filter on the expected output but would
         // require some changes to the interfaces of the compiler and such. So, we add it later.
@@ -457,7 +455,7 @@ where
             let expected = expected_calldata
                 .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)
                 .map(Bytes::from)?;
-            let actual = tracing_result.return_value.clone();
+            let actual = tracing_result.output.clone().unwrap_or_default();
             if !expected.starts_with(&actual) {
                 tracing::error!(?execution_receipt, %expected, %actual, "Calldata assertion failed");
                 anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",);
@@ -503,18 +501,26 @@ where
                 }
 
                 // Handling the topics assertion.
-                let expected = expected_event.topics.as_slice();
-                let actual = actual_event.topics();
-                if actual != expected {
-                    tracing::error!(
-                        ?execution_receipt,
-                        ?expected,
-                        ?actual,
-                        "Event topics assertion failed",
-                    );
-                    anyhow::bail!(
-                        "Event topics assertion failed - Expected {expected:?} but got {actual:?}",
-                    );
+                for (expected_topic, actual_topic) in expected_event
+                    .topics
+                    .as_slice()
+                    .iter()
+                    .zip(actual_event.topics())
+                {
+                    let expected = Calldata::Compound(vec![expected_topic.clone()])
+                        .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)?;
+                    let actual = actual_topic.to_vec();
+                    if actual != expected {
+                        tracing::error!(
+                            ?execution_receipt,
+                            ?expected,
+                            ?actual,
+                            "Event topics assertion failed",
+                        );
+                        anyhow::bail!(
+                            "Event topics assertion failed - Expected {expected:?} but got {actual:?}",
+                        );
+                    }
                 }
 
                 // Handling the values assertion.
@@ -686,6 +692,7 @@ where
 
             // For cases if one of the inputs fail then we move on to the next case and we do NOT
             // bail out of the whole thing.
+
             'case_loop: for (case_idx, case) in self.metadata.cases.iter().enumerate() {
                 let tracing_span = tracing::info_span!(
                     "Handling case",

crates/core/src/main.rs

@@ -1,6 +1,13 @@
-use std::{collections::HashMap, sync::LazyLock};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::LazyLock,
+};
 
-use alloy::primitives::Address;
+use alloy::{
+    network::TxSigner,
+    primitives::FixedBytes,
+    signers::{Signature, local::PrivateKeySigner},
+};
 use clap::Parser;
 use rayon::{ThreadPoolBuilder, prelude::*};
 
@@ -9,7 +16,11 @@ use revive_dt_core::{
     Geth, Kitchensink, Platform,
     driver::{Driver, State},
 };
-use revive_dt_format::{corpus::Corpus, input::default_caller, metadata::MetadataFile};
+use revive_dt_format::{
+    corpus::Corpus,
+    input::default_caller,
+    metadata::{AddressReplacementMap, MetadataFile},
+};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
@@ -21,24 +32,48 @@ static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 fn main() -> anyhow::Result<()> {
     let args = init_cli()?;
 
-    let corpora = collect_corpora(&args)?;
-    let additional_callers = corpora
-        .values()
-        .flat_map(|value| value.iter().map(|metadata| &metadata.cases))
-        .flat_map(|case| case.iter().map(|case| &case.inputs))
-        .flatten()
-        .map(|input| input.caller)
-        .filter(|caller| caller != &default_caller())
-        .collect::<Vec<_>>();
+    let mut corpora = collect_corpora(&args)?;
+    let mut replacement_private_keys = HashSet::<FixedBytes<32>>::new();
+    for case in corpora
+        .values_mut()
+        .flat_map(|metadata| metadata.iter_mut())
+        .flat_map(|metadata| metadata.content.cases.iter_mut())
+    {
+        let mut replacement_map = AddressReplacementMap::new();
+        for address in case.inputs.iter().filter_map(|input| {
+            if input.caller != default_caller() {
+                Some(input.caller)
+            } else {
+                None
+            }
+        }) {
+            replacement_map.add(address);
+        }
+        case.handle_address_replacement(&mut replacement_map)?;
+        replacement_private_keys.extend(
+            replacement_map
+                .into_inner()
+                .into_values()
+                .map(|(sk, _)| sk)
+                .map(|sk| sk.to_bytes()),
+        );
+    }
 
-    tracing::debug!(?additional_callers, "Discovered callers");
-
-    for (corpus, tests) in collect_corpora(&args)? {
+    for (corpus, tests) in corpora {
         let span = Span::new(corpus, args.clone())?;
 
         match &args.compile_only {
             Some(platform) => compile_corpus(&args, &tests, platform, span),
-            None => execute_corpus(&args, &tests, &additional_callers, span)?,
+            None => execute_corpus(
+                &args,
+                &tests,
+                replacement_private_keys
+                    .clone()
+                    .into_iter()
+                    .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail"))
+                    .collect::<Vec<_>>(),
+                span,
+            )?,
         }
 
         Report::save()?;
@@ -99,7 +134,11 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metad
 fn run_driver<L, F>(
     args: &Arguments,
     tests: &[MetadataFile],
-    additional_callers: &[Address],
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
     span: Span,
 ) -> anyhow::Result<()>
 where
@@ -108,8 +147,8 @@ where
     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, additional_callers)?;
-    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_callers)?;
+    let leader_nodes = NodePool::<L::Blockchain>::new(args, additional_signers.clone())?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_signers)?;
 
     tests.par_iter().for_each(
         |MetadataFile {
@@ -162,15 +201,19 @@ where
 fn execute_corpus(
     args: &Arguments,
     tests: &[MetadataFile],
-    additional_callers: &[Address],
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
     span: Span,
 ) -> anyhow::Result<()> {
     match (&args.leader, &args.follower) {
         (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, additional_callers, span)?
+            run_driver::<Geth, Kitchensink>(args, tests, additional_signers, span)?
         }
         (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, additional_callers, span)?
+            run_driver::<Geth, Geth>(args, tests, additional_signers, span)?
         }
         _ => unimplemented!(),
     }

crates/format/src/case.rs

@@ -3,6 +3,7 @@ use serde::Deserialize;
 use crate::{
     define_wrapper_type,
     input::{Expected, Input},
+    metadata::AddressReplacementMap,
     mode::Mode,
 };
 
@@ -16,12 +17,6 @@ pub struct Case {
     pub expected: Option<Expected>,
 }
 
-define_wrapper_type!(
-    /// A wrapper type for the index of test cases found in metadata file.
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    CaseIdx(usize);
-);
-
 impl Case {
     pub fn inputs_iterator(&self) -> impl Iterator<Item = Input> {
         let inputs_len = self.inputs.len();
@@ -38,4 +33,23 @@ impl Case {
                 }
             })
     }
+
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &mut AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        for input in self.inputs.iter_mut() {
+            input.handle_address_replacement(old_to_new_mapping)?;
+        }
+        if let Some(ref mut expected) = self.expected {
+            expected.handle_address_replacement(old_to_new_mapping)?;
+        }
+        Ok(())
+    }
 }
+
+define_wrapper_type!(
+    /// A wrapper type for the index of test cases found in metadata file.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    CaseIdx(usize);
+);

crates/format/src/input.rs

@@ -7,13 +7,13 @@ use alloy::{
     primitives::{Address, Bytes, U256},
     rpc::types::TransactionRequest,
 };
-use alloy_primitives::B256;
+use alloy_primitives::FixedBytes;
 use semver::VersionReq;
 use serde::Deserialize;
 
 use revive_dt_node_interaction::EthereumNode;
 
-use crate::metadata::ContractInstance;
+use crate::metadata::{AddressReplacementMap, ContractInstance};
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
@@ -50,7 +50,7 @@ pub struct ExpectedOutput {
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Event {
     pub address: Option<Address>,
-    pub topics: Vec<B256>,
+    pub topics: Vec<String>,
     pub values: Calldata,
 }
 
@@ -101,6 +101,41 @@ impl ExpectedOutput {
         self.return_data = Some(calldata);
         self
     }
+
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        if let Some(ref mut calldata) = self.return_data {
+            calldata.handle_address_replacement(old_to_new_mapping)?;
+        }
+        if let Some(ref mut events) = self.events {
+            for event in events.iter_mut() {
+                event.handle_address_replacement(old_to_new_mapping)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+impl Event {
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        if let Some(ref mut address) = self.address {
+            if let Some(new_address) = old_to_new_mapping.resolve(address.to_string().as_str()) {
+                *address = new_address
+            }
+        };
+        for topic in self.topics.iter_mut() {
+            if let Some(new_address) = old_to_new_mapping.resolve(topic.to_string().as_str()) {
+                *topic = new_address.to_string();
+            }
+        }
+        self.values.handle_address_replacement(old_to_new_mapping)?;
+        Ok(())
+    }
 }
 
 impl Default for Calldata {
@@ -120,6 +155,23 @@ impl Calldata {
         }
     }
 
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        match self {
+            Calldata::Single(_) => {}
+            Calldata::Compound(items) => {
+                for item in items.iter_mut() {
+                    if let Some(resolved) = old_to_new_mapping.resolve(item) {
+                        *item = resolved.to_string()
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
     pub fn calldata(
         &self,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
@@ -165,6 +217,28 @@ impl Calldata {
     }
 }
 
+impl Expected {
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        match self {
+            Expected::Calldata(calldata) => {
+                calldata.handle_address_replacement(old_to_new_mapping)?;
+            }
+            Expected::Expected(expected_output) => {
+                expected_output.handle_address_replacement(old_to_new_mapping)?;
+            }
+            Expected::ExpectedMany(expected_outputs) => {
+                for expected_output in expected_outputs.iter_mut() {
+                    expected_output.handle_address_replacement(old_to_new_mapping)?;
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
 impl Input {
     fn instance_to_address(
         &self,
@@ -267,14 +341,36 @@ impl Input {
 
         vec
     }
+
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &mut AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        if self.caller != default_caller() {
+            self.caller = old_to_new_mapping.add(self.caller);
+        }
+        self.calldata
+            .handle_address_replacement(old_to_new_mapping)?;
+        if let Some(ref mut expected) = self.expected {
+            expected.handle_address_replacement(old_to_new_mapping)?;
+        }
+        if let Some(ref mut storage) = self.storage {
+            for calldata in storage.values_mut() {
+                calldata.handle_address_replacement(old_to_new_mapping)?;
+            }
+        }
+        Ok(())
+    }
 }
 
-pub fn default_instance() -> ContractInstance {
+fn default_instance() -> ContractInstance {
     ContractInstance::new_from("Test")
 }
 
-pub fn default_caller() -> Address {
-    "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap()
+pub const fn default_caller() -> Address {
+    Address(FixedBytes(alloy::hex!(
+        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
+    )))
 }
 
 /// This function takes in the string calldata argument provided in the JSON input and resolves it
@@ -285,7 +381,7 @@ pub fn default_caller() -> Address {
 /// 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(
+pub fn resolve_argument(
     value: &str,
     deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
     chain_state_provider: &impl EthereumNode,
@@ -462,7 +558,7 @@ mod tests {
     }
 
     #[test]
-    fn test_encoded_input_address() {
+    fn test_encoded_input_address_with_signature() {
         let raw_abi = r#"[
         {
             "inputs": [{"name": "recipient", "type": "address"}],
@@ -483,8 +579,8 @@ mod tests {
             .0;
 
         let input: Input = Input {
-            instance: ContractInstance::new_from("Contract"),
-            method: Method::FunctionName("send".to_owned()),
+            instance: "Contract".to_owned().into(),
+            method: Method::FunctionName("send(address)".to_owned()),
             calldata: Calldata::Compound(vec![
                 "0x1000000000000000000000000000000000000001".to_string(),
             ]),
@@ -509,7 +605,7 @@ mod tests {
     }
 
     #[test]
-    fn test_encoded_input_address_with_signature() {
+    fn test_encoded_input_address() {
         let raw_abi = r#"[
         {
             "inputs": [{"name": "recipient", "type": "address"}],
@@ -531,7 +627,7 @@ mod tests {
 
         let input: Input = Input {
             instance: ContractInstance::new_from("Contract"),
-            method: Method::FunctionName("send(address)".to_owned()),
+            method: Method::FunctionName("send".to_owned()),
             calldata: Calldata::Compound(vec![
                 "0x1000000000000000000000000000000000000001".to_string(),
             ]),

crates/format/src/metadata.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::BTreeMap,
+    collections::{BTreeMap, HashMap},
     fmt::Display,
     fs::{File, read_to_string},
     ops::Deref,
@@ -7,11 +7,15 @@ use std::{
     str::FromStr,
 };
 
+use alloy::signers::local::PrivateKeySigner;
+use alloy_primitives::Address;
+use revive_dt_node_interaction::EthereumNode;
 use serde::{Deserialize, Serialize};
 
 use crate::{
     case::Case,
     define_wrapper_type,
+    input::resolve_argument,
     mode::{Mode, SolcMode},
 };
 
@@ -210,6 +214,17 @@ impl Metadata {
             }
         }
     }
+
+    pub fn handle_address_replacement(
+        &mut self,
+        old_to_new_mapping: &mut AddressReplacementMap,
+    ) -> anyhow::Result<()> {
+        for case in self.cases.iter_mut() {
+            case.handle_address_replacement(old_to_new_mapping)?;
+        }
+        tracing::debug!(metadata = ?self, "Performed replacement on metadata");
+        Ok(())
+    }
 }
 
 define_wrapper_type!(
@@ -308,6 +323,129 @@ impl From<ContractPathAndIdentifier> for String {
     }
 }
 
+#[derive(Clone, Debug, Default)]
+pub struct AddressReplacementMap(HashMap<Address, (PrivateKeySigner, Address)>);
+
+impl AddressReplacementMap {
+    pub fn new() -> Self {
+        Self(Default::default())
+    }
+
+    pub fn into_inner(self) -> HashMap<Address, (PrivateKeySigner, Address)> {
+        self.0
+    }
+
+    pub fn contains_key(&self, address: &Address) -> bool {
+        self.0.contains_key(address)
+    }
+
+    pub fn add(&mut self, address: Address) -> Address {
+        self.0
+            .entry(address)
+            .or_insert_with(|| {
+                let private_key = Self::new_random_private_key_signer();
+                let account = private_key.address();
+                tracing::debug!(
+                    old_address = %address,
+                    new_address = %account,
+                    "Added a new address replacement"
+                );
+                (private_key, account)
+            })
+            .1
+    }
+
+    pub fn resolve(&self, value: &str) -> Option<Address> {
+        // We attempt to resolve the given string without any additional context of the deployed
+        // contracts or the node API as we do not need them. If the resolution fails then we know
+        // that this isn't an address and we skip it.
+        let Ok(resolved) = resolve_argument(value, &Default::default(), &UnimplementedEthereumNode)
+        else {
+            return None;
+        };
+        let resolved_bytes = resolved.to_be_bytes_trimmed_vec();
+        let Ok(address) = Address::try_from(resolved_bytes.as_slice()) else {
+            return None;
+        };
+        self.0.get(&address).map(|(_, address)| *address)
+    }
+
+    fn new_random_private_key_signer() -> PrivateKeySigner {
+        // TODO: Use a seedable RNG to allow for deterministic allocation of the private keys so
+        // that we get reproducible runs.
+        PrivateKeySigner::random()
+    }
+}
+
+impl AsRef<HashMap<Address, (PrivateKeySigner, Address)>> for AddressReplacementMap {
+    fn as_ref(&self) -> &HashMap<Address, (PrivateKeySigner, Address)> {
+        &self.0
+    }
+}
+
+struct UnimplementedEthereumNode;
+
+impl EthereumNode for UnimplementedEthereumNode {
+    fn execute_transaction(
+        &self,
+        _: alloy::rpc::types::TransactionRequest,
+    ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<Address> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_difficulty(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::U256> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_hash(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::BlockHash> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn block_timestamp(
+        &self,
+        _: alloy::eips::BlockNumberOrTag,
+    ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn trace_transaction(
+        &self,
+        _: &alloy::rpc::types::TransactionReceipt,
+        _: alloy::rpc::types::trace::geth::GethDebugTracingOptions,
+    ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
+        anyhow::bail!("Unimplemented")
+    }
+
+    fn state_diff(
+        &self,
+        _: &alloy::rpc::types::TransactionReceipt,
+    ) -> anyhow::Result<alloy::rpc::types::trace::geth::DiffMode> {
+        anyhow::bail!("Unimplemented")
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

crates/node-interaction/src/blocking_executor.rs

@@ -9,6 +9,7 @@ use tokio::{
     runtime::Builder,
     sync::{mpsc::UnboundedSender, oneshot},
 };
+use tracing::Instrument;
 
 /// A blocking async executor.
 ///
@@ -63,6 +64,11 @@ impl BlockingExecutor {
             let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<TaskMessage>();
 
             thread::spawn(move || {
+                tracing::info!(
+                    thread_id = ?std::thread::current().id(),
+                    "Starting async runtime thread"
+                );
+
                 let runtime = Builder::new_current_thread()
                     .enable_all()
                     .build()
@@ -107,7 +113,9 @@ impl BlockingExecutor {
         // in the task message. In doing this conversion, we lose some of the type information since
         // we're converting R => dyn Any. However, we will perform down-casting on the result to
         // convert it back into R.
-        let future = Box::pin(async move { Box::new(future.await) as Box<dyn Any + Send> });
+        let future = Box::pin(
+            async move { Box::new(future.await) as Box<dyn Any + Send> }.in_current_span(),
+        );
 
         let task = TaskMessage::new(future, response_tx);
         if let Err(error) = STATE.tx.send(task) {

crates/node/src/common.rs

@@ -1,14 +1,9 @@
-use ::core::pin::Pin;
-
 use alloy::{
-    consensus::SignableTransaction,
-    network::{Network, TransactionBuilder, TxSigner},
-    primitives::Address,
+    network::{Network, TransactionBuilder},
     providers::{
         Provider, SendableTx,
         fillers::{GasFiller, TxFiller},
     },
-    signers::{Signature, local::PrivateKeySigner},
     transports::TransportResult,
 };
 
@@ -81,28 +76,3 @@ where
         }
     }
 }
-
-/// This is a signer that is able to sign transactions for a specific address with another private
-/// key.
-pub struct AddressSigner {
-    pub private_key: PrivateKeySigner,
-    pub address: Address,
-}
-
-impl TxSigner<Signature> for AddressSigner {
-    fn address(&self) -> Address {
-        self.address
-    }
-
-    fn sign_transaction<'a, 'b, 'c>(
-        &'a self,
-        tx: &'b mut dyn SignableTransaction<Signature>,
-    ) -> Pin<Box<dyn Future<Output = Result<Signature, alloy::signers::Error>> + Send + 'c>>
-    where
-        'a: 'c,
-        'b: 'c,
-        Self: 'c,
-    {
-        <PrivateKeySigner as TxSigner<Signature>>::sign_transaction(&self.private_key, tx)
-    }
-}

crates/node/src/geth.rs

@@ -11,8 +11,8 @@ use std::{
 
 use alloy::{
     eips::BlockNumberOrTag,
-    genesis::Genesis,
-    network::{Ethereum, EthereumWallet},
+    genesis::{Genesis, GenesisAccount},
+    network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner},
     primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256},
     providers::{
         Provider, ProviderBuilder,
@@ -23,16 +23,13 @@ use alloy::{
         TransactionReceipt, TransactionRequest,
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
-    signers::local::PrivateKeySigner,
+    signers::Signature,
 };
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 use tracing::Level;
 
-use crate::{
-    Node,
-    common::{AddressSigner, FallbackGasFiller},
-};
+use crate::{Node, common::FallbackGasFiller};
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -55,10 +52,7 @@ pub struct Instance {
     network_id: u64,
     start_timeout: u64,
     wallet: EthereumWallet,
-    private_key: PrivateKeySigner,
     nonce_manager: CachedNonceManager,
-    additional_callers: Vec<Address>,
-
     /// 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
@@ -86,25 +80,17 @@ impl Instance {
         create_dir_all(&self.base_directory)?;
         create_dir_all(&self.logs_directory)?;
 
-        // Modifying the genesis file so that we get our private key to control the other accounts.
         let mut genesis = serde_json::from_str::<Genesis>(&genesis)?;
-        for additional_caller in self.additional_callers.iter() {
-            let account = genesis.alloc.entry(*additional_caller).or_default();
-            account.private_key = Some(self.private_key.to_bytes());
-            *account = account
-                .clone()
-                .with_balance("1000000000000000000".parse().expect("Can't fail"));
+        for signer_address in
+            <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
+        {
+            genesis.alloc.entry(signer_address).or_insert(
+                GenesisAccount::default().with_balance(1000000000000000000u128.try_into().unwrap()),
+            );
         }
         let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
         serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;
 
-        for additional_caller in self.additional_callers.iter() {
-            self.wallet.register_signer(AddressSigner {
-                private_key: self.private_key.clone(),
-                address: *additional_caller,
-            });
-        }
-
         let mut child = Command::new(&self.geth)
             .arg("init")
             .arg("--datadir")
@@ -448,11 +434,19 @@ impl EthereumNode for Instance {
 }
 
 impl Node for Instance {
-    fn new(config: &Arguments, additional_callers: &[Address]) -> Self {
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> Self {
         let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
         let base_directory = geth_directory.join(id.to_string());
 
+        let mut wallet = config.wallet();
+        for signer in additional_signers {
+            wallet.register_signer(signer);
+        }
+
         Self {
             connection_string: base_directory.join(Self::IPC_FILE).display().to_string(),
             data_directory: base_directory.join(Self::DATA_DIRECTORY),
@@ -463,13 +457,11 @@ impl Node for Instance {
             handle: None,
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
-            wallet: config.wallet(),
+            wallet,
             // We know that we only need to be storing 2 files so we can specify that when creating
             // the vector. It's the stdout and stderr of the geth node.
             logs_file_to_flush: Vec::with_capacity(2),
             nonce_manager: Default::default(),
-            additional_callers: additional_callers.to_vec(),
-            private_key: config.signer(),
         }
     }
 
@@ -530,6 +522,8 @@ impl Drop for Instance {
 #[cfg(test)]
 mod tests {
     use revive_dt_config::Arguments;
+
+    use alloy::signers::local::PrivateKeySigner;
     use temp_dir::TempDir;
 
     use crate::{GENESIS_JSON, Node};
@@ -546,7 +540,7 @@ mod tests {
 
     fn new_node() -> (Instance, TempDir) {
         let (args, temp_dir) = test_config();
-        let mut node = Instance::new(&args, &[]);
+        let mut node = Instance::new(&args, Vec::<PrivateKeySigner>::with_capacity(0));
         node.init(GENESIS_JSON.to_owned())
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -556,21 +550,23 @@ mod tests {
 
     #[test]
     fn init_works() {
-        Instance::new(&test_config().0, &[])
+        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
             .init(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn spawn_works() {
-        Instance::new(&test_config().0, &[])
+        Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
             .spawn(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn version_works() {
-        let version = Instance::new(&test_config().0, &[]).version().unwrap();
+        let version = Instance::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0))
+            .version()
+            .unwrap();
         assert!(
             version.starts_with("geth version"),
             "expected version string, got: '{version}'"

crates/node/src/kitchensink.rs

@@ -10,10 +10,10 @@ use std::{
 use alloy::{
     consensus::{BlockHeader, TxEnvelope},
     eips::BlockNumberOrTag,
-    hex,
+    genesis::{Genesis, GenesisAccount},
     network::{
-        Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError,
-        UnbuiltTransactionError,
+        Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder,
+        TransactionBuilderError, TxSigner, UnbuiltTransactionError,
     },
     primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256},
     providers::{
@@ -26,6 +26,7 @@ use alloy::{
         eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
+    signers::Signature,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
@@ -123,7 +124,18 @@ impl KitchensinkNode {
                 None
             })
             .collect();
-        let mut eth_balances = self.extract_balance_from_genesis_file(genesis)?;
+        let mut eth_balances = {
+            let mut genesis = serde_json::from_str::<Genesis>(genesis)?;
+            for signer_address in
+                <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
+            {
+                genesis.alloc.entry(signer_address).or_insert(
+                    GenesisAccount::default()
+                        .with_balance(1000000000000000000u128.try_into().unwrap()),
+                );
+            }
+            self.extract_balance_from_genesis_file(&genesis)?
+        };
         merged_balances.append(&mut eth_balances);
 
         chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] =
@@ -237,42 +249,27 @@ impl KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn extract_balance_from_genesis_file(
         &self,
-        genesis_str: &str,
+        genesis: &Genesis,
     ) -> 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)
+        genesis
+            .alloc
+            .iter()
+            .try_fold(Vec::new(), |mut vec, (address, acc)| {
+                let substrate_address = Self::eth_to_substrate_address(address);
+                let balance = acc.balance.try_into()?;
+                vec.push((substrate_address, balance));
+                Ok(vec)
+            })
     }
 
-    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()
-            );
-        }
+    fn eth_to_substrate_address(address: &Address) -> String {
+        let eth_bytes = address.0.0;
 
         let mut padded = [0xEEu8; 32];
         padded[..20].copy_from_slice(&eth_bytes);
 
         let account_id = AccountId32::from(padded);
-        Ok(account_id.to_ss58check())
+        account_id.to_ss58check()
     }
 
     fn wait_ready(logs_file_path: &Path, marker: &str, timeout: Duration) -> anyhow::Result<()> {
@@ -507,18 +504,26 @@ impl EthereumNode for KitchensinkNode {
 }
 
 impl Node for KitchensinkNode {
-    fn new(config: &Arguments, _additional_callers: &[Address]) -> Self {
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> 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());
         let logs_directory = base_directory.join(Self::LOGS_DIRECTORY);
 
+        let mut wallet = config.wallet();
+        for signer in additional_signers {
+            wallet.register_signer(signer);
+        }
+
         Self {
             id,
             substrate_binary: config.kitchensink.clone(),
             eth_proxy_binary: config.eth_proxy.clone(),
             rpc_url: String::new(),
-            wallet: config.wallet(),
+            wallet,
             base_directory,
             logs_directory,
             process_substrate: None,
@@ -634,6 +639,12 @@ impl TransactionBuilder<KitchenSinkNetwork> for <Ethereum as Network>::Transacti
         )
     }
 
+    fn take_nonce(&mut self) -> Option<u64> {
+        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::take_nonce(
+            self,
+        )
+    }
+
     fn input(&self) -> Option<&alloy::primitives::Bytes> {
         <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::input(self)
     }
@@ -814,12 +825,6 @@ impl TransactionBuilder<KitchenSinkNetwork> for <Ethereum as Network>::Transacti
     > {
         Ok(wallet.sign_request(self).await?)
     }
-
-    fn take_nonce(&mut self) -> Option<u64> {
-        <<Ethereum as Network>::TransactionRequest as TransactionBuilder<Ethereum>>::take_nonce(
-            self,
-        )
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -1017,7 +1022,7 @@ impl BlockHeader for KitchenSinkHeader {
 
 #[cfg(test)]
 mod tests {
-    use alloy::rpc::types::TransactionRequest;
+    use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner};
     use revive_dt_config::Arguments;
     use std::path::PathBuf;
     use std::sync::{LazyLock, Mutex};
@@ -1060,7 +1065,7 @@ mod tests {
         let _guard = NODE_START_MUTEX.lock().unwrap();
 
         let (args, temp_dir) = test_config();
-        let mut node = KitchensinkNode::new(&args, &[]);
+        let mut node = KitchensinkNode::new(&args, Vec::<PrivateKeySigner>::with_capacity(0));
         node.init(GENESIS_JSON)
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -1115,7 +1120,8 @@ mod tests {
         }
         "#;
 
-        let mut dummy_node = KitchensinkNode::new(&test_config().0, &[]);
+        let mut dummy_node =
+            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));
 
         // Call `init()`
         dummy_node.init(genesis_content).expect("init failed");
@@ -1129,12 +1135,12 @@ mod tests {
         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();
+        let first_eth_addr = KitchensinkNode::eth_to_substrate_address(
+            &"90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap(),
+        );
+        let second_eth_addr = KitchensinkNode::eth_to_substrate_address(
+            &"Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2".parse().unwrap(),
+        );
 
         assert!(
             contents.contains(&first_eth_addr),
@@ -1159,10 +1165,11 @@ mod tests {
         }
         "#;
 
-        let node = KitchensinkNode::new(&test_config().0, &[]);
+        let node =
+            KitchensinkNode::new(&test_config().0, Vec::<PrivateKeySigner>::with_capacity(0));
 
         let result = node
-            .extract_balance_from_genesis_file(genesis_json)
+            .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
             .unwrap();
 
         let result_map: std::collections::HashMap<_, _> = result.into_iter().collect();
@@ -1192,7 +1199,7 @@ mod tests {
         ];
 
         for eth_addr in eth_addresses {
-            let ss58 = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
+            let ss58 = KitchensinkNode::eth_to_substrate_address(&eth_addr.parse().unwrap());
 
             println!("Ethereum: {eth_addr} -> Substrate SS58: {ss58}");
         }
@@ -1220,7 +1227,7 @@ mod tests {
         ];
 
         for (eth_addr, expected_ss58) in cases {
-            let result = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
+            let result = KitchensinkNode::eth_to_substrate_address(&eth_addr.parse().unwrap());
             assert_eq!(
                 result, expected_ss58,
                 "Mismatch for Ethereum address {eth_addr}"
@@ -1232,7 +1239,7 @@ mod tests {
     fn spawn_works() {
         let (config, _temp_dir) = test_config();
 
-        let mut node = KitchensinkNode::new(&config, &[]);
+        let mut node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
         node.spawn(GENESIS_JSON.to_string()).unwrap();
     }
 
@@ -1240,7 +1247,7 @@ mod tests {
     fn version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config, &[]);
+        let node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
         let version = node.version().unwrap();
 
         assert!(
@@ -1253,7 +1260,7 @@ mod tests {
     fn eth_rpc_version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config, &[]);
+        let node = KitchensinkNode::new(&config, Vec::<PrivateKeySigner>::with_capacity(0));
         let version = node.eth_rpc_version().unwrap();
 
         assert!(

crates/node/src/lib.rs

@@ -1,6 +1,6 @@
 //! This crate implements the testing nodes.
 
-use alloy::primitives::Address;
+use alloy::{network::TxSigner, signers::Signature};
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
@@ -15,7 +15,10 @@ pub const GENESIS_JSON: &str = include_str!("../../../genesis.json");
 /// An abstract interface for testing nodes.
 pub trait Node: EthereumNode {
     /// Create a new uninitialized instance.
-    fn new(config: &Arguments, additional_callers: &[Address]) -> Self;
+    fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    ) -> Self;
 
     /// Spawns a node configured according to the genesis json.
     ///

crates/node/src/pool.rs

@@ -6,7 +6,7 @@ use std::{
     thread,
 };
 
-use alloy::primitives::Address;
+use alloy::{network::TxSigner, signers::Signature};
 use anyhow::Context;
 use revive_dt_config::Arguments;
 
@@ -24,7 +24,14 @@ where
     T: Node + Send + 'static,
 {
     /// Create a new Pool. This will start as many nodes as there are workers in `config`.
-    pub fn new(config: &Arguments, additional_callers: &[Address]) -> anyhow::Result<Self> {
+    pub fn new(
+        config: &Arguments,
+        additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+        + Clone
+        + Send
+        + Sync
+        + 'static,
+    ) -> anyhow::Result<Self> {
         let nodes = config.workers;
         let genesis = read_to_string(&config.genesis_file).context(format!(
             "can not read genesis file: {}",
@@ -35,9 +42,9 @@ where
         for _ in 0..nodes {
             let config = config.clone();
             let genesis = genesis.clone();
-            let additional_callers = additional_callers.to_vec();
+            let additional_signers = additional_signers.clone();
             handles.push(thread::spawn(move || {
-                spawn_node::<T>(&config, genesis, &additional_callers)
+                spawn_node::<T>(&config, additional_signers, genesis)
             }));
         }
 
@@ -66,10 +73,10 @@ where
 
 fn spawn_node<T: Node + Send>(
     args: &Arguments,
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
     genesis: String,
-    additional_callers: &[Address],
 ) -> anyhow::Result<T> {
-    let mut node = T::new(args, additional_callers);
+    let mut node = T::new(args, additional_signers);
     tracing::info!("starting node: {}", node.connection_string());
     node.spawn(genesis)?;
     Ok(node)