Update the comment

Cargo.lock

@@ -346,7 +346,7 @@ dependencies = [
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.2",
+ "rand 0.9.1",
  "ruint",
  "rustc-hash",
  "serde",
@@ -3737,9 +3737,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 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.2",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde",

crates/config/src/lib.rs

@@ -73,12 +73,6 @@ pub struct Arguments {
     )]
     pub account: String,
 
-    /// This argument controls which private keys the nodes should have access to and be added to
-    /// its wallet signers. With a value of N, private keys (0, N] will be added to the signer set
-    /// of the node.
-    #[arg(long = "private-keys-count", default_value_t = 30)]
-    pub private_keys_to_add: usize,
-
     /// The differential testing leader node implementation.
     #[arg(short, long = "leader", default_value = "geth")]
     pub leader: TestingPlatform,
@@ -129,16 +123,18 @@ impl Arguments {
         panic!("should have a workdir configured")
     }
 
-    /// Try to parse `self.account` into a [PrivateKeySigner],
-    /// panicing on error.
-    pub fn wallet(&self) -> EthereumWallet {
-        let signer = self
-            .account
+    pub fn signer(&self) -> PrivateKeySigner {
+        self.account
             .parse::<PrivateKeySigner>()
             .unwrap_or_else(|error| {
                 panic!("private key '{}' parsing error: {error}", self.account);
-            });
-        EthereumWallet::new(signer)
+            })
+    }
+
+    /// Try to parse `self.account` into a [PrivateKeySigner],
+    /// panicing on error.
+    pub fn wallet(&self) -> EthereumWallet {
+        EthereumWallet::new(self.signer())
     }
 }
 

crates/core/src/driver/mod.rs

@@ -5,10 +5,10 @@ use std::marker::PhantomData;
 
 use alloy::json_abi::JsonAbi;
 use alloy::network::{Ethereum, TransactionBuilder};
