Handle values from the metadata files

Improvements and fixes to nonce allocation

Cargo.lock

@@ -67,9 +67,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae58d888221eecf621595e2096836ce7cfc37be06bfa39d7f64aa6a3ea4c9e5b"
+checksum = "8ad4eb51e7845257b70c51b38ef8d842d5e5e93196701fcbd757577971a043c6"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -102,15 +102,16 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad451f9a70c341d951bca4e811d74dbe1e193897acd17e9dbac1353698cc430b"
+checksum = "ca3b746060277f3d7f9c36903bb39b593a741cb7afcb0044164c28f0e9b673f0"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
  "alloy-trie",
+ "alloy-tx-macros",
  "auto_impl",
  "c-kzg",
  "derive_more 2.0.1",
@@ -126,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142daffb15d5be1a2b20d2cd540edbcef03037b55d4ff69dc06beb4d06286dba"
+checksum = "bf98679329fa708fa809ea596db6d974da892b068ad45e48ac1956f582edf946"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -140,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebf25443920ecb9728cb087fe4dc04a0b290bd6ac85638c58fe94aba70f1a44e"
+checksum = "a10e47f5305ea08c37b1772086c1573e9a0a257227143996841172d37d3831bb"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -157,6 +158,7 @@ dependencies = [
  "alloy-transport",
  "futures",
  "futures-util",
+ "serde_json",
  "thiserror 2.0.12",
 ]
 
@@ -227,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d"
+checksum = "f562a81278a3ed83290e68361f2d1c75d018ae3b8589a314faf9303883e18ec9"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -247,15 +249,16 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
+checksum = "dc41384e9ab8c9b2fb387c52774d9d432656a28edcda1c2d4083e96051524518"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-serde",
  "alloy-trie",
  "serde",
+ "serde_with",
 ]
 
 [[package]]
@@ -272,12 +275,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc08b31ebf9273839bd9a01f9333cbb7a3abb4e820c312ade349dd18bdc79581"
+checksum = "12c454fcfcd5d26ed3b8cae5933cbee9da5f0b05df19b46d4bd4446d1f082565"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
+ "http",
  "serde",
  "serde_json",
  "thiserror 2.0.12",
@@ -286,9 +290,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed117b08f0cc190312bf0c38c34cf4f0dabfb4ea8f330071c587cd7160a88cb2"
+checksum = "42d6d39eabe5c7b3d8f23ac47b0b683b99faa4359797114636c66e0743103d05"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -312,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7162ff7be8649c0c391f4e248d1273e85c62076703a1f3ec7daf76b283d886d"
+checksum = "3704fa8b7ba9ba3f378d99b3d628c8bc8c2fc431b709947930f154e22a8368b6"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -342,7 +346,7 @@ dependencies = [
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ruint",
  "rustc-hash",
  "serde",
@@ -352,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84eba1fd8b6fe8b02f2acd5dd7033d0f179e304bd722d11e817db570d1fa6c4"
+checksum = "08800e8cbe70c19e2eb7cf3d7ff4b28bdd9b3933f8e1c8136c7d910617ba03bf"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -380,6 +384,7 @@ dependencies = [
  "either",
  "futures",
  "futures-utils-wasm",
+ "http",
  "lru",
  "parking_lot",
  "pin-project",
@@ -395,9 +400,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8550f7306e0230fc835eb2ff4af0a96362db4b6fc3f25767d161e0ad0ac765bf"
+checksum = "ae68457a2c2ead6bd7d7acb5bf5f1623324b1962d4f8e7b0250657a3c3ab0a0b"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -438,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518a699422a3eab800f3dac2130d8f2edba8e4fff267b27a9c7dc6a2b0d313ee"
+checksum = "162301b5a57d4d8f000bf30f4dcb82f9f468f3e5e846eeb8598dd39e7886932c"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -448,7 +453,6 @@ dependencies = [
  "alloy-transport",
  "alloy-transport-http",
  "alloy-transport-ipc",
- "async-stream",
  "futures",
  "pin-project",
  "reqwest",
@@ -458,16 +462,15 @@ dependencies = [
  "tokio-stream",
  "tower",
  "tracing",
- "tracing-futures",
  "url",
  "wasmtimer",
 ]
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c000cab4ec26a4b3e29d144e999e1c539c2fa0abed871bf90311eb3466187ca8"
+checksum = "6cd8ca94ae7e2b32cc3895d9981f3772aab0b4756aa60e9ed0bcfee50f0e1328"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -478,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508b2fbe66d952089aa694e53802327798806498cd29ff88c75135770ecaabfc"
+checksum = "076b47e834b367d8618c52dd0a0d6a711ddf66154636df394805300af4923b8a"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -489,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c832f2e851801093928dbb4b7bd83cd22270faf76b2e080646b806a285c8757"
+checksum = "94a2a86ad7b7d718c15e79d0779bd255561b6b22968dc5ed2e7c0fbc43bb55fe"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -499,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcaf7dff0fdd756a714d58014f4f8354a1706ebf9fa2cf73431e0aeec3c9431e"
+checksum = "2c2f847e635ec0be819d06e2ada4bcc4e4204026a83c4bfd78ae8d550e027ae7"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -514,14 +517,15 @@ dependencies = [
  "itertools 0.14.0",
  "serde",
  "serde_json",
+ "serde_with",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3507a04e868dd83219ad3cd6a8c58aefccb64d33f426b3934423a206343e84"
+checksum = "6fc58180302a94c934d455eeedb3ecb99cdc93da1dbddcdbbdb79dd6fe618b2a"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -533,9 +537,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
+checksum = "ae699248d02ade9db493bbdae61822277dc14ae0f82a5a4153203b60e34422a6"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -544,9 +548,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d2428445ec13edc711909e023d7779618504c4800be055a5b940025dbafe3"
+checksum = "3cf7d793c813515e2b627b19a15693960b3ed06670f9f66759396d06ebe5747b"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -559,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14fe6fedb7fe6e0dfae47fe020684f1d8e063274ef14bca387ddb7a6efa8ec1"
+checksum = "51a424bc5a11df0d898ce0fd15906b88ebe2a6e4f17a514b51bc93946bb756bd"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -648,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a712bdfeff42401a7dd9518f72f617574c36226a9b5414537fedc34350b73bf9"
+checksum = "4f317d20f047b3de4d9728c556e2e9a92c9a507702d2016424cd8be13a74ca5e"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -671,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea5a76d7f2572174a382aedf36875bedf60bcc41116c9f031cf08040703a2dc"
+checksum = "ff084ac7b1f318c87b579d221f11b748341d68b9ddaa4ffca5e62ed2b8cfefb4"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -686,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.9"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606af17a7e064d219746f6d2625676122c79d78bf73dfe746d6db9ecd7dbcb85"
+checksum = "edb099cdad8ed2e6a80811cdf9bbf715ebf4e34c981b4a6e2d1f9daacbf8b218"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -706,9 +710,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
+checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -720,6 +724,19 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "alloy-tx-macros"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1154c8187a5ff985c95a8b2daa2fedcf778b17d7668e5e50e556c4ff9c881154"
+dependencies = [
+ "alloy-primitives",
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -3268,13 +3285,14 @@ dependencies = [
 
 [[package]]
 name = "nybbles"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307"
+checksum = "675b3a54e5b12af997abc8b6638b0aee51a28caedab70d4967e0d5db3a3f1d06"
 dependencies = [
  "alloy-rlp",
- "const-hex",
+ "cfg-if",
  "proptest",
+ "ruint",
  "serde",
  "smallvec",
 ]
@@ -3719,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",
@@ -4113,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",
@@ -5489,18 +5507,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "futures",
- "futures-task",
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"

Cargo.toml

@@ -59,7 +59,7 @@ revive-common = { git = "https://github.com/paritytech/revive", rev = "3389865af
 revive-differential = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
 
 [workspace.dependencies.alloy]
-version = "1.0"
+version = "1.0.22"
 default-features = false
 features = [
     "json-abi",
@@ -73,6 +73,7 @@ features = [
     "network",
     "serde",
     "rpc-types-eth",
+    "genesis",
 ]
 
 [profile.bench]

crates/core/src/driver/mod.rs

@@ -5,8 +5,12 @@ 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::GethTrace;
+use alloy::rpc::types::trace::geth::{
+    CallFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace,
+    PreStateConfig,
+};
 use alloy::{
     primitives::Address,
     rpc::types::{
@@ -19,9 +23,10 @@ use indexmap::IndexMap;
 use revive_dt_compiler::{Compiler, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_dt_format::case::CaseIdx;
-use revive_dt_format::input::Method;
+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;
@@ -145,7 +150,10 @@ where
     ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
         let deployment_receipts =
             self.handle_contract_deployment(metadata, case_idx, input, node)?;
-        self.handle_input_execution(case_idx, input, deployment_receipts, node)
+        let execution_receipt =
+            self.handle_input_execution(case_idx, input, deployment_receipts, node)?;
+        self.handle_input_expectations(case_idx, input, &execution_receipt, node)?;
+        self.handle_input_diff(case_idx, execution_receipt, node)
     }
 
     /// Handles the contract deployment for a given input performing it if it needs to be performed.
@@ -243,6 +251,12 @@ 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)
             };
 
@@ -308,18 +322,15 @@ where
         &mut self,
         case_idx: CaseIdx,
         input: &Input,
-        deployment_receipts: HashMap<ContractInstance, TransactionReceipt>,
+        mut deployment_receipts: HashMap<ContractInstance, TransactionReceipt>,
         node: &T::Blockchain,
-    ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
+    ) -> anyhow::Result<TransactionReceipt> {
-        tracing::trace!("Calling execute_input for input: {input:?}");
+        match input.method {
-
-        let receipt = match input.method {
             // This input was already executed when `handle_input` was called. We just need to
             // lookup the transaction receipt in this case and continue on.
             Method::Deployer => deployment_receipts
-                .get(&input.instance)
+                .remove(&input.instance)
-                .context("Failed to find deployment receipt")?
+                .context("Failed to find deployment receipt"),
-                .clone(),
             Method::Fallback | Method::FunctionName(_) => {
                 let tx = match input
                     .legacy_transaction(self.deployed_contracts.entry(case_idx).or_default(), node)
@@ -337,35 +348,217 @@ where
                 tracing::trace!("Executing transaction for input: {input:?}");
 
                 match node.execute_transaction(tx) {
-                    Ok(receipt) => receipt,
+                    Ok(receipt) => Ok(receipt),
                     Err(err) => {
                         tracing::error!(
                             "Failed to execute transaction when executing the contract: {}, {:?}",
                             &*input.instance,
                             err
                         );
-                        return Err(err);
+                        Err(err)
                     }
                 }
             }
+        }
+    }
+
+    fn handle_input_expectations(
+        &mut self,
+        case_idx: CaseIdx,
+        input: &Input,
+        execution_receipt: &TransactionReceipt,
+        node: &T::Blockchain,
+    ) -> anyhow::Result<()> {
+        let span = tracing::info_span!("Handling input expectations");
+        let _guard = span.enter();
+
+        // Resolving the `input.expected` into a series of expectations that we can then assert on.
+        let mut expectations = match input {
+            Input {
+                expected: Some(Expected::Calldata(calldata)),
+                ..
+            } => vec![ExpectedOutput::new().with_calldata(calldata.clone())],
+            Input {
+                expected: Some(Expected::Expected(expected)),
+                ..
+            } => vec![expected.clone()],
+            Input {
+                expected: Some(Expected::ExpectedMany(expected)),
+                ..
+            } => expected.clone(),
+            Input { expected: None, .. } => vec![ExpectedOutput::new().with_success()],
         };
 
-        tracing::trace!(
+        // This is a bit of a special case and we have to support it separately on it's own. If it's
-            "Transaction receipt for executed contract: {} - {:?}",
+        // a call to the deployer method, then the tests will assert that it "returns" the address
-            &*input.instance,
+        // of the contract. Deployments do not return the address of the contract but the runtime
-            receipt,
+        // 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.
+        let tracing_result = node
+            .trace_transaction(
+                execution_receipt,
+                GethDebugTracingOptions {
+                    tracer: Some(GethDebugTracerType::BuiltInTracer(
+                        GethDebugBuiltInTracerType::CallTracer,
+                    )),
+                    ..Default::default()
+                },
+            )?
+            .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(
+                case_idx,
+                execution_receipt,
+                node,
+                expectation,
+                &tracing_result,
+            )?;
+        }
+
+        Ok(())
+    }
+
+    fn handle_input_expectation_item(
+        &mut self,
+        case_idx: CaseIdx,
+        execution_receipt: &TransactionReceipt,
+        node: &T::Blockchain,
+        expectation: &ExpectedOutput,
+        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.
+        // 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 error_span =
+            tracing::error_span!("Exception failed", ?tracing_result, ?execution_receipt,);
+        let _guard = error_span.enter();
+
+        // 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",);
+            anyhow::bail!(
+                "Transaction status assertion failed - Expected {expected} but got {actual}",
             );
+        }
 
-        let trace = node.trace_transaction(receipt.clone())?;
+        // Handling the calldata assertion
-        tracing::trace!(
+        if let Some(ref expected_calldata) = expectation.return_data {
-            "Trace result for contract: {} - {:?}",
+            let expected = expected_calldata
-            &*input.instance,
+                .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)
-            trace
+                .map(Bytes::from)?;
+            let actual = tracing_result.output.clone().unwrap_or_default();
+            if !expected.starts_with(&actual) {
+                tracing::error!(
+                    %expected,
+                    %actual,
+                    "Calldata assertion failed"
                 );
+                anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",);
+            }
+        }
 
-        let diff = node.state_diff(receipt.clone())?;
+        // Handling the events assertion
+        if let Some(ref expected_events) = expectation.events {
+            // Handling the events length assertion.
+            let expected = expected_events.len();
+            let actual = execution_receipt.logs().len();
+            if actual != expected {
+                tracing::error!(expected, actual, "Event count assertion failed",);
+                anyhow::bail!(
+                    "Event count assertion failed - Expected {expected} but got {actual}",
+                );
+            }
 
-        Ok((receipt, trace, diff))
+            // Handling the events assertion.
+            for (expected_event, actual_event) in
+                expected_events.iter().zip(execution_receipt.logs())
+            {
+                // Handling the emitter assertion.
+                if let Some(expected_address) = expected_event.address {
+                    let expected = expected_address;
+                    let actual = actual_event.address();
+                    if actual != expected {
+                        tracing::error!(
+                            %expected,
+                            %actual,
+                            "Event emitter assertion failed",
+                        );
+                        anyhow::bail!(
+                            "Event emitter assertion failed - Expected {expected} but got {actual}",
+                        );
+                    }
+                }
+
+                // Handling the topics assertion.
+                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!(?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
+                    .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)
+                    .map(Bytes::from)?;
+                let actual = &actual_event.data().data;
+                if !expected.starts_with(actual) {
+                    tracing::error!(?expected, ?actual, "Event value assertion failed",);
+                    anyhow::bail!(
+                        "Event value assertion failed - Expected {expected:?} but got {actual:?}",
+                    );
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn handle_input_diff(
+        &mut self,
+        _: CaseIdx,
+        execution_receipt: TransactionReceipt,
+        node: &T::Blockchain,
+    ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
+        let span = tracing::info_span!("Handling input diff");
+        let _guard = span.enter();
+
+        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+            diff_mode: Some(true),
+            disable_code: None,
+            disable_storage: None,
+        });
+
+        let trace = node.trace_transaction(&execution_receipt, trace_options)?;
+        let diff = node.state_diff(&execution_receipt)?;
+
+        Ok((execution_receipt, trace, diff))
     }
 }
 
@@ -450,6 +643,22 @@ 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();
@@ -493,6 +702,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",
@@ -505,7 +715,7 @@ where
 
                 // For inputs if one of the inputs fail we move on to the next case (we do not move
                 // on to the next input as it doesn't make sense. It depends on the previous one).
-                for (input_idx, input) in case.inputs.iter().enumerate() {
+                for (input_idx, input) in case.inputs_iterator().enumerate() {
                     let tracing_span = tracing::info_span!("Handling input", input_idx);
                     let _guard = tracing_span.enter();
 
@@ -513,7 +723,7 @@ where
                         tracing::info_span!("Executing input", contract_name = ?input.instance)
                             .in_scope(|| {
                                 let (leader_receipt, _, leader_diff) = match leader_state
-                                    .handle_input(self.metadata, case_idx, input, self.leader_node)
+                                    .handle_input(self.metadata, case_idx, &input, self.leader_node)
                                 {
                                     Ok(result) => result,
                                     Err(error) => {
@@ -541,7 +751,7 @@ where
                                     .handle_input(
                                         self.metadata,
                                         case_idx,
-                                        input,
+                                        &input,
                                         self.follower_node,
                                     ) {
                                     Ok(result) => result,
@@ -589,14 +799,6 @@ where
                         tracing::trace!("Leader logs: {:?}", leader_receipt.logs());
                         tracing::trace!("Follower logs: {:?}", follower_receipt.logs());
                     }
-
-                    if leader_receipt.status() != follower_receipt.status() {
-                        tracing::debug!(
-                            "Mismatch in status: leader = {}, follower = {}",
-                            leader_receipt.status(),
-                            follower_receipt.status()
-                        );
-                    }
                 }
 
                 // Note: Only consider the case as having been successful after we have processed

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::{geth, kitchensink::KitchensinkNode};
+use revive_dt_node::{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;
+    type Blockchain: EthereumNode + Node;
     type Compiler: SolidityCompiler;
 
     /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].

crates/core/src/main.rs

@@ -1,5 +1,13 @@
-use std::{collections::HashMap, sync::LazyLock};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::LazyLock,
+};
 
+use alloy::{
+    network::TxSigner,
+    primitives::FixedBytes,
+    signers::{Signature, local::PrivateKeySigner},
+};
 use clap::Parser;
 use rayon::{ThreadPoolBuilder, prelude::*};
 
@@ -8,7 +16,11 @@ 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::{AddressReplacementMap, MetadataFile},
+};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
@@ -20,12 +32,48 @@ static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 fn main() -> anyhow::Result<()> {
     let args = init_cli()?;
 
-    for (corpus, tests) in collect_corpora(&args)? {
+    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()),
+        );
+    }
+
+    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, 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()?;
@@ -83,15 +131,24 @@ 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_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>
+    + Clone
+    + Send
+    + Sync
+    + 'static,
+    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 leader_nodes = NodePool::<L::Blockchain>::new(args, additional_signers.clone())?;
-    let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
+    let follower_nodes = NodePool::<F::Blockchain>::new(args, additional_signers)?;
 
     tests.par_iter().for_each(
         |MetadataFile {
@@ -141,13 +198,22 @@ where
     Ok(())
 }
 
-fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> {
+fn execute_corpus(
+    args: &Arguments,
+    tests: &[MetadataFile],
+    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, span)?
+            run_driver::<Geth, Kitchensink>(args, tests, additional_signers, span)?
         }
         (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span)?
+            run_driver::<Geth, Geth>(args, tests, additional_signers, span)?
         }
         _ => unimplemented!(),
     }

crates/format/src/case.rs

@@ -1,6 +1,11 @@
 use serde::Deserialize;
 
-use crate::{define_wrapper_type, input::Input, mode::Mode};
+use crate::{
+    define_wrapper_type,
+    input::{Expected, Input},
+    metadata::AddressReplacementMap,
+    mode::Mode,
+};
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Case {
@@ -9,6 +14,46 @@ pub struct Case {
     pub modes: Option<Vec<Mode>>,
     pub inputs: Vec<Input>,
     pub group: Option<String>,
+    pub expected: Option<Expected>,
+}
+
+impl Case {
+    pub fn inputs_iterator(&self) -> impl Iterator<Item = Input> {
+        let inputs_len = self.inputs.len();
+        self.inputs
+            .clone()
+            .into_iter()
+            .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
+                } else {
+                    input
+                }
+            })
+    }
+
+    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!(

crates/format/src/input.rs

@@ -7,13 +7,16 @@ use alloy::{
     primitives::{Address, Bytes, U256},
     rpc::types::TransactionRequest,
 };
+use alloy_primitives::{FixedBytes, utils::parse_units};
 use semver::VersionReq;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
-use serde_json::Value;
 
 use revive_dt_node_interaction::EthereumNode;
 
-use crate::metadata::ContractInstance;
+use crate::{
+    define_wrapper_type,
+    metadata::{AddressReplacementMap, ContractInstance},
+};
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
@@ -26,7 +29,7 @@ pub struct Input {
     #[serde(default)]
     pub calldata: Calldata,
     pub expected: Option<Expected>,
-    pub value: Option<String>,
+    pub value: Option<EtherValue>,
     pub storage: Option<HashMap<String, Calldata>>,
 }
 
@@ -40,10 +43,18 @@ pub enum Expected {
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct ExpectedOutput {
-    compiler_version: Option<VersionReq>,
+    pub compiler_version: Option<VersionReq>,
-    return_data: Option<Calldata>,
+    pub return_data: Option<Calldata>,
-    events: Option<Value>,
+    pub events: Option<Vec<Event>>,
-    exception: Option<bool>,
+    #[serde(default)]
+    pub exception: bool,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
+pub struct Event {
+    pub address: Option<Address>,
+    pub topics: Vec<String>,
+    pub values: Calldata,
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
@@ -74,6 +85,93 @@ 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()
+    }
+
+    pub fn with_success(mut self) -> Self {
+        self.exception = false;
+        self
+    }
+
+    pub fn with_failure(mut self) -> Self {
+        self.exception = true;
+        self
+    }
+
+    pub fn with_calldata(mut self, calldata: Calldata) -> Self {
+        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 {
     fn default() -> Self {
         Self::Compound(Default::default())
@@ -91,7 +189,34 @@ impl Calldata {
         }
     }
 
-    pub fn construct_call_data(
+    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)>,
+        chain_state_provider: &impl EthereumNode,
+    ) -> anyhow::Result<Vec<u8>> {
+        let mut buffer = Vec::<u8>::with_capacity(self.size_requirement());
+        self.calldata_into_slice(&mut buffer, deployed_contracts, chain_state_provider)?;
+        Ok(buffer)
+    }
+
+    pub fn calldata_into_slice(
         &self,
         buffer: &mut Vec<u8>,
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
@@ -126,11 +251,25 @@ impl Calldata {
     }
 }
 
-impl ExpectedOutput {
+impl Expected {
-    pub fn find_all_contract_instances(&self, vec: &mut Vec<ContractInstance>) {
+    pub fn handle_address_replacement(
-        if let Some(ref cd) = self.return_data {
+        &mut self,
-            cd.find_all_contract_instances(vec);
+        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(())
     }
 }
 
@@ -153,12 +292,9 @@ impl Input {
     ) -> anyhow::Result<Bytes> {
         match self.method {
             Method::Deployer | Method::Fallback => {
-                let mut calldata = Vec::<u8>::with_capacity(self.calldata.size_requirement());
+                let calldata = self
-                self.calldata.construct_call_data(
+                    .calldata
-                    &mut calldata,
+                    .calldata(deployed_contracts, chain_state_provider)?;
-                    deployed_contracts,
-                    chain_state_provider,
-                )?;
 
                 Ok(calldata.into())
             }
@@ -204,7 +340,7 @@ impl Input {
                 // a new buffer for each one of the resolved arguments.
                 let mut calldata = Vec::<u8>::with_capacity(4 + self.calldata.size_requirement());
                 calldata.extend(function.selector().0);
-                self.calldata.construct_call_data(
+                self.calldata.calldata_into_slice(
                     &mut calldata,
                     deployed_contracts,
                     chain_state_provider,
@@ -222,7 +358,11 @@ 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();
+        let transaction_request = TransactionRequest::default().from(self.caller).value(
+            self.value
+                .map(|value| value.into_inner())
+                .unwrap_or_default(),
+        );
         match self.method {
             Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
             _ => Ok(transaction_request
@@ -236,31 +376,39 @@ impl Input {
         vec.push(self.instance.clone());
 
         self.calldata.find_all_contract_instances(&mut vec);
-        match &self.expected {
-            Some(Expected::Calldata(cd)) => {
-                cd.find_all_contract_instances(&mut vec);
-            }
-            Some(Expected::Expected(expected)) => {
-                expected.find_all_contract_instances(&mut vec);
-            }
-            Some(Expected::ExpectedMany(expected)) => {
-                for expected in expected {
-                    expected.find_all_contract_instances(&mut vec);
-                }
-            }
-            None => {}
-        }
 
         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(())
+    }
 }
 
 fn default_instance() -> ContractInstance {
     ContractInstance::new_from("Test")
 }
 
-fn default_caller() -> Address {
+pub const fn default_caller() -> Address {
-    "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap()
+    Address(FixedBytes(alloy::hex!(
+        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
+    )))
 }
 
 /// This function takes in the string calldata argument provided in the JSON input and resolves it
@@ -271,7 +419,7 @@ 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,
@@ -355,22 +503,19 @@ mod tests {
 
         fn trace_transaction(
             &self,
-            _: alloy::rpc::types::TransactionReceipt,
+            _: &alloy::rpc::types::TransactionReceipt,
+            _: alloy::rpc::types::trace::geth::GethDebugTracingOptions,
         ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
             unimplemented!()
         }
 
         fn state_diff(
             &self,
-            _: alloy::rpc::types::TransactionReceipt,
+            _: &alloy::rpc::types::TransactionReceipt,
         ) -> anyhow::Result<alloy::rpc::types::trace::geth::DiffMode> {
             unimplemented!()
         }
 
-        fn fetch_add_nonce(&self, _: Address) -> anyhow::Result<u64> {
-            unimplemented!()
-        }
-
         fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
             Ok(0x123)
         }

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},
 };
 
@@ -44,6 +48,7 @@ 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.
@@ -210,6 +215,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 +324,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-interaction/src/lib.rs

@@ -2,7 +2,7 @@
 
 use alloy::eips::BlockNumberOrTag;
 use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
-use alloy::rpc::types::trace::geth::{DiffMode, GethTrace};
+use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
 use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
 use anyhow::Result;
 
@@ -15,13 +15,14 @@ pub trait EthereumNode {
     fn execute_transaction(&self, transaction: TransactionRequest) -> Result<TransactionReceipt>;
 
     /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
-    fn trace_transaction(&self, transaction: TransactionReceipt) -> Result<GethTrace>;
+    fn trace_transaction(
+        &self,
+        receipt: &TransactionReceipt,
+        trace_options: GethDebugTracingOptions,
+    ) -> Result<GethTrace>;
 
     /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, transaction: TransactionReceipt) -> Result<DiffMode>;
+    fn state_diff(&self, receipt: &TransactionReceipt) -> Result<DiffMode>;
-
-    /// Returns the next available nonce for the given [Address].
-    fn fetch_add_nonce(&self, address: Address) -> Result<u64>;
 
     /// Returns the ID of the chain that the node is on.
     fn chain_id(&self) -> Result<ChainId>;

crates/node/src/common.rs

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

crates/node/src/geth.rs

@@ -1,37 +1,35 @@
 //! The go-ethereum node implementation.
 
 use std::{
-    collections::HashMap,
     fs::{File, OpenOptions, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
     path::PathBuf,
     process::{Child, Command, Stdio},
-    sync::{
+    sync::atomic::{AtomicU32, Ordering},
-        Mutex,
-        atomic::{AtomicU32, Ordering},
-    },
     time::{Duration, Instant},
 };
 
 use alloy::{
     eips::BlockNumberOrTag,
-    network::{Ethereum, EthereumWallet},
+    genesis::{Genesis, GenesisAccount},
+    network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner},
     primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
-        fillers::{FillProvider, TxFiller},
+        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
     },
     rpc::types::{
         TransactionReceipt, TransactionRequest,
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
+    signers::Signature,
 };
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 use tracing::Level;
 
-use crate::Node;
+use crate::{Node, common::FallbackGasFiller};
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -54,7 +52,7 @@ pub struct Instance {
     network_id: u64,
     start_timeout: u64,
     wallet: EthereumWallet,
-    nonces: Mutex<HashMap<Address, u64>>,
+    nonce_manager: CachedNonceManager,
     /// This vector stores [`File`] objects that we use for logging which we want to flush when the
     /// node object is dropped. We do not store them in a structured fashion at the moment (in
     /// separate fields) as the logic that we need to apply to them is all the same regardless of
@@ -82,8 +80,17 @@ impl Instance {
         create_dir_all(&self.base_directory)?;
         create_dir_all(&self.logs_directory)?;
 
+        let mut genesis = serde_json::from_str::<Genesis>(&genesis)?;
+        for signer_address in
+            <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
+        {
+            genesis.alloc.entry(signer_address).or_insert(
+                GenesisAccount::default()
+                    .with_balance(10000000000000000000000u128.try_into().unwrap()),
+            );
+        }
         let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
-        File::create(&genesis_path)?.write_all(genesis.as_bytes())?;
+        serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;
 
         let mut child = Command::new(&self.geth)
             .arg("init")
@@ -206,8 +213,19 @@ impl Instance {
     > + 'static {
         let connection_string = self.connection_string();
         let wallet = self.wallet.clone();
+
+        // Note: We would like all providers to make use of the same nonce manager so that we have
+        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
+        // its implementation and therefore it means that when we clone it then it still references
+        // the same state.
+        let nonce_manager = self.nonce_manager.clone();
+
         Box::pin(async move {
             ProviderBuilder::new()
+                .disable_recommended_fillers()
+                .filler(FallbackGasFiller::new(500_000_000, 500_000_000, 1))
+                .filler(ChainIdFiller::default())
+                .filler(NonceFiller::new(nonce_manager))
                 .wallet(wallet)
                 .connect(&connection_string)
                 .await
@@ -224,7 +242,7 @@ impl EthereumNode for Instance {
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
         let provider = self.provider();
         BlockingExecutor::execute(async move {
-            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction,);
+            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
             let _outer_guard = outer_span.enter();
 
             let provider = provider.await?;
@@ -305,30 +323,28 @@ impl EthereumNode for Instance {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn trace_transaction(
         &self,
-        transaction: TransactionReceipt,
+        transaction: &TransactionReceipt,
+        trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+        let tx_hash = transaction.transaction_hash;
-            diff_mode: Some(true),
-            disable_code: None,
-            disable_storage: None,
-        });
         let provider = self.provider();
-
         BlockingExecutor::execute(async move {
             Ok(provider
                 .await?
-                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .debug_trace_transaction(tx_hash, trace_options)
                 .await?)
         })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn state_diff(
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
-        &self,
+        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
-        transaction: alloy::rpc::types::TransactionReceipt,
+            diff_mode: Some(true),
-    ) -> anyhow::Result<DiffMode> {
+            disable_code: None,
+            disable_storage: None,
+        });
         match self
-            .trace_transaction(transaction)?
+            .trace_transaction(transaction, trace_options)?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
@@ -336,24 +352,6 @@ impl EthereumNode for Instance {
         }
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
-        let provider = self.provider();
-        let onchain_nonce = BlockingExecutor::execute::<anyhow::Result<_>>(async move {
-            provider
-                .await?
-                .get_transaction_count(address)
-                .await
-                .map_err(Into::into)
-        })??;
-
-        let mut nonces = self.nonces.lock().unwrap();
-        let current = nonces.entry(address).or_insert(onchain_nonce);
-        let value = *current;
-        *current += 1;
-        Ok(value)
-    }
-
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         let provider = self.provider();
@@ -437,11 +435,19 @@ impl EthereumNode for Instance {
 }
 
 impl Node for Instance {
-    fn new(config: &Arguments) -> 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),
@@ -452,11 +458,11 @@ impl Node for Instance {
             handle: None,
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
-            wallet: config.wallet(),
+            wallet,
-            nonces: Mutex::new(HashMap::new()),
             // We know that we only need to be storing 2 files so we can specify that when creating
             // the vector. It's the stdout and stderr of the geth node.
             logs_file_to_flush: Vec::with_capacity(2),
+            nonce_manager: Default::default(),
         }
     }
 
@@ -505,6 +511,14 @@ 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 {
@@ -517,6 +531,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};
@@ -533,7 +549,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()
@@ -543,21 +559,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

@@ -1,35 +1,32 @@
 use std::{
-    collections::HashMap,
     fs::{File, OpenOptions, create_dir_all, remove_dir_all},
     io::{BufRead, Write},
     path::{Path, PathBuf},
     process::{Child, Command, Stdio},
-    sync::{
+    sync::atomic::{AtomicU32, Ordering},
-        Mutex,
-        atomic::{AtomicU32, Ordering},
-    },
     time::Duration,
 };
 
 use alloy::{
     consensus::{BlockHeader, TxEnvelope},
     eips::BlockNumberOrTag,
-    hex,
+    genesis::{Genesis, GenesisAccount},
     network::{
-        Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError,
+        Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder,
-        UnbuiltTransactionError,
+        TransactionBuilderError, TxSigner, UnbuiltTransactionError,
     },
     primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
-        fillers::{FillProvider, TxFiller},
+        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
     },
     rpc::types::{
         TransactionReceipt,
         eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
+    signers::Signature,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
@@ -40,7 +37,7 @@ use tracing::Level;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 
-use crate::Node;
+use crate::{Node, common::FallbackGasFiller};
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -55,7 +52,7 @@ pub struct KitchensinkNode {
     logs_directory: PathBuf,
     process_substrate: Option<Child>,
     process_proxy: Option<Child>,
-    nonces: Mutex<HashMap<Address, u64>>,
+    nonce_manager: CachedNonceManager,
     /// This vector stores [`File`] objects that we use for logging which we want to flush when the
     /// node object is dropped. We do not store them in a structured fashion at the moment (in
     /// separate fields) as the logic that we need to apply to them is all the same regardless of
@@ -127,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(10000000000000000000000u128.try_into().unwrap()),
+                );
+            }
+            self.extract_balance_from_genesis_file(&genesis)?
+        };
         merged_balances.append(&mut eth_balances);
 
         chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] =
@@ -241,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)?;
+        genesis
-        let alloc = genesis_json
+            .alloc
-            .get("alloc")
+            .iter()
-            .and_then(|a| a.as_object())
+            .try_fold(Vec::new(), |mut vec, (address, acc)| {
-            .ok_or_else(|| anyhow::anyhow!("Missing 'alloc' in genesis"))?;
+                let substrate_address = Self::eth_to_substrate_address(address);
-
+                let balance = acc.balance.try_into()?;
-        let mut balances = Vec::new();
+                vec.push((substrate_address, balance));
-        for (eth_addr, obj) in alloc.iter() {
+                Ok(vec)
-            let balance_str = obj.get("balance").and_then(|b| b.as_str()).unwrap_or("0");
+            })
-            let balance = if balance_str.starts_with("0x") {
-                u128::from_str_radix(balance_str.trim_start_matches("0x"), 16)?
-            } else {
-                balance_str.parse::<u128>()?
-            };
-            let substrate_addr = Self::eth_to_substrate_address(eth_addr)?;
-            balances.push((substrate_addr.clone(), balance));
-        }
-        Ok(balances)
     }
 
-    fn eth_to_substrate_address(eth_addr: &str) -> anyhow::Result<String> {
+    fn eth_to_substrate_address(address: &Address) -> String {
-        let eth_bytes = hex::decode(eth_addr.trim_start_matches("0x"))?;
+        let eth_bytes = address.0.0;
-        if eth_bytes.len() != 20 {
-            anyhow::bail!(
-                "Invalid Ethereum address length: expected 20 bytes, got {}",
-                eth_bytes.len()
-            );
-        }
 
         let mut padded = [0xEEu8; 32];
         padded[..20].copy_from_slice(&eth_bytes);
 
         let account_id = AccountId32::from(padded);
-        Ok(account_id.to_ss58check())
+        account_id.to_ss58check()
     }
 
     fn wait_ready(logs_file_path: &Path, marker: &str, timeout: Duration) -> anyhow::Result<()> {
@@ -350,9 +343,24 @@ impl KitchensinkNode {
     > + 'static {
         let connection_string = self.connection_string();
         let wallet = self.wallet.clone();
+
+        // Note: We would like all providers to make use of the same nonce manager so that we have
+        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
+        // its implementation and therefore it means that when we clone it then it still references
+        // the same state.
+        let nonce_manager = self.nonce_manager.clone();
+
         Box::pin(async move {
             ProviderBuilder::new()
+                .disable_recommended_fillers()
                 .network::<KitchenSinkNetwork>()
+                .filler(FallbackGasFiller::new(
+                    30_000_000,
+                    200_000_000_000,
+                    3_000_000_000,
+                ))
+                .filler(ChainIdFiller::default())
+                .filler(NonceFiller::new(nonce_manager))
                 .wallet(wallet)
                 .connect(&connection_string)
                 .await
@@ -384,27 +392,28 @@ impl EthereumNode for KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn trace_transaction(
         &self,
-        transaction: TransactionReceipt,
+        transaction: &TransactionReceipt,
+        trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+        let tx_hash = transaction.transaction_hash;
-            diff_mode: Some(true),
-            disable_code: None,
-            disable_storage: None,
-        });
         let provider = self.provider();
-
         BlockingExecutor::execute(async move {
             Ok(provider
                 .await?
-                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .debug_trace_transaction(tx_hash, trace_options)
                 .await?)
         })?
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode> {
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+        let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
+            diff_mode: Some(true),
+            disable_code: None,
+            disable_storage: None,
+        });
         match self
-            .trace_transaction(transaction)?
+            .trace_transaction(transaction, trace_options)?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
@@ -412,24 +421,6 @@ impl EthereumNode for KitchensinkNode {
         }
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
-        let provider = self.provider();
-        let onchain_nonce = BlockingExecutor::execute::<anyhow::Result<_>>(async move {
-            provider
-                .await?
-                .get_transaction_count(address)
-                .await
-                .map_err(Into::into)
-        })??;
-
-        let mut nonces = self.nonces.lock().unwrap();
-        let current = nonces.entry(address).or_insert(onchain_nonce);
-        let value = *current;
-        *current += 1;
-        Ok(value)
-    }
-
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         let provider = self.provider();
@@ -513,23 +504,31 @@ impl EthereumNode for KitchensinkNode {
 }
 
 impl Node for KitchensinkNode {
-    fn new(config: &Arguments) -> 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,
             process_proxy: None,
-            nonces: Mutex::new(HashMap::new()),
+            nonce_manager: Default::default(),
             // We know that we only need to be storing 4 files so we can specify that when creating
             // the vector. It's the stdout and stderr of the substrate-node and the eth-rpc.
             logs_file_to_flush: Vec::with_capacity(4),
@@ -585,6 +584,14 @@ 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 {
@@ -640,6 +647,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)
     }
@@ -1017,10 +1030,10 @@ 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;
+    use std::sync::{LazyLock, Mutex};
     use temp_dir::TempDir;
 
     use std::fs;
@@ -1060,7 +1073,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 +1128,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 +1143,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 =
+        let first_eth_addr = KitchensinkNode::eth_to_substrate_address(
-            KitchensinkNode::eth_to_substrate_address("90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+            &"90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap(),
-                .unwrap();
+        );
-        let second_eth_addr =
+        let second_eth_addr = KitchensinkNode::eth_to_substrate_address(
-            KitchensinkNode::eth_to_substrate_address("Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2")
+            &"Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2".parse().unwrap(),
-                .unwrap();
+        );
 
         assert!(
             contents.contains(&first_eth_addr),
@@ -1159,10 +1173,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 +1207,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 +1235,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 +1247,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 +1255,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 +1268,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,8 +1,10 @@
 //! This crate implements the testing nodes.
 
+use alloy::{network::TxSigner, signers::Signature};
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
+pub mod common;
 pub mod geth;
 pub mod kitchensink;
 pub mod pool;
@@ -13,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) -> 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.
     ///
@@ -30,4 +35,8 @@ 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::{network::TxSigner, signers::Signature};
 use anyhow::Context;
 use revive_dt_config::Arguments;
 
@@ -23,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) -> 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: {}",
@@ -34,7 +42,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_signers = additional_signers.clone();
+            handles.push(thread::spawn(move || {
+                spawn_node::<T>(&config, additional_signers, genesis)
+            }));
         }
 
         let mut nodes = Vec::with_capacity(nodes);
@@ -60,8 +71,12 @@ where
     }
 }
 
-fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Result<T> {
+fn spawn_node<T: Node + Send>(
-    let mut node = T::new(args);
+    args: &Arguments,
+    additional_signers: impl IntoIterator<Item: TxSigner<Signature> + Send + Sync + 'static>,
+    genesis: String,
+) -> anyhow::Result<T> {
+    let mut node = T::new(args, additional_signers);
     tracing::info!("starting node: {}", node.connection_string());
     node.spawn(genesis)?;
     Ok(node)

genesis.json

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