+use alloy::primitives::Bytes;
 use alloy::rpc::types::TransactionReceipt;
 use alloy::rpc::types::trace::geth::{
-    CallFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace,
-    PreStateConfig,
+    DefaultFrame, GethDebugTracingOptions, GethDefaultTracingOptions, GethTrace, PreStateConfig,
 };
 use alloy::{
     primitives::Address,
@@ -25,7 +25,6 @@ use revive_dt_format::case::CaseIdx;
 use revive_dt_format::input::{Calldata, Expected, ExpectedOutput, Method};
 use revive_dt_format::metadata::{ContractInstance, ContractPathAndIdentifier};
 use revive_dt_format::{input::Input, metadata::Metadata, mode::SolcMode};
-use revive_dt_node::Node;
 use revive_dt_node_interaction::EthereumNode;
 use revive_dt_report::reporter::{CompilationTask, Report, Span};
 use revive_solc_json_interface::SolcStandardJsonOutput;
@@ -250,12 +249,6 @@ where
 
             let tx = {
                 let tx = TransactionRequest::default().from(input.caller);
-                let tx = match input.value {
-                    Some(ref value) if deploy_with_constructor_arguments => {
-                        tx.value(value.into_inner())
-                    }
-                    _ => tx,
-                };
                 TransactionBuilder::<Ethereum>::with_deploy_code(tx, code)
             };
 
@@ -372,7 +365,23 @@ where
         let _guard = span.enter();
 
         // Resolving the `input.expected` into a series of expectations that we can then assert on.
-        let mut expectations = match input {
+        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()]
+            }
             Input {
                 expected: Some(Expected::Calldata(calldata)),
                 ..
@@ -388,17 +397,6 @@ 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.
@@ -406,14 +404,12 @@ where
             .trace_transaction(
                 execution_receipt,
                 GethDebugTracingOptions {
-                    tracer: Some(GethDebugTracerType::BuiltInTracer(
-                        GethDebugBuiltInTracerType::CallTracer,
-                    )),
+                    config: GethDefaultTracingOptions::default().with_enable_return_data(true),
                     ..Default::default()
                 },
             )?
-            .try_into_call_frame()
-            .expect("Impossible - we requested a callframe trace so we must get it back");
+            .try_into_default_frame()
+            .expect("Impossible. We can't request default tracing and get some other type back");
 
         for expectation in expectations.iter() {
             self.handle_input_expectation_item(
@@ -434,21 +430,23 @@ where
         execution_receipt: &TransactionReceipt,
         node: &T::Blockchain,
         expectation: &ExpectedOutput,
-        tracing_result: &CallFrame,
+        tracing_result: &DefaultFrame,
     ) -> 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.
         // Additionally, what happens if the compiler filter doesn't match? Do we consider that the
         // transaction should succeed? Do we just ignore the expectation?
 
-        let deployed_contracts = self.deployed_contracts.entry(case_idx).or_default();
-        let chain_state_provider = node;
-
         // Handling the receipt state assertion.
         let expected = !expectation.exception;
         let actual = execution_receipt.status();
         if actual != expected {
-            tracing::error!(expected, actual, "Transaction status assertion failed",);
+            tracing::error!(
+                ?execution_receipt,
+                expected,
+                actual,
+                "Transaction status assertion failed",
+            );
             anyhow::bail!(
                 "Transaction status assertion failed - Expected {expected} but got {actual}",
             );
@@ -456,16 +454,13 @@ where
 
         // Handling the calldata assertion
         if let Some(ref expected_calldata) = expectation.return_data {
-            let expected = expected_calldata;
-            let actual = &tracing_result.output.as_ref().unwrap_or_default();
-            if !expected.is_equivalent(actual, deployed_contracts, chain_state_provider)? {
-                tracing::error!(
-                    ?execution_receipt,
-                    ?expected,
-                    %actual,
-                    "Calldata assertion failed"
-                );
-                anyhow::bail!("Calldata assertion failed - Expected {expected:?} but got {actual}",);
+            let expected = expected_calldata
+                .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)
+                .map(Bytes::from)?;
+            let actual = tracing_result.return_value.clone();
+            if !expected.starts_with(&actual) {
+                tracing::error!(?execution_receipt, %expected, %actual, "Calldata assertion failed");
+                anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",);
             }
         }
 
@@ -475,7 +470,12 @@ where
             let expected = expected_events.len();
             let actual = execution_receipt.logs().len();
             if actual != expected {
-                tracing::error!(expected, actual, "Event count assertion failed",);
+                tracing::error!(
+                    ?execution_receipt,
+                    expected,
+                    actual,
+                    "Event count assertion failed",
+                );
                 anyhow::bail!(
                     "Event count assertion failed - Expected {expected} but got {actual}",
                 );
@@ -491,6 +491,7 @@ where
                     let actual = actual_event.address();
                     if actual != expected {
                         tracing::error!(
+                            ?execution_receipt,
                             %expected,
                             %actual,
                             "Event emitter assertion failed",
@@ -502,34 +503,27 @@ where
                 }
 
                 // Handling the topics assertion.
-                for (expected, actual) in expected_event
-                    .topics
-                    .as_slice()
-                    .iter()
-                    .zip(actual_event.topics())
-                {
-                    let expected = Calldata::Compound(vec![expected.clone()]);
-                    if !expected.is_equivalent(
-                        &actual.0,
-                        deployed_contracts,
-                        chain_state_provider,
-                    )? {
-                        tracing::error!(
-                            ?execution_receipt,
-                            ?expected,
-                            ?actual,
-                            "Event topics assertion failed",
-                        );
-                        anyhow::bail!(
-                            "Event topics assertion failed - Expected {expected:?} but got {actual:?}",
-                        );
-                    }
+                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:?}",
+                    );
                 }
 
                 // Handling the values assertion.
-                let expected = &expected_event.values;
+                let expected = &expected_event
+                    .values
+                    .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)
+                    .map(Bytes::from)?;
                 let actual = &actual_event.data().data;
-                if !expected.is_equivalent(&actual.0, deployed_contracts, chain_state_provider)? {
+                if !expected.starts_with(actual) {
                     tracing::error!(
                         ?execution_receipt,
                         ?expected,
@@ -649,22 +643,6 @@ where
         let tracing_span = tracing::info_span!("Handling metadata file");
         let _guard = tracing_span.enter();
 
-        // We only execute this input if it's valid for the leader and the follower. Otherwise, we
-        // skip it with a warning.
-        if !self
-            .leader_node
-            .matches_target(self.metadata.targets.as_deref())
-            || !self
-                .follower_node
-                .matches_target(self.metadata.targets.as_deref())
-        {
-            tracing::warn!(
-                targets = ?self.metadata.targets,
-                "Either the leader or follower node do not support the targets of the file"
-            );
-            return execution_result;
-        }
-
         for mode in self.metadata.solc_modes() {
             let tracing_span = tracing::info_span!("With solc mode", solc_mode = ?mode);
             let _guard = tracing_span.enter();
@@ -708,7 +686,6 @@ 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/lib.rs

@@ -5,7 +5,7 @@
 
 use revive_dt_compiler::{SolidityCompiler, revive_resolc, solc};
 use revive_dt_config::TestingPlatform;
-use revive_dt_node::{Node, geth, kitchensink::KitchensinkNode};
+use revive_dt_node::{geth, kitchensink::KitchensinkNode};
 use revive_dt_node_interaction::EthereumNode;
 
 pub mod common;
@@ -15,7 +15,7 @@ pub mod driver;
 ///
 /// For this we need a blockchain node implementation and a compiler.
 pub trait Platform {
-    type Blockchain: EthereumNode + Node;
+    type Blockchain: EthereumNode;
     type Compiler: SolidityCompiler;
 
     /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].

crates/core/src/main.rs

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, sync::LazyLock};
 
+use alloy::primitives::Address;
 use clap::Parser;
 use rayon::{ThreadPoolBuilder, prelude::*};
 
@@ -8,7 +9,7 @@ use revive_dt_core::{
     Geth, Kitchensink, Platform,
     driver::{Driver, State},
 };
-use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
+use revive_dt_format::{corpus::Corpus, input::default_caller, metadata::MetadataFile};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
@@ -20,12 +21,24 @@ 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<_>>();
+
+    tracing::debug!(?additional_callers, "Discovered callers");
+
     for (corpus, tests) in collect_corpora(&args)? {
         let span = Span::new(corpus, args.clone())?;
 
         match &args.compile_only {
             Some(platform) => compile_corpus(&args, &tests, platform, span),
-            None => execute_corpus(&args, &tests, span)?,
+            None => execute_corpus(&args, &tests, &additional_callers, span)?,
         }
 
         Report::save()?;
@@ -83,15 +96,20 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metad
     Ok(corpora)
 }
 
-fn run_driver<L, F>(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()>
+fn run_driver<L, F>(
+    args: &Arguments,
+    tests: &[MetadataFile],
+    additional_callers: &[Address],
+    span: Span,
+) -> anyhow::Result<()>
 where
     L: Platform,
     F: Platform,
     L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
     F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    let leader_nodes = NodePool::<L::Blockchain>::new(args)?;
-    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
+    let leader_nodes = NodePool::<L::Blockchain>::new(args, additional_callers)?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_callers)?;
 
     tests.par_iter().for_each(
         |MetadataFile {
@@ -141,13 +159,18 @@ where
     Ok(())
 }
 
-fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> {
+fn execute_corpus(
+    args: &Arguments,
+    tests: &[MetadataFile],
+    additional_callers: &[Address],
+    span: Span,
+) -> anyhow::Result<()> {
     match (&args.leader, &args.follower) {
         (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, span)?
+            run_driver::<Geth, Kitchensink>(args, tests, additional_callers, span)?
         }
         (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span)?
+            run_driver::<Geth, Geth>(args, tests, additional_callers, span)?
         }
         _ => unimplemented!(),
     }

crates/format/src/case.rs

@@ -16,6 +16,12 @@ 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();
@@ -25,15 +31,7 @@ impl Case {
             .enumerate()
             .map(move |(idx, mut input)| {
                 if idx + 1 == inputs_len {
-                    if input.expected.is_none() {
-                        input.expected = self.expected.clone();
-                    }
-
-                    // TODO: What does it mean for us to have an `expected` field on the case itself
-                    // but the final input also has an expected field that doesn't match the one on
-                    // the case? What are we supposed to do with that final expected field on the
-                    // case?
-
+                    input.expected = self.expected.clone();
                     input
                 } else {
                     input
@@ -41,9 +39,3 @@ impl Case {
             })
     }
 }
-
-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::{FixedBytes, utils::parse_units};
+use alloy_primitives::B256;
 use semver::VersionReq;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revive_dt_node_interaction::EthereumNode;
 
-use crate::{define_wrapper_type, metadata::ContractInstance};
+use crate::metadata::ContractInstance;
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
@@ -26,7 +26,7 @@ pub struct Input {
     #[serde(default)]
     pub calldata: Calldata,
     pub expected: Option<Expected>,
-    pub value: Option<EtherValue>,
+    pub value: Option<String>,
     pub storage: Option<HashMap<String, Calldata>>,
 }
 
@@ -50,14 +50,14 @@ pub struct ExpectedOutput {
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Event {
     pub address: Option<Address>,
-    pub topics: Vec<String>,
+    pub topics: Vec<B256>,
     pub values: Calldata,
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Calldata {
-    Single(Bytes),
+    Single(String),
     Compound(Vec<String>),
 }
 
@@ -82,37 +82,6 @@ pub enum Method {
     FunctionName(String),
 }
 
-define_wrapper_type!(
-    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    EtherValue(U256);
-);
-
-impl Serialize for EtherValue {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        format!("{} wei", self.0).serialize(serializer)
-    }
-}
-
-impl<'de> Deserialize<'de> for EtherValue {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let string = String::deserialize(deserializer)?;
-        let mut splitted = string.split(' ');
-        let (Some(value), Some(unit)) = (splitted.next(), splitted.next()) else {
-            return Err(serde::de::Error::custom("Failed to parse the value"));
-        };
-        let parsed = parse_units(value, unit.replace("eth", "ether"))
-            .map_err(|_| serde::de::Error::custom("Failed to parse units"))?
-            .into();
-        Ok(Self(parsed))
-    }
-}
-
 impl ExpectedOutput {
     pub fn new() -> Self {
         Default::default()
@@ -168,8 +137,8 @@ impl Calldata {
         chain_state_provider: &impl EthereumNode,
     ) -> anyhow::Result<()> {
         match self {
-            Calldata::Single(bytes) => {
-                buffer.extend_from_slice(bytes);
+            Calldata::Single(string) => {
+                alloy::hex::decode_to_slice(string, buffer)?;
             }
             Calldata::Compound(items) => {
                 for (arg_idx, arg) in items.iter().enumerate() {
@@ -190,48 +159,10 @@ impl Calldata {
 
     pub fn size_requirement(&self) -> usize {
         match self {
-            Calldata::Single(single) => single.len(),
+            Calldata::Single(single) => (single.len() - 2) / 2,
             Calldata::Compound(items) => items.len() * 32,
         }
     }
-
-    /// Checks if this [`Calldata`] is equivalent to the passed calldata bytes.
-    pub fn is_equivalent(
-        &self,
-        other: &[u8],
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl EthereumNode,
-    ) -> anyhow::Result<bool> {
-        match self {
-            Calldata::Single(calldata) => Ok(calldata == other),
-            Calldata::Compound(items) => {
-                // Chunking the "other" calldata into 32 byte chunks since each
-                // one of the items in the compound calldata represents 32 bytes
-                for (this, other) in items.iter().zip(other.chunks(32)) {
-                    // The matterlabs format supports wildcards and therefore we
-                    // also need to support them.
-                    if this == "*" {
-                        continue;
-                    }
-
-                    let other = if other.len() < 32 {
-                        let mut vec = other.to_vec();
-                        vec.resize(32, 0);
-                        std::borrow::Cow::Owned(vec)
-                    } else {
-                        std::borrow::Cow::Borrowed(other)
-                    };
-
-                    let this = resolve_argument(this, deployed_contracts, chain_state_provider)?;
-                    let other = U256::from_be_slice(&other);
-                    if this != other {
-                        return Ok(false);
-                    }
-                }
-                Ok(true)
-            }
-        }
-    }
 }
 
 impl Input {
@@ -319,11 +250,7 @@ impl Input {
         chain_state_provider: &impl EthereumNode,
     ) -> anyhow::Result<TransactionRequest> {
         let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?;
-        let transaction_request = TransactionRequest::default().from(self.caller).value(
-            self.value
-                .map(|value| value.into_inner())
-                .unwrap_or_default(),
-        );
+        let transaction_request = TransactionRequest::default();
         match self.method {
             Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
             _ => Ok(transaction_request
@@ -342,14 +269,12 @@ impl Input {
     }
 }
 
-fn default_instance() -> ContractInstance {
+pub fn default_instance() -> ContractInstance {
     ContractInstance::new_from("Test")
 }
 
-pub const fn default_caller() -> Address {
-    Address(FixedBytes(alloy::hex!(
-        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
-    )))
+pub fn default_caller() -> Address {
+    "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap()
 }
 
 /// This function takes in the string calldata argument provided in the JSON input and resolves it
@@ -537,7 +462,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"}],
@@ -558,8 +483,8 @@ mod tests {
             .0;
 
         let input: Input = Input {
-            instance: "Contract".to_owned().into(),
-            method: Method::FunctionName("send(address)".to_owned()),
+            instance: ContractInstance::new_from("Contract"),
+            method: Method::FunctionName("send".to_owned()),
             calldata: Calldata::Compound(vec![
                 "0x1000000000000000000000000000000000000001".to_string(),
             ]),
@@ -584,7 +509,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"}],
@@ -606,7 +531,7 @@ mod tests {
 
         let input: Input = Input {
             instance: ContractInstance::new_from("Contract"),
-            method: Method::FunctionName("send".to_owned()),
+            method: Method::FunctionName("send(address)".to_owned()),
             calldata: Calldata::Compound(vec![
                 "0x1000000000000000000000000000000000000001".to_string(),
             ]),

crates/format/src/metadata.rs

@@ -44,7 +44,6 @@ impl Deref for MetadataFile {
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
-    pub targets: Option<Vec<String>>,
     pub cases: Vec<Case>,
     pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdentifier>>,
     // TODO: Convert into wrapper types for clarity.

crates/node-interaction/src/blocking_executor.rs

@@ -9,7 +9,6 @@ use tokio::{
     runtime::Builder,
     sync::{mpsc::UnboundedSender, oneshot},
 };
-use tracing::Instrument;
 
 /// A blocking async executor.
 ///
@@ -64,11 +63,6 @@ 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()
@@ -113,9 +107,7 @@ 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> }.in_current_span(),
-        );
+        let future = Box::pin(async move { Box::new(future.await) as Box<dyn Any + Send> });
 
         let task = TaskMessage::new(future, response_tx);
         if let Err(error) = STATE.tx.send(task) {

crates/node/src/common.rs

@@ -1,9 +1,14 @@
+use ::core::pin::Pin;
+
 use alloy::{
-    network::{Network, TransactionBuilder},
+    consensus::SignableTransaction,
+    network::{Network, TransactionBuilder, TxSigner},
+    primitives::Address,
     providers::{
         Provider, SendableTx,
         fillers::{GasFiller, TxFiller},
     },
+    signers::{Signature, local::PrivateKeySigner},
     transports::TransportResult,
 };
 
@@ -76,3 +81,28 @@ 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/constants.rs

@@ -1,5 +0,0 @@
-/// This constant defines how much Wei accounts are pre-seeded with in genesis.
-///
-/// We use [`u128::MAX`] here which means that accounts will be given 2^128 - 1 WEI which is
-/// (2^128 - 1) / 10^18 ETH.
-pub const INITIAL_BALANCE: u128 = u128::MAX;

crates/node/src/geth.rs

@@ -11,9 +11,9 @@ use std::{
 
 use alloy::{
     eips::BlockNumberOrTag,
-    genesis::{Genesis, GenesisAccount},
-    network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256},
+    genesis::Genesis,
+    network::{Ethereum, EthereumWallet},
+    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
@@ -29,7 +29,10 @@ use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 use tracing::Level;
 
-use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
+use crate::{
+    Node,
+    common::{AddressSigner, FallbackGasFiller},
+};
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -52,7 +55,10 @@ 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
@@ -80,18 +86,25 @@ 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 signer_address in
-            <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
-        {
-            genesis
-                .alloc
-                .entry(signer_address)
-                .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
+        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"));
         }
         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")
@@ -435,20 +448,11 @@ impl EthereumNode for Instance {
 }
 
 impl Node for Instance {
-    fn new(config: &Arguments) -> Self {
+    fn new(config: &Arguments, additional_callers: &[Address]) -> Self {
         let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
         let base_directory = geth_directory.join(id.to_string());
 
-        let mut wallet = config.wallet();
-        for signer in (1..=config.private_keys_to_add)
-            .map(|id| U256::from(id))
-            .map(|id| id.to_be_bytes::<32>())
-            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
-        {
-            wallet.register_signer(signer);
-        }
-
         Self {
             connection_string: base_directory.join(Self::IPC_FILE).display().to_string(),
             data_directory: base_directory.join(Self::DATA_DIRECTORY),
@@ -459,11 +463,13 @@ impl Node for Instance {
             handle: None,
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
-            wallet,
+            wallet: config.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(),
         }
     }
 
@@ -512,14 +518,6 @@ impl Node for Instance {
             .stdout;
         Ok(String::from_utf8_lossy(&output).into())
     }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn matches_target(&self, targets: Option<&[String]>) -> bool {
-        match targets {
-            None => true,
-            Some(targets) => targets.iter().any(|str| str.as_str() == "evm"),
-        }
-    }
 }
 
 impl Drop for Instance {
@@ -532,7 +530,6 @@ impl Drop for Instance {
 #[cfg(test)]
 mod tests {
     use revive_dt_config::Arguments;
-
     use temp_dir::TempDir;
 
     use crate::{GENESIS_JSON, Node};
@@ -549,7 +546,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, &[]);
         node.init(GENESIS_JSON.to_owned())
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -559,21 +556,21 @@ mod tests {
 
     #[test]
     fn init_works() {
-        Instance::new(&test_config().0)
+        Instance::new(&test_config().0, &[])
             .init(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn spawn_works() {
-        Instance::new(&test_config().0)
+        Instance::new(&test_config().0, &[])
             .spawn(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn version_works() {
-        let version = Instance::new(&test_config().0).version().unwrap();
+        let version = Instance::new(&test_config().0, &[]).version().unwrap();
         assert!(
             version.starts_with("geth version"),
             "expected version string, got: '{version}'"

crates/node/src/kitchensink.rs

@@ -10,14 +10,12 @@ use std::{
 use alloy::{
     consensus::{BlockHeader, TxEnvelope},
     eips::BlockNumberOrTag,
-    genesis::{Genesis, GenesisAccount},
+    hex,
     network::{
-        Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder,
-        TransactionBuilderError, UnbuiltTransactionError,
-    },
-    primitives::{
-        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256,
+        Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError,
+        UnbuiltTransactionError,
     },
+    primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
@@ -28,7 +26,6 @@ use alloy::{
         eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
-    signers::local::PrivateKeySigner,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
@@ -39,7 +36,7 @@ use tracing::Level;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 
-use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
+use crate::{Node, common::FallbackGasFiller};
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -126,18 +123,7 @@ impl KitchensinkNode {
                 None
             })
             .collect();
-        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(U256::from(INITIAL_BALANCE)));
-            }
-            self.extract_balance_from_genesis_file(&genesis)?
-        };
+        let mut eth_balances = self.extract_balance_from_genesis_file(genesis)?;
         merged_balances.append(&mut eth_balances);
 
         chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] =
@@ -251,27 +237,42 @@ impl KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn extract_balance_from_genesis_file(
         &self,
-        genesis: &Genesis,
+        genesis_str: &str,
     ) -> anyhow::Result<Vec<(String, u128)>> {
-        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)
-            })
+        let genesis_json: JsonValue = serde_json::from_str(genesis_str)?;
+        let alloc = genesis_json
+            .get("alloc")
+            .and_then(|a| a.as_object())
+            .ok_or_else(|| anyhow::anyhow!("Missing 'alloc' in genesis"))?;
+
+        let mut balances = Vec::new();
+        for (eth_addr, obj) in alloc.iter() {
+            let balance_str = obj.get("balance").and_then(|b| b.as_str()).unwrap_or("0");
+            let balance = if balance_str.starts_with("0x") {
+                u128::from_str_radix(balance_str.trim_start_matches("0x"), 16)?
+            } else {
+                balance_str.parse::<u128>()?
+            };
+            let substrate_addr = Self::eth_to_substrate_address(eth_addr)?;
+            balances.push((substrate_addr.clone(), balance));
+        }
+        Ok(balances)
     }
 
-    fn eth_to_substrate_address(address: &Address) -> String {
-        let eth_bytes = address.0.0;
+    fn eth_to_substrate_address(eth_addr: &str) -> anyhow::Result<String> {
+        let eth_bytes = hex::decode(eth_addr.trim_start_matches("0x"))?;
+        if eth_bytes.len() != 20 {
+            anyhow::bail!(
+                "Invalid Ethereum address length: expected 20 bytes, got {}",
+                eth_bytes.len()
+            );
+        }
 
         let mut padded = [0xEEu8; 32];
         padded[..20].copy_from_slice(&eth_bytes);
 
         let account_id = AccountId32::from(padded);
-        account_id.to_ss58check()
+        Ok(account_id.to_ss58check())
     }
 
     fn wait_ready(logs_file_path: &Path, marker: &str, timeout: Duration) -> anyhow::Result<()> {
@@ -506,27 +507,18 @@ impl EthereumNode for KitchensinkNode {
 }
 
 impl Node for KitchensinkNode {
-    fn new(config: &Arguments) -> Self {
+    fn new(config: &Arguments, _additional_callers: &[Address]) -> 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 (1..=config.private_keys_to_add)
-            .map(|id| U256::from(id))
-            .map(|id| id.to_be_bytes::<32>())
-            .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap())
-        {
-            wallet.register_signer(signer);
-        }
-
         Self {
             id,
             substrate_binary: config.kitchensink.clone(),
             eth_proxy_binary: config.eth_proxy.clone(),
             rpc_url: String::new(),
-            wallet,
+            wallet: config.wallet(),
             base_directory,
             logs_directory,
             process_substrate: None,
@@ -587,14 +579,6 @@ impl Node for KitchensinkNode {
             .stdout;
         Ok(String::from_utf8_lossy(&output).into())
     }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn matches_target(&self, targets: Option<&[String]>) -> bool {
-        match targets {
-            None => true,
-            Some(targets) => targets.iter().any(|str| str.as_str() == "pvm"),
-        }
-    }
 }
 
 impl Drop for KitchensinkNode {
@@ -650,12 +634,6 @@ 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)
     }
@@ -836,6 +814,12 @@ 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)]
@@ -1076,7 +1060,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, &[]);
         node.init(GENESIS_JSON)
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -1131,7 +1115,7 @@ mod tests {
         }
         "#;
 
-        let mut dummy_node = KitchensinkNode::new(&test_config().0);
+        let mut dummy_node = KitchensinkNode::new(&test_config().0, &[]);
 
         // Call `init()`
         dummy_node.init(genesis_content).expect("init failed");
@@ -1145,12 +1129,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".parse().unwrap(),
-        );
-        let second_eth_addr = KitchensinkNode::eth_to_substrate_address(
-            &"Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2".parse().unwrap(),
-        );
+        let first_eth_addr =
+            KitchensinkNode::eth_to_substrate_address("90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+                .unwrap();
+        let second_eth_addr =
+            KitchensinkNode::eth_to_substrate_address("Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2")
+                .unwrap();
 
         assert!(
             contents.contains(&first_eth_addr),
@@ -1175,10 +1159,10 @@ mod tests {
         }
         "#;
 
-        let node = KitchensinkNode::new(&test_config().0);
+        let node = KitchensinkNode::new(&test_config().0, &[]);
 
         let result = node
-            .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
+            .extract_balance_from_genesis_file(genesis_json)
             .unwrap();
 
         let result_map: std::collections::HashMap<_, _> = result.into_iter().collect();
@@ -1208,7 +1192,7 @@ mod tests {
         ];
 
         for eth_addr in eth_addresses {
-            let ss58 = KitchensinkNode::eth_to_substrate_address(&eth_addr.parse().unwrap());
+            let ss58 = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
 
             println!("Ethereum: {eth_addr} -> Substrate SS58: {ss58}");
         }
@@ -1236,7 +1220,7 @@ mod tests {
         ];
 
         for (eth_addr, expected_ss58) in cases {
-            let result = KitchensinkNode::eth_to_substrate_address(&eth_addr.parse().unwrap());
+            let result = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap();
             assert_eq!(
                 result, expected_ss58,
                 "Mismatch for Ethereum address {eth_addr}"
@@ -1248,7 +1232,7 @@ mod tests {
     fn spawn_works() {
         let (config, _temp_dir) = test_config();
 
-        let mut node = KitchensinkNode::new(&config);
+        let mut node = KitchensinkNode::new(&config, &[]);
         node.spawn(GENESIS_JSON.to_string()).unwrap();
     }
 
@@ -1256,7 +1240,7 @@ mod tests {
     fn version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config);
+        let node = KitchensinkNode::new(&config, &[]);
         let version = node.version().unwrap();
 
         assert!(
@@ -1269,7 +1253,7 @@ mod tests {
     fn eth_rpc_version_works() {
         let (config, _temp_dir) = test_config();
 
-        let node = KitchensinkNode::new(&config);
+        let node = KitchensinkNode::new(&config, &[]);
         let version = node.eth_rpc_version().unwrap();
 
         assert!(

crates/node/src/lib.rs

@@ -1,10 +1,10 @@
 //! This crate implements the testing nodes.
 
+use alloy::primitives::Address;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
 pub mod common;
-pub mod constants;
 pub mod geth;
 pub mod kitchensink;
 pub mod pool;
@@ -15,7 +15,7 @@ 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) -> Self;
+    fn new(config: &Arguments, additional_callers: &[Address]) -> Self;
 
     /// Spawns a node configured according to the genesis json.
     ///
@@ -32,8 +32,4 @@ pub trait Node: EthereumNode {
 
     /// Returns the node version.
     fn version(&self) -> anyhow::Result<String>;
-
-    /// Given a list of targets from the metadata file, this function determines if the metadata
-    /// file can be ran on this node or not.
-    fn matches_target(&self, targets: Option<&[String]>) -> bool;
 }

crates/node/src/pool.rs

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

genesis.json

@@ -35,7 +35,7 @@
     "timestamp": "0x00",
     "alloc": {
         "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": {
-            "balance": "10000000000000000000000"
+            "balance": "1000000000000000000"
         }
     }
 }