From b6db597a575e301888fb648c1f76d32c6e4d58d2 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Mon, 21 Jul 2025 18:54:09 +0300 Subject: [PATCH 01/19] Add support for address replacement --- Cargo.lock | 144 +++++++++++++++-------------- crates/core/src/driver/mod.rs | 128 ++++++++++++++++++++----- crates/core/src/main.rs | 10 +- crates/format/src/case.rs | 16 ++++ crates/format/src/input.rs | 113 ++++++++++++++++++++-- crates/format/src/metadata.rs | 141 +++++++++++++++++++++++++++- crates/node-interaction/src/lib.rs | 10 +- crates/node/src/geth.rs | 42 ++++++--- crates/node/src/kitchensink.rs | 57 +++++++++--- 9 files changed, 531 insertions(+), 130 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bedf2a6..b2684a9 100644 --- a/Cargo.lock +++ b/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" diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index fb13c29..55c59d1 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -22,8 +22,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::{Calldata, Expected, ExpectedOutput, Method}; -use revive_dt_format::metadata::{ContractInstance, ContractPathAndIdentifier}; +use revive_dt_format::input::{Calldata, Expected, ExpectedOutput, Method, default_caller}; +use revive_dt_format::metadata::{ + AddressReplacementMap, ContractInstance, ContractPathAndIdentifier, +}; use revive_dt_format::{input::Input, metadata::Metadata, mode::SolcMode}; use revive_dt_node_interaction::EthereumNode; use revive_dt_report::reporter::{CompilationTask, Report, Span}; @@ -145,11 +147,17 @@ where case_idx: CaseIdx, input: &Input, node: &T::Blockchain, + address_replacement: &AddressReplacementMap, ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> { let deployment_receipts = - self.handle_contract_deployment(metadata, case_idx, input, node)?; - let execution_receipt = - self.handle_input_execution(case_idx, input, deployment_receipts, node)?; + self.handle_contract_deployment(metadata, case_idx, input, node, address_replacement)?; + let execution_receipt = self.handle_input_execution( + case_idx, + input, + deployment_receipts, + node, + address_replacement, + )?; self.handle_input_expectations(case_idx, input, &execution_receipt, node)?; self.handle_input_diff(case_idx, execution_receipt, node) } @@ -161,6 +169,7 @@ where case_idx: CaseIdx, input: &Input, node: &T::Blockchain, + address_replacement: &AddressReplacementMap, ) -> anyhow::Result> { let span = tracing::debug_span!( "Handling contract deployment", @@ -252,7 +261,16 @@ where TransactionBuilder::::with_deploy_code(tx, code) }; - let receipt = match node.execute_transaction(tx) { + let receipt = match node.execute_transaction( + tx, + Some( + address_replacement + .as_ref() + .values() + .map(|(sk, _)| sk) + .map(Clone::clone), + ), + ) { Ok(receipt) => receipt, Err(error) => { tracing::error!( @@ -316,6 +334,7 @@ where input: &Input, mut deployment_receipts: HashMap, node: &T::Blockchain, + address_replacement: &AddressReplacementMap, ) -> anyhow::Result { match input.method { // This input was already executed when `handle_input` was called. We just need to @@ -339,7 +358,16 @@ where tracing::trace!("Executing transaction for input: {input:?}"); - match node.execute_transaction(tx) { + match node.execute_transaction( + tx, + Some( + address_replacement + .as_ref() + .values() + .map(|(sk, _)| sk) + .map(Clone::clone), + ), + ) { Ok(receipt) => Ok(receipt), Err(err) => { tracing::error!( @@ -503,18 +531,26 @@ where } // Handling the topics assertion. - let expected = expected_event.topics.as_slice(); - let actual = actual_event.topics(); - if actual != expected { - tracing::error!( - ?execution_receipt, - ?expected, - ?actual, - "Event topics assertion failed", - ); - anyhow::bail!( - "Event topics assertion failed - Expected {expected:?} but got {actual:?}", - ); + for (expected_topic, actual_topic) in expected_event + .topics + .as_slice() + .iter() + .zip(actual_event.topics()) + { + let expected = Calldata::Compound(vec![expected_topic.clone()]) + .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)?; + let actual = actual_topic.to_vec(); + if actual != expected { + tracing::error!( + ?execution_receipt, + ?expected, + ?actual, + "Event topics assertion failed", + ); + anyhow::bail!( + "Event topics assertion failed - Expected {expected:?} but got {actual:?}", + ); + } } // Handling the values assertion. @@ -563,7 +599,7 @@ where } pub struct Driver<'a, Leader: Platform, Follower: Platform> { - metadata: &'a Metadata, + metadata: &'a mut Metadata, config: &'a Arguments, leader_node: &'a Leader::Blockchain, follower_node: &'a Follower::Blockchain, @@ -575,7 +611,7 @@ where F: Platform, { pub fn new( - metadata: &'a Metadata, + metadata: &'a mut Metadata, config: &'a Arguments, leader_node: &'a L::Blockchain, follower_node: &'a F::Blockchain, @@ -686,6 +722,45 @@ 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. + let replacement_maps = self + .metadata + .cases + .iter_mut() + .enumerate() + .map(|(case_id, case)| (CaseIdx::new(case_id), case)) + .fold(HashMap::new(), |mut map, (case_idx, case)| { + let mut replacement_map = AddressReplacementMap::default(); + case.inputs + .iter() + .filter_map(|input| { + if input.caller == default_caller() { + None + } else { + Some(input.caller) + } + }) + .for_each(|caller| { + replacement_map.get(caller); + }); + if let Err(error) = case.handle_address_replacement(&mut replacement_map) { + tracing::error!( + target = ?Target::Leader, + ?error, + "Case address replacement failed" + ); + execution_result.add_failed_case( + Target::Leader, + mode.clone(), + case.name.as_deref().unwrap_or("no case name").to_owned(), + case_idx, + 0, + anyhow::Error::msg(format!("{error}")), + ); + } + map.insert(case_idx, replacement_map); + map + }); + 'case_loop: for (case_idx, case) in self.metadata.cases.iter().enumerate() { let tracing_span = tracing::info_span!( "Handling case", @@ -695,6 +770,7 @@ where let _guard = tracing_span.enter(); let case_idx = CaseIdx::new_from(case_idx); + let replacement_map = replacement_maps.get(&case_idx).cloned().unwrap_or_default(); // 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). @@ -706,8 +782,13 @@ 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, + &replacement_map, + ) { Ok(result) => result, Err(error) => { tracing::error!( @@ -736,6 +817,7 @@ where case_idx, &input, self.follower_node, + &replacement_map, ) { Ok(result) => result, Err(error) => { diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index c8403af..e61281b 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -20,12 +20,12 @@ static TEMP_DIR: LazyLock = LazyLock::new(|| TempDir::new().unwrap()); fn main() -> anyhow::Result<()> { let args = init_cli()?; - for (corpus, tests) in collect_corpora(&args)? { + for (corpus, mut 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, &mut tests, span)?, } Report::save()?; @@ -83,7 +83,7 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> +fn run_driver(args: &Arguments, tests: &mut [MetadataFile], span: Span) -> anyhow::Result<()> where L: Platform, F: Platform, @@ -93,7 +93,7 @@ where let leader_nodes = NodePool::::new(args)?; let follower_nodes = NodePool::::new(args)?; - tests.par_iter().for_each( + tests.par_iter_mut().for_each( |MetadataFile { content: metadata, path: metadata_file_path, @@ -141,7 +141,7 @@ where Ok(()) } -fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> { +fn execute_corpus(args: &Arguments, tests: &mut [MetadataFile], span: Span) -> anyhow::Result<()> { match (&args.leader, &args.follower) { (TestingPlatform::Geth, TestingPlatform::Kitchensink) => { run_driver::(args, tests, span)? diff --git a/crates/format/src/case.rs b/crates/format/src/case.rs index 0013ac6..96cd299 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -3,6 +3,7 @@ use serde::Deserialize; use crate::{ define_wrapper_type, input::{Expected, Input}, + metadata::AddressReplacementMap, mode::Mode, }; @@ -16,6 +17,21 @@ pub struct Case { pub expected: Option, } +impl Case { + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut AddressReplacementMap, + ) -> anyhow::Result<()> { + for input in self.inputs.iter_mut() { + input.handle_address_replacement(old_to_new_mapping)?; + } + if let Some(ref mut expected) = self.expected { + expected.handle_address_replacement(old_to_new_mapping)?; + } + Ok(()) + } +} + define_wrapper_type!( /// A wrapper type for the index of test cases found in metadata file. #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index 6d49e74..a0965f3 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -7,13 +7,13 @@ use alloy::{ primitives::{Address, Bytes, U256}, rpc::types::TransactionRequest, }; -use alloy_primitives::B256; +use alloy_primitives::FixedBytes; use semver::VersionReq; use serde::Deserialize; use revive_dt_node_interaction::EthereumNode; -use crate::metadata::ContractInstance; +use crate::metadata::{AddressReplacementMap, ContractInstance}; #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)] pub struct Input { @@ -50,7 +50,7 @@ pub struct ExpectedOutput { #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)] pub struct Event { pub address: Option
, - pub topics: Vec, + pub topics: Vec, pub values: Calldata, } @@ -101,6 +101,41 @@ impl ExpectedOutput { self.return_data = Some(calldata); self } + + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut 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: &mut AddressReplacementMap, + ) -> anyhow::Result<()> { + if let Some(ref mut address) = self.address { + if let Some(new_address) = old_to_new_mapping.resolve(address.to_string().as_str()) { + *address = new_address + } + }; + for topic in self.topics.iter_mut() { + if let Some(new_address) = old_to_new_mapping.resolve(topic.to_string().as_str()) { + *topic = new_address.to_string(); + } + } + self.values.handle_address_replacement(old_to_new_mapping)?; + Ok(()) + } } impl Default for Calldata { @@ -120,6 +155,23 @@ impl Calldata { } } + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut 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, @@ -165,6 +217,28 @@ impl Calldata { } } +impl Expected { + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut AddressReplacementMap, + ) -> anyhow::Result<()> { + match self { + Expected::Calldata(calldata) => { + calldata.handle_address_replacement(old_to_new_mapping)?; + } + Expected::Expected(expected_output) => { + expected_output.handle_address_replacement(old_to_new_mapping)?; + } + Expected::ExpectedMany(expected_outputs) => { + for expected_output in expected_outputs.iter_mut() { + expected_output.handle_address_replacement(old_to_new_mapping)?; + } + } + } + Ok(()) + } +} + impl Input { fn instance_to_address( &self, @@ -267,14 +341,36 @@ impl Input { vec } + + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut AddressReplacementMap, + ) -> anyhow::Result<()> { + if self.caller != default_caller() { + self.caller = old_to_new_mapping.get(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 { - "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap() +pub const fn default_caller() -> Address { + Address(FixedBytes(alloy::hex!( + "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1" + ))) } /// This function takes in the string calldata argument provided in the JSON input and resolves it @@ -285,7 +381,7 @@ 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, chain_state_provider: &impl EthereumNode, @@ -352,8 +448,8 @@ fn resolve_argument( mod tests { use super::*; - use alloy::json_abi::JsonAbi; - use alloy_primitives::address; + use alloy::{json_abi::JsonAbi, network::TxSigner}; + use alloy_primitives::{Signature, address}; use alloy_sol_types::SolValue; use std::collections::HashMap; @@ -363,6 +459,7 @@ mod tests { fn execute_transaction( &self, _: TransactionRequest, + _: Option + Send + Sync + 'static>>, ) -> anyhow::Result { unimplemented!() } diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index abd4150..980d6d3 100644 --- a/crates/format/src/metadata.rs +++ b/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::{network::TxSigner, signers::local::PrivateKeySigner}; +use alloy_primitives::{Address, Signature}; +use revive_dt_node_interaction::EthereumNode; use serde::{Deserialize, Serialize}; use crate::{ case::Case, define_wrapper_type, + input::resolve_argument, mode::{Mode, SolcMode}, }; @@ -210,6 +214,17 @@ impl Metadata { } } } + + pub fn handle_address_replacement( + &mut self, + old_to_new_mapping: &mut AddressReplacementMap, + ) -> anyhow::Result<()> { + for case in self.cases.iter_mut() { + case.handle_address_replacement(old_to_new_mapping)?; + } + tracing::debug!(metadata = ?self, "Performed replacement on metadata"); + Ok(()) + } } define_wrapper_type!( @@ -308,6 +323,130 @@ impl From for String { } } +#[derive(Clone, Debug, Default)] +pub struct AddressReplacementMap(HashMap); + +impl AddressReplacementMap { + pub fn new() -> Self { + Self(Default::default()) + } + + pub fn into_inner(self) -> HashMap { + self.0 + } + + pub fn contains_key(&self, address: &Address) -> bool { + self.0.contains_key(address) + } + + pub fn get(&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(&mut self, value: &str) -> Option
{ + // 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> for AddressReplacementMap { + fn as_ref(&self) -> &HashMap { + &self.0 + } +} + +struct UnimplementedEthereumNode; + +impl EthereumNode for UnimplementedEthereumNode { + fn execute_transaction( + &self, + _: alloy::rpc::types::TransactionRequest, + _: Option + Send + Sync + 'static>>, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn chain_id(&self) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result
{ + anyhow::bail!("Unimplemented") + } + + fn block_difficulty( + &self, + _: alloy::eips::BlockNumberOrTag, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn block_hash( + &self, + _: alloy::eips::BlockNumberOrTag, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn block_timestamp( + &self, + _: alloy::eips::BlockNumberOrTag, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn last_block_number(&self) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn trace_transaction( + &self, + _: &alloy::rpc::types::TransactionReceipt, + _: alloy::rpc::types::trace::geth::GethDebugTracingOptions, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } + + fn state_diff( + &self, + _: &alloy::rpc::types::TransactionReceipt, + ) -> anyhow::Result { + anyhow::bail!("Unimplemented") + } +} + #[cfg(test)] mod test { use super::*; diff --git a/crates/node-interaction/src/lib.rs b/crates/node-interaction/src/lib.rs index 8ac488c..470c67c 100644 --- a/crates/node-interaction/src/lib.rs +++ b/crates/node-interaction/src/lib.rs @@ -1,9 +1,11 @@ //! This crate implements all node interactions. use alloy::eips::BlockNumberOrTag; +use alloy::network::TxSigner; use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256}; use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace}; use alloy::rpc::types::{TransactionReceipt, TransactionRequest}; +use alloy::signers::Signature; use anyhow::Result; mod blocking_executor; @@ -12,7 +14,13 @@ pub use blocking_executor::*; /// An interface for all interactions with Ethereum compatible nodes. pub trait EthereumNode { /// Execute the [TransactionRequest] and return a [TransactionReceipt]. - fn execute_transaction(&self, transaction: TransactionRequest) -> Result; + fn execute_transaction( + &self, + transaction: TransactionRequest, + additional_signers: Option< + impl IntoIterator + Send + Sync + 'static>, + >, + ) -> Result; /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace]. fn trace_transaction( diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 1f5e9f1..84b100b 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -11,7 +11,7 @@ use std::{ use alloy::{ eips::BlockNumberOrTag, - network::{Ethereum, EthereumWallet}, + network::{Ethereum, EthereumWallet, TxSigner}, primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256}, providers::{ Provider, ProviderBuilder, @@ -22,6 +22,7 @@ use alloy::{ TransactionReceipt, TransactionRequest, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, + signers::{Signature, local::PrivateKeySigner}, }; use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; @@ -195,13 +196,19 @@ impl Instance { fn provider( &self, + additional_signers: Option< + impl IntoIterator + Send + Sync + 'static>, + >, ) -> impl Future< Output = anyhow::Result< FillProvider, impl Provider, Ethereum>, >, > + 'static { let connection_string = self.connection_string(); - let wallet = self.wallet.clone(); + let mut wallet = self.wallet.clone(); + for signer in additional_signers.into_iter().flatten() { + wallet.register_signer(signer); + } // 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 @@ -221,6 +228,16 @@ impl Instance { .map_err(Into::into) }) } + + fn provider_no_additional_signers( + &self, + ) -> impl Future< + Output = anyhow::Result< + FillProvider, impl Provider, Ethereum>, + >, + > + 'static { + self.provider(None::>) + } } impl EthereumNode for Instance { @@ -228,8 +245,11 @@ impl EthereumNode for Instance { fn execute_transaction( &self, transaction: TransactionRequest, + additional_signers: Option< + impl IntoIterator + Send + Sync + 'static>, + >, ) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider(additional_signers); BlockingExecutor::execute(async move { let outer_span = tracing::debug_span!("Submitting transaction", ?transaction); let _outer_guard = outer_span.enter(); @@ -316,7 +336,7 @@ impl EthereumNode for Instance { trace_options: GethDebugTracingOptions, ) -> anyhow::Result { let tx_hash = transaction.transaction_hash; - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { Ok(provider .await? @@ -343,7 +363,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn chain_id(&self) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider.await?.get_chain_id().await.map_err(Into::into) })? @@ -351,7 +371,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -364,7 +384,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result
{ - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -377,7 +397,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -390,7 +410,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -403,7 +423,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -416,7 +436,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn last_block_number(&self) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider.await?.get_block_number().await.map_err(Into::into) })? diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 4c9401c..2d835aa 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -12,7 +12,7 @@ use alloy::{ eips::BlockNumberOrTag, hex, network::{ - Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError, + Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError, TxSigner, UnbuiltTransactionError, }, primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256}, @@ -26,6 +26,7 @@ use alloy::{ eth::{Block, Header, Transaction}, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, + signers::{Signature, local::PrivateKeySigner}, }; use serde::{Deserialize, Serialize}; use serde_json::{Value as JsonValue, json}; @@ -335,6 +336,9 @@ impl KitchensinkNode { fn provider( &self, + additional_signers: Option< + impl IntoIterator + Send + Sync + 'static>, + >, ) -> impl Future< Output = anyhow::Result< FillProvider< @@ -345,7 +349,10 @@ impl KitchensinkNode { >, > + 'static { let connection_string = self.connection_string(); - let wallet = self.wallet.clone(); + let mut wallet = self.wallet.clone(); + for signer in additional_signers.into_iter().flatten() { + wallet.register_signer(signer); + } // 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 @@ -370,6 +377,20 @@ impl KitchensinkNode { .map_err(Into::into) }) } + + fn provider_no_additional_signers( + &self, + ) -> impl Future< + Output = anyhow::Result< + FillProvider< + impl TxFiller, + impl Provider, + KitchenSinkNetwork, + >, + >, + > + 'static { + self.provider(None::>) + } } impl EthereumNode for KitchensinkNode { @@ -377,9 +398,12 @@ impl EthereumNode for KitchensinkNode { fn execute_transaction( &self, transaction: alloy::rpc::types::TransactionRequest, + additional_signers: Option< + impl IntoIterator + Send + Sync + 'static>, + >, ) -> anyhow::Result { tracing::debug!(?transaction, "Submitting transaction"); - let provider = self.provider(); + let provider = self.provider(additional_signers); let receipt = BlockingExecutor::execute(async move { Ok(provider .await? @@ -399,7 +423,7 @@ impl EthereumNode for KitchensinkNode { trace_options: GethDebugTracingOptions, ) -> anyhow::Result { let tx_hash = transaction.transaction_hash; - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { Ok(provider .await? @@ -426,7 +450,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn chain_id(&self) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider.await?.get_chain_id().await.map_err(Into::into) })? @@ -434,7 +458,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -447,7 +471,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result
{ - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -460,7 +484,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -473,7 +497,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -486,7 +510,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider .await? @@ -499,7 +523,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn last_block_number(&self) -> anyhow::Result { - let provider = self.provider(); + let provider = self.provider_no_additional_signers(); BlockingExecutor::execute(async move { provider.await?.get_block_number().await.map_err(Into::into) })? @@ -634,6 +658,12 @@ impl TransactionBuilder for ::Transacti ) } + fn take_nonce(&mut self) -> Option { + <::TransactionRequest as TransactionBuilder>::take_nonce( + self, + ) + } + fn input(&self) -> Option<&alloy::primitives::Bytes> { <::TransactionRequest as TransactionBuilder>::input(self) } @@ -1076,7 +1106,10 @@ mod tests { // Arrange let (node, args, _temp_dir) = new_node(); - let provider = node.provider().await.expect("Failed to create provider"); + let provider = node + .provider_no_additional_signers() + .await + .expect("Failed to create provider"); let account_address = args.wallet().default_signer().address(); let transaction = TransactionRequest::default() From d7bc4f1fab5eae7d244da7207b0babcfc10b76de Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Mon, 21 Jul 2025 19:42:44 +0300 Subject: [PATCH 02/19] Cleanup implementation --- crates/core/src/driver/mod.rs | 95 ++++-------------------------- crates/core/src/main.rs | 88 +++++++++++++++++++++++---- crates/format/src/input.rs | 5 +- crates/format/src/metadata.rs | 5 +- crates/node-interaction/src/lib.rs | 10 +--- crates/node/src/geth.rs | 65 +++++++++----------- crates/node/src/kitchensink.rs | 78 ++++++++++-------------- crates/node/src/lib.rs | 6 +- crates/node/src/pool.rs | 23 ++++++-- 9 files changed, 177 insertions(+), 198 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index 55c59d1..c0626ce 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -22,10 +22,8 @@ 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::{Calldata, Expected, ExpectedOutput, Method, default_caller}; -use revive_dt_format::metadata::{ - AddressReplacementMap, ContractInstance, ContractPathAndIdentifier, -}; +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_interaction::EthereumNode; use revive_dt_report::reporter::{CompilationTask, Report, Span}; @@ -147,17 +145,11 @@ where case_idx: CaseIdx, input: &Input, node: &T::Blockchain, - address_replacement: &AddressReplacementMap, ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> { let deployment_receipts = - self.handle_contract_deployment(metadata, case_idx, input, node, address_replacement)?; - let execution_receipt = self.handle_input_execution( - case_idx, - input, - deployment_receipts, - node, - address_replacement, - )?; + self.handle_contract_deployment(metadata, case_idx, input, 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) } @@ -169,7 +161,6 @@ where case_idx: CaseIdx, input: &Input, node: &T::Blockchain, - address_replacement: &AddressReplacementMap, ) -> anyhow::Result> { let span = tracing::debug_span!( "Handling contract deployment", @@ -261,16 +252,7 @@ where TransactionBuilder::::with_deploy_code(tx, code) }; - let receipt = match node.execute_transaction( - tx, - Some( - address_replacement - .as_ref() - .values() - .map(|(sk, _)| sk) - .map(Clone::clone), - ), - ) { + let receipt = match node.execute_transaction(tx) { Ok(receipt) => receipt, Err(error) => { tracing::error!( @@ -334,7 +316,6 @@ where input: &Input, mut deployment_receipts: HashMap, node: &T::Blockchain, - address_replacement: &AddressReplacementMap, ) -> anyhow::Result { match input.method { // This input was already executed when `handle_input` was called. We just need to @@ -358,16 +339,7 @@ where tracing::trace!("Executing transaction for input: {input:?}"); - match node.execute_transaction( - tx, - Some( - address_replacement - .as_ref() - .values() - .map(|(sk, _)| sk) - .map(Clone::clone), - ), - ) { + match node.execute_transaction(tx) { Ok(receipt) => Ok(receipt), Err(err) => { tracing::error!( @@ -599,7 +571,7 @@ where } pub struct Driver<'a, Leader: Platform, Follower: Platform> { - metadata: &'a mut Metadata, + metadata: &'a Metadata, config: &'a Arguments, leader_node: &'a Leader::Blockchain, follower_node: &'a Follower::Blockchain, @@ -611,7 +583,7 @@ where F: Platform, { pub fn new( - metadata: &'a mut Metadata, + metadata: &'a Metadata, config: &'a Arguments, leader_node: &'a L::Blockchain, follower_node: &'a F::Blockchain, @@ -722,44 +694,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. - let replacement_maps = self - .metadata - .cases - .iter_mut() - .enumerate() - .map(|(case_id, case)| (CaseIdx::new(case_id), case)) - .fold(HashMap::new(), |mut map, (case_idx, case)| { - let mut replacement_map = AddressReplacementMap::default(); - case.inputs - .iter() - .filter_map(|input| { - if input.caller == default_caller() { - None - } else { - Some(input.caller) - } - }) - .for_each(|caller| { - replacement_map.get(caller); - }); - if let Err(error) = case.handle_address_replacement(&mut replacement_map) { - tracing::error!( - target = ?Target::Leader, - ?error, - "Case address replacement failed" - ); - execution_result.add_failed_case( - Target::Leader, - mode.clone(), - case.name.as_deref().unwrap_or("no case name").to_owned(), - case_idx, - 0, - anyhow::Error::msg(format!("{error}")), - ); - } - map.insert(case_idx, replacement_map); - map - }); 'case_loop: for (case_idx, case) in self.metadata.cases.iter().enumerate() { let tracing_span = tracing::info_span!( @@ -770,7 +704,6 @@ where let _guard = tracing_span.enter(); let case_idx = CaseIdx::new_from(case_idx); - let replacement_map = replacement_maps.get(&case_idx).cloned().unwrap_or_default(); // 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). @@ -782,13 +715,8 @@ 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, - &replacement_map, - ) { + .handle_input(self.metadata, case_idx, &input, self.leader_node) + { Ok(result) => result, Err(error) => { tracing::error!( @@ -817,7 +745,6 @@ where case_idx, &input, self.follower_node, - &replacement_map, ) { Ok(result) => result, Err(error) => { diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index e61281b..c161620 100644 --- a/crates/core/src/main.rs +++ b/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 = LazyLock::new(|| TempDir::new().unwrap()); fn main() -> anyhow::Result<()> { let args = init_cli()?; - for (corpus, mut tests) in collect_corpora(&args)? { + let mut corpora = collect_corpora(&args)?; + let mut replacement_private_keys = HashSet::>::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.get(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 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, &mut tests, span)?, + None => execute_corpus( + &args, + &tests, + replacement_private_keys + .clone() + .into_iter() + .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail")) + .collect::>(), + span, + )?, } Report::save()?; @@ -83,17 +131,26 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result(args: &Arguments, tests: &mut [MetadataFile], span: Span) -> anyhow::Result<()> +fn run_driver( + args: &Arguments, + tests: &[MetadataFile], + additional_signers: impl IntoIterator + 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::::new(args)?; - let follower_nodes = NodePool::::new(args)?; + let leader_nodes = NodePool::::new(args, additional_signers.clone())?; + let follower_nodes = NodePool::::new(args, additional_signers)?; - tests.par_iter_mut().for_each( + tests.par_iter().for_each( |MetadataFile { content: metadata, path: metadata_file_path, @@ -141,13 +198,22 @@ where Ok(()) } -fn execute_corpus(args: &Arguments, tests: &mut [MetadataFile], span: Span) -> anyhow::Result<()> { +fn execute_corpus( + args: &Arguments, + tests: &[MetadataFile], + additional_signers: impl IntoIterator + Send + Sync + 'static> + + Clone + + Send + + Sync + + 'static, + span: Span, +) -> anyhow::Result<()> { match (&args.leader, &args.follower) { (TestingPlatform::Geth, TestingPlatform::Kitchensink) => { - run_driver::(args, tests, span)? + run_driver::(args, tests, additional_signers, span)? } (TestingPlatform::Geth, TestingPlatform::Geth) => { - run_driver::(args, tests, span)? + run_driver::(args, tests, additional_signers, span)? } _ => unimplemented!(), } diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index a0965f3..1faae0b 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -448,8 +448,8 @@ pub fn resolve_argument( mod tests { use super::*; - use alloy::{json_abi::JsonAbi, network::TxSigner}; - use alloy_primitives::{Signature, address}; + use alloy::json_abi::JsonAbi; + use alloy_primitives::address; use alloy_sol_types::SolValue; use std::collections::HashMap; @@ -459,7 +459,6 @@ mod tests { fn execute_transaction( &self, _: TransactionRequest, - _: Option + Send + Sync + 'static>>, ) -> anyhow::Result { unimplemented!() } diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index 980d6d3..c8c9756 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -7,8 +7,8 @@ use std::{ str::FromStr, }; -use alloy::{network::TxSigner, signers::local::PrivateKeySigner}; -use alloy_primitives::{Address, Signature}; +use alloy::signers::local::PrivateKeySigner; +use alloy_primitives::Address; use revive_dt_node_interaction::EthereumNode; use serde::{Deserialize, Serialize}; @@ -389,7 +389,6 @@ impl EthereumNode for UnimplementedEthereumNode { fn execute_transaction( &self, _: alloy::rpc::types::TransactionRequest, - _: Option + Send + Sync + 'static>>, ) -> anyhow::Result { anyhow::bail!("Unimplemented") } diff --git a/crates/node-interaction/src/lib.rs b/crates/node-interaction/src/lib.rs index 470c67c..8ac488c 100644 --- a/crates/node-interaction/src/lib.rs +++ b/crates/node-interaction/src/lib.rs @@ -1,11 +1,9 @@ //! This crate implements all node interactions. use alloy::eips::BlockNumberOrTag; -use alloy::network::TxSigner; use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256}; use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace}; use alloy::rpc::types::{TransactionReceipt, TransactionRequest}; -use alloy::signers::Signature; use anyhow::Result; mod blocking_executor; @@ -14,13 +12,7 @@ pub use blocking_executor::*; /// An interface for all interactions with Ethereum compatible nodes. pub trait EthereumNode { /// Execute the [TransactionRequest] and return a [TransactionReceipt]. - fn execute_transaction( - &self, - transaction: TransactionRequest, - additional_signers: Option< - impl IntoIterator + Send + Sync + 'static>, - >, - ) -> Result; + fn execute_transaction(&self, transaction: TransactionRequest) -> Result; /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace]. fn trace_transaction( diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 84b100b..2077ef0 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -22,7 +22,7 @@ use alloy::{ TransactionReceipt, TransactionRequest, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::{Signature, local::PrivateKeySigner}, + signers::Signature, }; use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; @@ -196,19 +196,13 @@ impl Instance { fn provider( &self, - additional_signers: Option< - impl IntoIterator + Send + Sync + 'static>, - >, ) -> impl Future< Output = anyhow::Result< FillProvider, impl Provider, Ethereum>, >, > + 'static { let connection_string = self.connection_string(); - let mut wallet = self.wallet.clone(); - for signer in additional_signers.into_iter().flatten() { - wallet.register_signer(signer); - } + 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 @@ -228,16 +222,6 @@ impl Instance { .map_err(Into::into) }) } - - fn provider_no_additional_signers( - &self, - ) -> impl Future< - Output = anyhow::Result< - FillProvider, impl Provider, Ethereum>, - >, - > + 'static { - self.provider(None::>) - } } impl EthereumNode for Instance { @@ -245,11 +229,8 @@ impl EthereumNode for Instance { fn execute_transaction( &self, transaction: TransactionRequest, - additional_signers: Option< - impl IntoIterator + Send + Sync + 'static>, - >, ) -> anyhow::Result { - let provider = self.provider(additional_signers); + let provider = self.provider(); BlockingExecutor::execute(async move { let outer_span = tracing::debug_span!("Submitting transaction", ?transaction); let _outer_guard = outer_span.enter(); @@ -336,7 +317,7 @@ impl EthereumNode for Instance { trace_options: GethDebugTracingOptions, ) -> anyhow::Result { let tx_hash = transaction.transaction_hash; - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { Ok(provider .await? @@ -363,7 +344,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn chain_id(&self) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider.await?.get_chain_id().await.map_err(Into::into) })? @@ -371,7 +352,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -384,7 +365,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result
{ - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -397,7 +378,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -410,7 +391,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -423,7 +404,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -436,7 +417,7 @@ impl EthereumNode for Instance { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn last_block_number(&self) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider.await?.get_block_number().await.map_err(Into::into) })? @@ -444,11 +425,19 @@ impl EthereumNode for Instance { } impl Node for Instance { - fn new(config: &Arguments) -> Self { + fn new( + config: &Arguments, + additional_signers: impl IntoIterator + 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), @@ -459,7 +448,7 @@ impl Node for Instance { handle: None, network_id: config.network_id, start_timeout: config.geth_start_timeout, - wallet: config.wallet(), + wallet, // We know that we only need to be storing 2 files so we can specify that when creating // the vector. It's the stdout and stderr of the geth node. logs_file_to_flush: Vec::with_capacity(2), @@ -524,6 +513,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}; @@ -540,7 +531,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::::with_capacity(0)); node.init(GENESIS_JSON.to_owned()) .expect("Failed to initialize the node") .spawn_process() @@ -550,21 +541,23 @@ mod tests { #[test] fn init_works() { - Instance::new(&test_config().0) + Instance::new(&test_config().0, Vec::::with_capacity(0)) .init(GENESIS_JSON.to_string()) .unwrap(); } #[test] fn spawn_works() { - Instance::new(&test_config().0) + Instance::new(&test_config().0, Vec::::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::::with_capacity(0)) + .version() + .unwrap(); assert!( version.starts_with("geth version"), "expected version string, got: '{version}'" diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 2d835aa..43b4ddd 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -26,7 +26,7 @@ use alloy::{ eth::{Block, Header, Transaction}, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::{Signature, local::PrivateKeySigner}, + signers::Signature, }; use serde::{Deserialize, Serialize}; use serde_json::{Value as JsonValue, json}; @@ -336,9 +336,6 @@ impl KitchensinkNode { fn provider( &self, - additional_signers: Option< - impl IntoIterator + Send + Sync + 'static>, - >, ) -> impl Future< Output = anyhow::Result< FillProvider< @@ -349,10 +346,7 @@ impl KitchensinkNode { >, > + 'static { let connection_string = self.connection_string(); - let mut wallet = self.wallet.clone(); - for signer in additional_signers.into_iter().flatten() { - wallet.register_signer(signer); - } + 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 @@ -377,20 +371,6 @@ impl KitchensinkNode { .map_err(Into::into) }) } - - fn provider_no_additional_signers( - &self, - ) -> impl Future< - Output = anyhow::Result< - FillProvider< - impl TxFiller, - impl Provider, - KitchenSinkNetwork, - >, - >, - > + 'static { - self.provider(None::>) - } } impl EthereumNode for KitchensinkNode { @@ -398,12 +378,9 @@ impl EthereumNode for KitchensinkNode { fn execute_transaction( &self, transaction: alloy::rpc::types::TransactionRequest, - additional_signers: Option< - impl IntoIterator + Send + Sync + 'static>, - >, ) -> anyhow::Result { tracing::debug!(?transaction, "Submitting transaction"); - let provider = self.provider(additional_signers); + let provider = self.provider(); let receipt = BlockingExecutor::execute(async move { Ok(provider .await? @@ -423,7 +400,7 @@ impl EthereumNode for KitchensinkNode { trace_options: GethDebugTracingOptions, ) -> anyhow::Result { let tx_hash = transaction.transaction_hash; - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { Ok(provider .await? @@ -450,7 +427,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn chain_id(&self) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider.await?.get_chain_id().await.map_err(Into::into) })? @@ -458,7 +435,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -471,7 +448,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result
{ - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -484,7 +461,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -497,7 +474,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -510,7 +487,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider .await? @@ -523,7 +500,7 @@ impl EthereumNode for KitchensinkNode { #[tracing::instrument(skip_all, fields(geth_node_id = self.id))] fn last_block_number(&self) -> anyhow::Result { - let provider = self.provider_no_additional_signers(); + let provider = self.provider(); BlockingExecutor::execute(async move { provider.await?.get_block_number().await.map_err(Into::into) })? @@ -531,18 +508,26 @@ impl EthereumNode for KitchensinkNode { } impl Node for KitchensinkNode { - fn new(config: &Arguments) -> Self { + fn new( + config: &Arguments, + additional_signers: impl IntoIterator + 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, @@ -1041,7 +1026,7 @@ impl BlockHeader for KitchenSinkHeader { #[cfg(test)] mod tests { - use alloy::rpc::types::TransactionRequest; + use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner}; use revive_dt_config::Arguments; use std::path::PathBuf; use std::sync::{LazyLock, Mutex}; @@ -1084,7 +1069,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::::with_capacity(0)); node.init(GENESIS_JSON) .expect("Failed to initialize the node") .spawn_process() @@ -1106,10 +1091,7 @@ mod tests { // Arrange let (node, args, _temp_dir) = new_node(); - let provider = node - .provider_no_additional_signers() - .await - .expect("Failed to create provider"); + let provider = node.provider().await.expect("Failed to create provider"); let account_address = args.wallet().default_signer().address(); let transaction = TransactionRequest::default() @@ -1142,7 +1124,8 @@ mod tests { } "#; - let mut dummy_node = KitchensinkNode::new(&test_config().0); + let mut dummy_node = + KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); // Call `init()` dummy_node.init(genesis_content).expect("init failed"); @@ -1186,7 +1169,8 @@ mod tests { } "#; - let node = KitchensinkNode::new(&test_config().0); + let node = + KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); let result = node .extract_balance_from_genesis_file(genesis_json) @@ -1259,7 +1243,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::::with_capacity(0)); node.spawn(GENESIS_JSON.to_string()).unwrap(); } @@ -1267,7 +1251,7 @@ mod tests { fn version_works() { let (config, _temp_dir) = test_config(); - let node = KitchensinkNode::new(&config); + let node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); let version = node.version().unwrap(); assert!( @@ -1280,7 +1264,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::::with_capacity(0)); let version = node.eth_rpc_version().unwrap(); assert!( diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 44eaf19..380f621 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -1,5 +1,6 @@ //! This crate implements the testing nodes. +use alloy::{network::TxSigner, signers::Signature}; use revive_dt_config::Arguments; use revive_dt_node_interaction::EthereumNode; @@ -14,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 + Send + Sync + 'static>, + ) -> Self; /// Spawns a node configured according to the genesis json. /// diff --git a/crates/node/src/pool.rs b/crates/node/src/pool.rs index 10d4d59..363dc29 100644 --- a/crates/node/src/pool.rs +++ b/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 { + pub fn new( + config: &Arguments, + additional_signers: impl IntoIterator + Send + Sync + 'static> + + Clone + + Send + + Sync + + 'static, + ) -> anyhow::Result { 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::(&config, genesis))); + let additional_signers = additional_signers.clone(); + handles.push(thread::spawn(move || { + spawn_node::(&config, additional_signers, genesis) + })); } let mut nodes = Vec::with_capacity(nodes); @@ -60,8 +71,12 @@ where } } -fn spawn_node(args: &Arguments, genesis: String) -> anyhow::Result { - let mut node = T::new(args); +fn spawn_node( + args: &Arguments, + additional_signers: impl IntoIterator + Send + Sync + 'static>, + genesis: String, +) -> anyhow::Result { + let mut node = T::new(args, additional_signers); tracing::info!("starting node: {}", node.connection_string()); node.spawn(genesis)?; Ok(node) From 7cda3416f063effcd3ae47a40f4b113ba54283d0 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Mon, 21 Jul 2025 19:47:17 +0300 Subject: [PATCH 03/19] Cleanup mutability --- crates/core/src/main.rs | 2 +- crates/format/src/input.rs | 10 +++++----- crates/format/src/metadata.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index c161620..2670149 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -47,7 +47,7 @@ fn main() -> anyhow::Result<()> { None } }) { - replacement_map.get(address); + replacement_map.add(address); } case.handle_address_replacement(&mut replacement_map)?; replacement_private_keys.extend( diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index 1faae0b..8de92d4 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -104,7 +104,7 @@ impl ExpectedOutput { pub fn handle_address_replacement( &mut self, - old_to_new_mapping: &mut AddressReplacementMap, + old_to_new_mapping: &AddressReplacementMap, ) -> anyhow::Result<()> { if let Some(ref mut calldata) = self.return_data { calldata.handle_address_replacement(old_to_new_mapping)?; @@ -121,7 +121,7 @@ impl ExpectedOutput { impl Event { pub fn handle_address_replacement( &mut self, - old_to_new_mapping: &mut AddressReplacementMap, + 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()) { @@ -157,7 +157,7 @@ impl Calldata { pub fn handle_address_replacement( &mut self, - old_to_new_mapping: &mut AddressReplacementMap, + old_to_new_mapping: &AddressReplacementMap, ) -> anyhow::Result<()> { match self { Calldata::Single(_) => {} @@ -220,7 +220,7 @@ impl Calldata { impl Expected { pub fn handle_address_replacement( &mut self, - old_to_new_mapping: &mut AddressReplacementMap, + old_to_new_mapping: &AddressReplacementMap, ) -> anyhow::Result<()> { match self { Expected::Calldata(calldata) => { @@ -347,7 +347,7 @@ impl Input { old_to_new_mapping: &mut AddressReplacementMap, ) -> anyhow::Result<()> { if self.caller != default_caller() { - self.caller = old_to_new_mapping.get(self.caller); + self.caller = old_to_new_mapping.add(self.caller); } self.calldata .handle_address_replacement(old_to_new_mapping)?; diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index c8c9756..c62c174 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -339,7 +339,7 @@ impl AddressReplacementMap { self.0.contains_key(address) } - pub fn get(&mut self, address: Address) -> Address { + pub fn add(&mut self, address: Address) -> Address { self.0 .entry(address) .or_insert_with(|| { @@ -355,7 +355,7 @@ impl AddressReplacementMap { .1 } - pub fn resolve(&mut self, value: &str) -> Option
{ + pub fn resolve(&self, value: &str) -> Option
{ // 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. From cb13c3c2cdf4cef231af0f913184a1ec446027bf Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Mon, 21 Jul 2025 20:10:28 +0300 Subject: [PATCH 04/19] Wire up address replacement with rest of code --- crates/core/src/driver/mod.rs | 29 ++++++++++++----------------- crates/core/src/main.rs | 2 +- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index c0626ce..47666fd 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -365,23 +365,7 @@ where let _guard = span.enter(); // Resolving the `input.expected` into a series of expectations that we can then assert on. - let expectations = match input { - // This is a bit of a special case and we have to support it separately on it's own. If - // it's a call to the deployer method, then the tests will assert that it "returns" the - // address of the contract. Deployments do not return the address of the contract but - // the runtime code of the contracts. Therefore, this assertion would always fail. So, - // we replace it with an assertion of "check if it succeeded" - Input { - expected: Some(Expected::Calldata(Calldata::Compound(compound))), - method: Method::Deployer, - .. - } if compound.len() == 1 - && compound - .first() - .is_some_and(|first| first.contains(".address")) => - { - vec![ExpectedOutput::new().with_success()] - } + let mut expectations = match input { Input { expected: Some(Expected::Calldata(calldata)), .. @@ -397,6 +381,17 @@ where Input { expected: None, .. } => vec![ExpectedOutput::new().with_success()], }; + // This is a bit of a special case and we have to support it separately on it's own. If it's + // a call to the deployer method, then the tests will assert that it "returns" the address + // of the contract. Deployments do not return the address of the contract but the runtime + // code of the contracts. Therefore, this assertion would always fail. So, we replace it + // with an assertion of "check if it succeeded" + if let Method::Deployer = &input.method { + for expectation in expectations.iter_mut() { + expectation.return_data = None; + } + } + // Note: we need to do assertions and checks on the output of the last call and this isn't // available in the receipt. The only way to get this information is through tracing on the // node. diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index 2670149..e64ea64 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -59,7 +59,7 @@ fn main() -> anyhow::Result<()> { ); } - for (corpus, tests) in collect_corpora(&args)? { + for (corpus, tests) in corpora { let span = Span::new(corpus, args.clone())?; match &args.compile_only { From dcc43d4ea6e61a886c5365dd8463f0880537ccbc Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Mon, 21 Jul 2025 20:32:14 +0300 Subject: [PATCH 05/19] Implement caller replacement --- Cargo.toml | 3 +- crates/node/src/geth.rs | 13 +++++- crates/node/src/kitchensink.rs | 78 ++++++++++++++++------------------ 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac0bce5..1d2d610 100644 --- a/Cargo.toml +++ b/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] diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 2077ef0..2d82e29 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -11,7 +11,8 @@ use std::{ use alloy::{ eips::BlockNumberOrTag, - network::{Ethereum, EthereumWallet, TxSigner}, + genesis::{Genesis, GenesisAccount}, + network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner}, primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256}, providers::{ Provider, ProviderBuilder, @@ -79,8 +80,16 @@ impl Instance { create_dir_all(&self.base_directory)?; create_dir_all(&self.logs_directory)?; + let mut genesis = serde_json::from_str::(&genesis)?; + for signer_address in + >::signer_addresses(&self.wallet) + { + genesis.alloc.entry(signer_address).or_insert( + GenesisAccount::default().with_balance(1000000000000000000u128.try_into().unwrap()), + ); + } let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE); - 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") diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 43b4ddd..9a2fd86 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -10,10 +10,10 @@ use std::{ use alloy::{ consensus::{BlockHeader, TxEnvelope}, eips::BlockNumberOrTag, - hex, + genesis::{Genesis, GenesisAccount}, network::{ - Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError, TxSigner, - UnbuiltTransactionError, + Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder, + TransactionBuilderError, TxSigner, UnbuiltTransactionError, }, primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256}, providers::{ @@ -124,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)?; + for signer_address in + >::signer_addresses(&self.wallet) + { + genesis.alloc.entry(signer_address).or_insert( + GenesisAccount::default() + .with_balance(1000000000000000000u128.try_into().unwrap()), + ); + } + self.extract_balance_from_genesis_file(&genesis)? + }; merged_balances.append(&mut eth_balances); chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] = @@ -238,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> { - 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::()? - }; - let substrate_addr = Self::eth_to_substrate_address(eth_addr)?; - balances.push((substrate_addr.clone(), balance)); - } - Ok(balances) + genesis + .alloc + .iter() + .try_fold(Vec::new(), |mut vec, (address, acc)| { + let substrate_address = Self::eth_to_substrate_address(address); + let balance = acc.balance.try_into()?; + vec.push((substrate_address, balance)); + Ok(vec) + }) } - fn eth_to_substrate_address(eth_addr: &str) -> anyhow::Result { - let eth_bytes = hex::decode(eth_addr.trim_start_matches("0x"))?; - if eth_bytes.len() != 20 { - anyhow::bail!( - "Invalid Ethereum address length: expected 20 bytes, got {}", - eth_bytes.len() - ); - } + fn eth_to_substrate_address(address: &Address) -> String { + let eth_bytes = address.0.0; let mut padded = [0xEEu8; 32]; padded[..20].copy_from_slice(ð_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<()> { @@ -1139,12 +1135,12 @@ mod tests { let contents = fs::read_to_string(&final_chainspec_path).expect("Failed to read chainspec"); // Validate that the Substrate addresses derived from the Ethereum addresses are in the file - let first_eth_addr = - KitchensinkNode::eth_to_substrate_address("90F8bf6A479f320ead074411a4B0e7944Ea8c9C1") - .unwrap(); - let second_eth_addr = - KitchensinkNode::eth_to_substrate_address("Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2") - .unwrap(); + let first_eth_addr = KitchensinkNode::eth_to_substrate_address( + &"90F8bf6A479f320ead074411a4B0e7944Ea8c9C1".parse().unwrap(), + ); + let second_eth_addr = KitchensinkNode::eth_to_substrate_address( + &"Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2".parse().unwrap(), + ); assert!( contents.contains(&first_eth_addr), @@ -1173,7 +1169,7 @@ mod tests { KitchensinkNode::new(&test_config().0, Vec::::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(); @@ -1203,7 +1199,7 @@ mod tests { ]; for eth_addr in eth_addresses { - let ss58 = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap(); + let ss58 = KitchensinkNode::eth_to_substrate_address(ð_addr.parse().unwrap()); println!("Ethereum: {eth_addr} -> Substrate SS58: {ss58}"); } @@ -1231,7 +1227,7 @@ mod tests { ]; for (eth_addr, expected_ss58) in cases { - let result = KitchensinkNode::eth_to_substrate_address(eth_addr).unwrap(); + let result = KitchensinkNode::eth_to_substrate_address(ð_addr.parse().unwrap()); assert_eq!( result, expected_ss58, "Mismatch for Ethereum address {eth_addr}" From a0248b58f3bff5fc89bc2447622f19c5359502c8 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 07:22:44 +0300 Subject: [PATCH 06/19] Switch to callframe trace for exceptions --- crates/core/src/driver/mod.rs | 15 +++++++++------ crates/node-interaction/src/blocking_executor.rs | 10 +++++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index 47666fd..0f76c9b 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -8,7 +8,8 @@ use alloy::network::{Ethereum, TransactionBuilder}; use alloy::primitives::Bytes; use alloy::rpc::types::TransactionReceipt; use alloy::rpc::types::trace::geth::{ - DefaultFrame, GethDebugTracingOptions, GethDefaultTracingOptions, GethTrace, PreStateConfig, + CallFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace, + PreStateConfig, }; use alloy::{ primitives::Address, @@ -399,12 +400,14 @@ where .trace_transaction( execution_receipt, GethDebugTracingOptions { - config: GethDefaultTracingOptions::default().with_enable_return_data(true), + tracer: Some(GethDebugTracerType::BuiltInTracer( + GethDebugBuiltInTracerType::CallTracer, + )), ..Default::default() }, )? - .try_into_default_frame() - .expect("Impossible. We can't request default tracing and get some other type back"); + .try_into_call_frame() + .expect("Impossible - we requested a callframe trace so we must get it back"); for expectation in expectations.iter() { self.handle_input_expectation_item( @@ -425,7 +428,7 @@ where execution_receipt: &TransactionReceipt, node: &T::Blockchain, expectation: &ExpectedOutput, - tracing_result: &DefaultFrame, + tracing_result: &CallFrame, ) -> anyhow::Result<()> { // TODO: We want to respect the compiler version filter on the expected output but would // require some changes to the interfaces of the compiler and such. So, we add it later. @@ -452,7 +455,7 @@ where let expected = expected_calldata .calldata(self.deployed_contracts.entry(case_idx).or_default(), node) .map(Bytes::from)?; - let actual = tracing_result.return_value.clone(); + let actual = tracing_result.output.clone().unwrap_or_default(); if !expected.starts_with(&actual) { tracing::error!(?execution_receipt, %expected, %actual, "Calldata assertion failed"); anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",); diff --git a/crates/node-interaction/src/blocking_executor.rs b/crates/node-interaction/src/blocking_executor.rs index baba0c1..5458bb3 100644 --- a/crates/node-interaction/src/blocking_executor.rs +++ b/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::(); 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 }); + let future = Box::pin( + async move { Box::new(future.await) as Box }.in_current_span(), + ); let task = TaskMessage::new(future, response_tx); if let Err(error) = STATE.tx.send(task) { From 5c957e5ac1cd4094d678b67f93e145f8c7fc6bc3 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 09:07:01 +0300 Subject: [PATCH 07/19] Add a way to skip tests if they don't match the target --- crates/core/src/driver/mod.rs | 56 ++++++++++++++++++---------------- crates/core/src/lib.rs | 4 +-- crates/format/src/case.rs | 10 +++++- crates/format/src/input.rs | 2 +- crates/format/src/metadata.rs | 1 + crates/node/src/geth.rs | 8 +++++ crates/node/src/kitchensink.rs | 8 +++++ crates/node/src/lib.rs | 4 +++ 8 files changed, 63 insertions(+), 30 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index 0f76c9b..d8a2f01 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -26,6 +26,7 @@ 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; @@ -435,16 +436,15 @@ where // 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!( - ?execution_receipt, - expected, - actual, - "Transaction status assertion failed", - ); + tracing::error!(expected, actual, "Transaction status assertion failed",); anyhow::bail!( "Transaction status assertion failed - Expected {expected} but got {actual}", ); @@ -457,7 +457,11 @@ where .map(Bytes::from)?; let actual = tracing_result.output.clone().unwrap_or_default(); if !expected.starts_with(&actual) { - tracing::error!(?execution_receipt, %expected, %actual, "Calldata assertion failed"); + tracing::error!( + %expected, + %actual, + "Calldata assertion failed" + ); anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",); } } @@ -468,12 +472,7 @@ where let expected = expected_events.len(); let actual = execution_receipt.logs().len(); if actual != expected { - tracing::error!( - ?execution_receipt, - expected, - actual, - "Event count assertion failed", - ); + tracing::error!(expected, actual, "Event count assertion failed",); anyhow::bail!( "Event count assertion failed - Expected {expected} but got {actual}", ); @@ -489,7 +488,6 @@ where let actual = actual_event.address(); if actual != expected { tracing::error!( - ?execution_receipt, %expected, %actual, "Event emitter assertion failed", @@ -511,12 +509,7 @@ where .calldata(self.deployed_contracts.entry(case_idx).or_default(), node)?; let actual = actual_topic.to_vec(); if actual != expected { - tracing::error!( - ?execution_receipt, - ?expected, - ?actual, - "Event topics assertion failed", - ); + tracing::error!(?expected, ?actual, "Event topics assertion failed",); anyhow::bail!( "Event topics assertion failed - Expected {expected:?} but got {actual:?}", ); @@ -530,12 +523,7 @@ where .map(Bytes::from)?; let actual = &actual_event.data().data; if !expected.starts_with(actual) { - tracing::error!( - ?execution_receipt, - ?expected, - ?actual, - "Event value assertion failed", - ); + tracing::error!(?expected, ?actual, "Event value assertion failed",); anyhow::bail!( "Event value assertion failed - Expected {expected:?} but got {actual:?}", ); @@ -649,6 +637,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(); diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index e9bcdd1..f7df15c 100644 --- a/crates/core/src/lib.rs +++ b/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]. diff --git a/crates/format/src/case.rs b/crates/format/src/case.rs index 4a5802b..998c1d8 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -26,7 +26,15 @@ impl Case { .enumerate() .map(move |(idx, mut input)| { if idx + 1 == inputs_len { - input.expected = self.expected.clone(); + 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 diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index e682243..e3d06e5 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -324,7 +324,7 @@ impl Input { chain_state_provider: &impl EthereumNode, ) -> anyhow::Result { let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?; - let transaction_request = TransactionRequest::default(); + let transaction_request = TransactionRequest::default().from(self.caller); match self.method { Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)), _ => Ok(transaction_request diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index c62c174..12b2316 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -48,6 +48,7 @@ impl Deref for MetadataFile { #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)] pub struct Metadata { + pub targets: Option>, pub cases: Vec, pub contracts: Option>, // TODO: Convert into wrapper types for clarity. diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 2d82e29..24c26ff 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -510,6 +510,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 { diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 9a2fd86..6977036 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -584,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 { diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 380f621..4b43474 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -35,4 +35,8 @@ pub trait Node: EthereumNode { /// Returns the node version. fn version(&self) -> anyhow::Result; + + /// 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; } From e7ebe4fa2f8f7649d48917b65fc1d097d3506fb4 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 09:24:09 +0300 Subject: [PATCH 08/19] Handle values from the metadata files --- crates/core/src/driver/mod.rs | 6 +++++ crates/format/src/input.rs | 48 ++++++++++++++++++++++++++++++---- crates/node/src/geth.rs | 3 ++- crates/node/src/kitchensink.rs | 2 +- genesis.json | 2 +- 5 files changed, 53 insertions(+), 8 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index d8a2f01..544307f 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -251,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::::with_deploy_code(tx, code) }; diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index e3d06e5..fdf7a54 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -7,13 +7,16 @@ use alloy::{ primitives::{Address, Bytes, U256}, rpc::types::TransactionRequest, }; -use alloy_primitives::FixedBytes; +use alloy_primitives::{FixedBytes, utils::parse_units}; use semver::VersionReq; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use revive_dt_node_interaction::EthereumNode; -use crate::metadata::{AddressReplacementMap, 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, - pub value: Option, + pub value: Option, pub storage: Option>, } @@ -82,6 +85,37 @@ 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(&self, serializer: S) -> Result + where + S: serde::Serializer, + { + format!("{} wei", self.0).serialize(serializer) + } +} + +impl<'de> Deserialize<'de> for EtherValue { + fn deserialize(deserializer: D) -> Result + 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() @@ -324,7 +358,11 @@ impl Input { chain_state_provider: &impl EthereumNode, ) -> anyhow::Result { let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?; - let transaction_request = TransactionRequest::default().from(self.caller); + 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 diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 24c26ff..8a1dd38 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -85,7 +85,8 @@ impl Instance { >::signer_addresses(&self.wallet) { genesis.alloc.entry(signer_address).or_insert( - GenesisAccount::default().with_balance(1000000000000000000u128.try_into().unwrap()), + GenesisAccount::default() + .with_balance(10000000000000000000000u128.try_into().unwrap()), ); } let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE); diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 6977036..91dec27 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -131,7 +131,7 @@ impl KitchensinkNode { { genesis.alloc.entry(signer_address).or_insert( GenesisAccount::default() - .with_balance(1000000000000000000u128.try_into().unwrap()), + .with_balance(10000000000000000000000u128.try_into().unwrap()), ); } self.extract_balance_from_genesis_file(&genesis)? diff --git a/genesis.json b/genesis.json index ae85d1f..9993430 100644 --- a/genesis.json +++ b/genesis.json @@ -35,7 +35,7 @@ "timestamp": "0x00", "alloc": { "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": { - "balance": "1000000000000000000" + "balance": "10000000000000000000000" } } } \ No newline at end of file From 52042dfff5f439531cbb99f325e14e2697d8cf1e Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 14:34:22 +0300 Subject: [PATCH 09/19] Remove address replacement --- crates/config/src/lib.rs | 6 ++ crates/core/src/main.rs | 86 +++----------------- crates/format/src/input.rs | 96 +--------------------- crates/format/src/metadata.rs | 140 +-------------------------------- crates/node/src/geth.rs | 28 +++---- crates/node/src/kitchensink.rs | 35 +++++---- crates/node/src/lib.rs | 6 +- crates/node/src/pool.rs | 23 +----- 8 files changed, 55 insertions(+), 365 deletions(-) diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 7f1c92e..9cc51df 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -73,6 +73,12 @@ 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(short, long = "account", 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, diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index e64ea64..c8403af 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -1,13 +1,5 @@ -use std::{ - collections::{HashMap, HashSet}, - sync::LazyLock, -}; +use std::{collections::HashMap, sync::LazyLock}; -use alloy::{ - network::TxSigner, - primitives::FixedBytes, - signers::{Signature, local::PrivateKeySigner}, -}; use clap::Parser; use rayon::{ThreadPoolBuilder, prelude::*}; @@ -16,11 +8,7 @@ use revive_dt_core::{ Geth, Kitchensink, Platform, driver::{Driver, State}, }; -use revive_dt_format::{ - corpus::Corpus, - input::default_caller, - metadata::{AddressReplacementMap, MetadataFile}, -}; +use revive_dt_format::{corpus::Corpus, metadata::MetadataFile}; use revive_dt_node::pool::NodePool; use revive_dt_report::reporter::{Report, Span}; use temp_dir::TempDir; @@ -32,48 +20,12 @@ static TEMP_DIR: LazyLock = LazyLock::new(|| TempDir::new().unwrap()); fn main() -> anyhow::Result<()> { let args = init_cli()?; - let mut corpora = collect_corpora(&args)?; - let mut replacement_private_keys = HashSet::>::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 { + 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, - replacement_private_keys - .clone() - .into_iter() - .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail")) - .collect::>(), - span, - )?, + None => execute_corpus(&args, &tests, span)?, } Report::save()?; @@ -131,24 +83,15 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result( - args: &Arguments, - tests: &[MetadataFile], - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - span: Span, -) -> anyhow::Result<()> +fn run_driver(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> where L: Platform, F: Platform, L::Blockchain: revive_dt_node::Node + Send + Sync + 'static, F::Blockchain: revive_dt_node::Node + Send + Sync + 'static, { - let leader_nodes = NodePool::::new(args, additional_signers.clone())?; - let follower_nodes = NodePool::::new(args, additional_signers)?; + let leader_nodes = NodePool::::new(args)?; + let follower_nodes = NodePool::::new(args)?; tests.par_iter().for_each( |MetadataFile { @@ -198,22 +141,13 @@ where Ok(()) } -fn execute_corpus( - args: &Arguments, - tests: &[MetadataFile], - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - span: Span, -) -> anyhow::Result<()> { +fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> { match (&args.leader, &args.follower) { (TestingPlatform::Geth, TestingPlatform::Kitchensink) => { - run_driver::(args, tests, additional_signers, span)? + run_driver::(args, tests, span)? } (TestingPlatform::Geth, TestingPlatform::Geth) => { - run_driver::(args, tests, additional_signers, span)? + run_driver::(args, tests, span)? } _ => unimplemented!(), } diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index e682243..71f8f61 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -13,7 +13,7 @@ use serde::Deserialize; use revive_dt_node_interaction::EthereumNode; -use crate::metadata::{AddressReplacementMap, ContractInstance}; +use crate::metadata::ContractInstance; #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)] pub struct Input { @@ -101,41 +101,6 @@ impl ExpectedOutput { self.return_data = Some(calldata); self } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - if let Some(ref mut calldata) = self.return_data { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut events) = self.events { - for event in events.iter_mut() { - event.handle_address_replacement(old_to_new_mapping)?; - } - } - Ok(()) - } -} - -impl Event { - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - if let Some(ref mut address) = self.address { - if let Some(new_address) = old_to_new_mapping.resolve(address.to_string().as_str()) { - *address = new_address - } - }; - for topic in self.topics.iter_mut() { - if let Some(new_address) = old_to_new_mapping.resolve(topic.to_string().as_str()) { - *topic = new_address.to_string(); - } - } - self.values.handle_address_replacement(old_to_new_mapping)?; - Ok(()) - } } impl Default for Calldata { @@ -155,23 +120,6 @@ impl Calldata { } } - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - match self { - Calldata::Single(_) => {} - Calldata::Compound(items) => { - for item in items.iter_mut() { - if let Some(resolved) = old_to_new_mapping.resolve(item) { - *item = resolved.to_string() - } - } - } - } - Ok(()) - } - pub fn calldata( &self, deployed_contracts: &HashMap, @@ -217,27 +165,7 @@ impl Calldata { } } -impl Expected { - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - match self { - Expected::Calldata(calldata) => { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - Expected::Expected(expected_output) => { - expected_output.handle_address_replacement(old_to_new_mapping)?; - } - Expected::ExpectedMany(expected_outputs) => { - for expected_output in expected_outputs.iter_mut() { - expected_output.handle_address_replacement(old_to_new_mapping)?; - } - } - } - Ok(()) - } -} +impl Expected {} impl Input { fn instance_to_address( @@ -341,26 +269,6 @@ impl Input { vec } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &mut AddressReplacementMap, - ) -> anyhow::Result<()> { - if self.caller != default_caller() { - self.caller = old_to_new_mapping.add(self.caller); - } - self.calldata - .handle_address_replacement(old_to_new_mapping)?; - if let Some(ref mut expected) = self.expected { - expected.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut storage) = self.storage { - for calldata in storage.values_mut() { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - } - Ok(()) - } } fn default_instance() -> ContractInstance { diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index c62c174..abd4150 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -1,5 +1,5 @@ use std::{ - collections::{BTreeMap, HashMap}, + collections::BTreeMap, fmt::Display, fs::{File, read_to_string}, ops::Deref, @@ -7,15 +7,11 @@ 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}, }; @@ -214,17 +210,6 @@ 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!( @@ -323,129 +308,6 @@ impl From for String { } } -#[derive(Clone, Debug, Default)] -pub struct AddressReplacementMap(HashMap); - -impl AddressReplacementMap { - pub fn new() -> Self { - Self(Default::default()) - } - - pub fn into_inner(self) -> HashMap { - 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
{ - // 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> for AddressReplacementMap { - fn as_ref(&self) -> &HashMap { - &self.0 - } -} - -struct UnimplementedEthereumNode; - -impl EthereumNode for UnimplementedEthereumNode { - fn execute_transaction( - &self, - _: alloy::rpc::types::TransactionRequest, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn chain_id(&self) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result
{ - anyhow::bail!("Unimplemented") - } - - fn block_difficulty( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_hash( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_timestamp( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn last_block_number(&self) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn trace_transaction( - &self, - _: &alloy::rpc::types::TransactionReceipt, - _: alloy::rpc::types::trace::geth::GethDebugTracingOptions, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn state_diff( - &self, - _: &alloy::rpc::types::TransactionReceipt, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } -} - #[cfg(test)] mod test { use super::*; diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 2d82e29..c0338cc 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -12,8 +12,8 @@ use std::{ use alloy::{ eips::BlockNumberOrTag, genesis::{Genesis, GenesisAccount}, - network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner}, - primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256}, + network::{Ethereum, EthereumWallet, NetworkWallet}, + primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256}, providers::{ Provider, ProviderBuilder, ext::DebugApi, @@ -23,7 +23,7 @@ use alloy::{ TransactionReceipt, TransactionRequest, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::Signature, + signers::local::PrivateKeySigner, }; use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; @@ -434,16 +434,17 @@ impl EthereumNode for Instance { } impl Node for Instance { - fn new( - config: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self { + fn new(config: &Arguments) -> 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 { + 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); } @@ -523,7 +524,6 @@ impl Drop for Instance { mod tests { use revive_dt_config::Arguments; - use alloy::signers::local::PrivateKeySigner; use temp_dir::TempDir; use crate::{GENESIS_JSON, Node}; @@ -540,7 +540,7 @@ mod tests { fn new_node() -> (Instance, TempDir) { let (args, temp_dir) = test_config(); - let mut node = Instance::new(&args, Vec::::with_capacity(0)); + let mut node = Instance::new(&args); node.init(GENESIS_JSON.to_owned()) .expect("Failed to initialize the node") .spawn_process() @@ -550,23 +550,21 @@ mod tests { #[test] fn init_works() { - Instance::new(&test_config().0, Vec::::with_capacity(0)) + Instance::new(&test_config().0) .init(GENESIS_JSON.to_string()) .unwrap(); } #[test] fn spawn_works() { - Instance::new(&test_config().0, Vec::::with_capacity(0)) + Instance::new(&test_config().0) .spawn(GENESIS_JSON.to_string()) .unwrap(); } #[test] fn version_works() { - let version = Instance::new(&test_config().0, Vec::::with_capacity(0)) - .version() - .unwrap(); + let version = Instance::new(&test_config().0).version().unwrap(); assert!( version.starts_with("geth version"), "expected version string, got: '{version}'" diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 9a2fd86..c21e2ff 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -13,9 +13,11 @@ use alloy::{ genesis::{Genesis, GenesisAccount}, network::{ Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder, - TransactionBuilderError, TxSigner, UnbuiltTransactionError, + TransactionBuilderError, UnbuiltTransactionError, + }, + primitives::{ + Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256, }, - primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256}, providers::{ Provider, ProviderBuilder, ext::DebugApi, @@ -26,7 +28,7 @@ use alloy::{ eth::{Block, Header, Transaction}, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::Signature, + signers::local::PrivateKeySigner, }; use serde::{Deserialize, Serialize}; use serde_json::{Value as JsonValue, json}; @@ -504,17 +506,18 @@ impl EthereumNode for KitchensinkNode { } impl Node for KitchensinkNode { - fn new( - config: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self { + fn new(config: &Arguments) -> Self { let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY); let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst); let base_directory = kitchensink_directory.join(id.to_string()); let logs_directory = base_directory.join(Self::LOGS_DIRECTORY); let mut wallet = config.wallet(); - for signer in additional_signers { + 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); } @@ -1022,7 +1025,7 @@ impl BlockHeader for KitchenSinkHeader { #[cfg(test)] mod tests { - use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner}; + use alloy::rpc::types::TransactionRequest; use revive_dt_config::Arguments; use std::path::PathBuf; use std::sync::{LazyLock, Mutex}; @@ -1065,7 +1068,7 @@ mod tests { let _guard = NODE_START_MUTEX.lock().unwrap(); let (args, temp_dir) = test_config(); - let mut node = KitchensinkNode::new(&args, Vec::::with_capacity(0)); + let mut node = KitchensinkNode::new(&args); node.init(GENESIS_JSON) .expect("Failed to initialize the node") .spawn_process() @@ -1120,8 +1123,7 @@ mod tests { } "#; - let mut dummy_node = - KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); + let mut dummy_node = KitchensinkNode::new(&test_config().0); // Call `init()` dummy_node.init(genesis_content).expect("init failed"); @@ -1165,8 +1167,7 @@ mod tests { } "#; - let node = - KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&test_config().0); let result = node .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap()) @@ -1239,7 +1240,7 @@ mod tests { fn spawn_works() { let (config, _temp_dir) = test_config(); - let mut node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let mut node = KitchensinkNode::new(&config); node.spawn(GENESIS_JSON.to_string()).unwrap(); } @@ -1247,7 +1248,7 @@ mod tests { fn version_works() { let (config, _temp_dir) = test_config(); - let node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&config); let version = node.version().unwrap(); assert!( @@ -1260,7 +1261,7 @@ mod tests { fn eth_rpc_version_works() { let (config, _temp_dir) = test_config(); - let node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&config); let version = node.eth_rpc_version().unwrap(); assert!( diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 380f621..44eaf19 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -1,6 +1,5 @@ //! This crate implements the testing nodes. -use alloy::{network::TxSigner, signers::Signature}; use revive_dt_config::Arguments; use revive_dt_node_interaction::EthereumNode; @@ -15,10 +14,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, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self; + fn new(config: &Arguments) -> Self; /// Spawns a node configured according to the genesis json. /// diff --git a/crates/node/src/pool.rs b/crates/node/src/pool.rs index 363dc29..10d4d59 100644 --- a/crates/node/src/pool.rs +++ b/crates/node/src/pool.rs @@ -6,7 +6,6 @@ use std::{ thread, }; -use alloy::{network::TxSigner, signers::Signature}; use anyhow::Context; use revive_dt_config::Arguments; @@ -24,14 +23,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, - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - ) -> anyhow::Result { + pub fn new(config: &Arguments) -> anyhow::Result { let nodes = config.workers; let genesis = read_to_string(&config.genesis_file).context(format!( "can not read genesis file: {}", @@ -42,10 +34,7 @@ where for _ in 0..nodes { let config = config.clone(); let genesis = genesis.clone(); - let additional_signers = additional_signers.clone(); - handles.push(thread::spawn(move || { - spawn_node::(&config, additional_signers, genesis) - })); + handles.push(thread::spawn(move || spawn_node::(&config, genesis))); } let mut nodes = Vec::with_capacity(nodes); @@ -71,12 +60,8 @@ where } } -fn spawn_node( - args: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - genesis: String, -) -> anyhow::Result { - let mut node = T::new(args, additional_signers); +fn spawn_node(args: &Arguments, genesis: String) -> anyhow::Result { + let mut node = T::new(args); tracing::info!("starting node: {}", node.connection_string()); node.spawn(genesis)?; Ok(node) From 0722791a28e1d1fad2169106459a315bb780f8f2 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 14:37:02 +0300 Subject: [PATCH 10/19] Correct the arguments --- crates/config/src/lib.rs | 2 +- crates/format/src/case.rs | 14 -------------- crates/format/src/input.rs | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 9cc51df..61211ad 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -76,7 +76,7 @@ pub struct Arguments { /// 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(short, long = "account", default_value_t = 30)] + #[arg(short, long = "private-keys-count", default_value_t = 30)] pub private_keys_to_add: usize, /// The differential testing leader node implementation. diff --git a/crates/format/src/case.rs b/crates/format/src/case.rs index 4a5802b..6b2f107 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -3,7 +3,6 @@ use serde::Deserialize; use crate::{ define_wrapper_type, input::{Expected, Input}, - metadata::AddressReplacementMap, mode::Mode, }; @@ -33,19 +32,6 @@ impl Case { } }) } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &mut AddressReplacementMap, - ) -> anyhow::Result<()> { - for input in self.inputs.iter_mut() { - input.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut expected) = self.expected { - expected.handle_address_replacement(old_to_new_mapping)?; - } - Ok(()) - } } define_wrapper_type!( diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index 71f8f61..c6fa304 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -289,7 +289,7 @@ pub const 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 -pub fn resolve_argument( +fn resolve_argument( value: &str, deployed_contracts: &HashMap, chain_state_provider: &impl EthereumNode, From ac94c972dec0a0cf09ffe629bf1dfb57c5facf3d Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 15:13:38 +0300 Subject: [PATCH 11/19] Remove empty impl --- crates/format/src/input.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index c6fa304..14ca93e 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -165,8 +165,6 @@ impl Calldata { } } -impl Expected {} - impl Input { fn instance_to_address( &self, From 0392b6b629dc14194b1b54b6a8fd8987468b0df8 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 14:34:22 +0300 Subject: [PATCH 12/19] Remove address replacement --- crates/config/src/lib.rs | 6 ++ crates/core/src/main.rs | 86 +++----------------- crates/format/src/input.rs | 99 +---------------------- crates/format/src/metadata.rs | 140 +-------------------------------- crates/node/src/geth.rs | 28 +++---- crates/node/src/kitchensink.rs | 35 +++++---- crates/node/src/lib.rs | 6 +- crates/node/src/pool.rs | 23 +----- 8 files changed, 55 insertions(+), 368 deletions(-) diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 7f1c92e..9cc51df 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -73,6 +73,12 @@ 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(short, long = "account", 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, diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index e64ea64..c8403af 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -1,13 +1,5 @@ -use std::{ - collections::{HashMap, HashSet}, - sync::LazyLock, -}; +use std::{collections::HashMap, sync::LazyLock}; -use alloy::{ - network::TxSigner, - primitives::FixedBytes, - signers::{Signature, local::PrivateKeySigner}, -}; use clap::Parser; use rayon::{ThreadPoolBuilder, prelude::*}; @@ -16,11 +8,7 @@ use revive_dt_core::{ Geth, Kitchensink, Platform, driver::{Driver, State}, }; -use revive_dt_format::{ - corpus::Corpus, - input::default_caller, - metadata::{AddressReplacementMap, MetadataFile}, -}; +use revive_dt_format::{corpus::Corpus, metadata::MetadataFile}; use revive_dt_node::pool::NodePool; use revive_dt_report::reporter::{Report, Span}; use temp_dir::TempDir; @@ -32,48 +20,12 @@ static TEMP_DIR: LazyLock = LazyLock::new(|| TempDir::new().unwrap()); fn main() -> anyhow::Result<()> { let args = init_cli()?; - let mut corpora = collect_corpora(&args)?; - let mut replacement_private_keys = HashSet::>::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 { + 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, - replacement_private_keys - .clone() - .into_iter() - .map(|bytes| PrivateKeySigner::from_bytes(&bytes).expect("Can't fail")) - .collect::>(), - span, - )?, + None => execute_corpus(&args, &tests, span)?, } Report::save()?; @@ -131,24 +83,15 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result( - args: &Arguments, - tests: &[MetadataFile], - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - span: Span, -) -> anyhow::Result<()> +fn run_driver(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> where L: Platform, F: Platform, L::Blockchain: revive_dt_node::Node + Send + Sync + 'static, F::Blockchain: revive_dt_node::Node + Send + Sync + 'static, { - let leader_nodes = NodePool::::new(args, additional_signers.clone())?; - let follower_nodes = NodePool::::new(args, additional_signers)?; + let leader_nodes = NodePool::::new(args)?; + let follower_nodes = NodePool::::new(args)?; tests.par_iter().for_each( |MetadataFile { @@ -198,22 +141,13 @@ where Ok(()) } -fn execute_corpus( - args: &Arguments, - tests: &[MetadataFile], - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - span: Span, -) -> anyhow::Result<()> { +fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> { match (&args.leader, &args.follower) { (TestingPlatform::Geth, TestingPlatform::Kitchensink) => { - run_driver::(args, tests, additional_signers, span)? + run_driver::(args, tests, span)? } (TestingPlatform::Geth, TestingPlatform::Geth) => { - run_driver::(args, tests, additional_signers, span)? + run_driver::(args, tests, span)? } _ => unimplemented!(), } diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index fdf7a54..ad59177 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -13,10 +13,7 @@ use serde::{Deserialize, Serialize}; use revive_dt_node_interaction::EthereumNode; -use crate::{ - define_wrapper_type, - metadata::{AddressReplacementMap, ContractInstance}, -}; +use crate::{define_wrapper_type, metadata::ContractInstance}; #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)] pub struct Input { @@ -135,41 +132,6 @@ impl ExpectedOutput { self.return_data = Some(calldata); self } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - if let Some(ref mut calldata) = self.return_data { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut events) = self.events { - for event in events.iter_mut() { - event.handle_address_replacement(old_to_new_mapping)?; - } - } - Ok(()) - } -} - -impl Event { - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - if let Some(ref mut address) = self.address { - if let Some(new_address) = old_to_new_mapping.resolve(address.to_string().as_str()) { - *address = new_address - } - }; - for topic in self.topics.iter_mut() { - if let Some(new_address) = old_to_new_mapping.resolve(topic.to_string().as_str()) { - *topic = new_address.to_string(); - } - } - self.values.handle_address_replacement(old_to_new_mapping)?; - Ok(()) - } } impl Default for Calldata { @@ -189,23 +151,6 @@ impl Calldata { } } - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - match self { - Calldata::Single(_) => {} - Calldata::Compound(items) => { - for item in items.iter_mut() { - if let Some(resolved) = old_to_new_mapping.resolve(item) { - *item = resolved.to_string() - } - } - } - } - Ok(()) - } - pub fn calldata( &self, deployed_contracts: &HashMap, @@ -251,27 +196,7 @@ impl Calldata { } } -impl Expected { - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &AddressReplacementMap, - ) -> anyhow::Result<()> { - match self { - Expected::Calldata(calldata) => { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - Expected::Expected(expected_output) => { - expected_output.handle_address_replacement(old_to_new_mapping)?; - } - Expected::ExpectedMany(expected_outputs) => { - for expected_output in expected_outputs.iter_mut() { - expected_output.handle_address_replacement(old_to_new_mapping)?; - } - } - } - Ok(()) - } -} +impl Expected {} impl Input { fn instance_to_address( @@ -379,26 +304,6 @@ impl Input { vec } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &mut AddressReplacementMap, - ) -> anyhow::Result<()> { - if self.caller != default_caller() { - self.caller = old_to_new_mapping.add(self.caller); - } - self.calldata - .handle_address_replacement(old_to_new_mapping)?; - if let Some(ref mut expected) = self.expected { - expected.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut storage) = self.storage { - for calldata in storage.values_mut() { - calldata.handle_address_replacement(old_to_new_mapping)?; - } - } - Ok(()) - } } fn default_instance() -> ContractInstance { diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index 12b2316..c1cef62 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -1,5 +1,5 @@ use std::{ - collections::{BTreeMap, HashMap}, + collections::BTreeMap, fmt::Display, fs::{File, read_to_string}, ops::Deref, @@ -7,15 +7,11 @@ 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}, }; @@ -215,17 +211,6 @@ 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!( @@ -324,129 +309,6 @@ impl From for String { } } -#[derive(Clone, Debug, Default)] -pub struct AddressReplacementMap(HashMap); - -impl AddressReplacementMap { - pub fn new() -> Self { - Self(Default::default()) - } - - pub fn into_inner(self) -> HashMap { - 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
{ - // 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> for AddressReplacementMap { - fn as_ref(&self) -> &HashMap { - &self.0 - } -} - -struct UnimplementedEthereumNode; - -impl EthereumNode for UnimplementedEthereumNode { - fn execute_transaction( - &self, - _: alloy::rpc::types::TransactionRequest, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn chain_id(&self) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_coinbase(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result
{ - anyhow::bail!("Unimplemented") - } - - fn block_difficulty( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_hash( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn block_timestamp( - &self, - _: alloy::eips::BlockNumberOrTag, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn last_block_number(&self) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn trace_transaction( - &self, - _: &alloy::rpc::types::TransactionReceipt, - _: alloy::rpc::types::trace::geth::GethDebugTracingOptions, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } - - fn state_diff( - &self, - _: &alloy::rpc::types::TransactionReceipt, - ) -> anyhow::Result { - anyhow::bail!("Unimplemented") - } -} - #[cfg(test)] mod test { use super::*; diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 8a1dd38..794650c 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -12,8 +12,8 @@ use std::{ use alloy::{ eips::BlockNumberOrTag, genesis::{Genesis, GenesisAccount}, - network::{Ethereum, EthereumWallet, NetworkWallet, TxSigner}, - primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256}, + network::{Ethereum, EthereumWallet, NetworkWallet}, + primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256}, providers::{ Provider, ProviderBuilder, ext::DebugApi, @@ -23,7 +23,7 @@ use alloy::{ TransactionReceipt, TransactionRequest, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::Signature, + signers::local::PrivateKeySigner, }; use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; @@ -435,16 +435,17 @@ impl EthereumNode for Instance { } impl Node for Instance { - fn new( - config: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self { + fn new(config: &Arguments) -> 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 { + 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); } @@ -532,7 +533,6 @@ impl Drop for Instance { mod tests { use revive_dt_config::Arguments; - use alloy::signers::local::PrivateKeySigner; use temp_dir::TempDir; use crate::{GENESIS_JSON, Node}; @@ -549,7 +549,7 @@ mod tests { fn new_node() -> (Instance, TempDir) { let (args, temp_dir) = test_config(); - let mut node = Instance::new(&args, Vec::::with_capacity(0)); + let mut node = Instance::new(&args); node.init(GENESIS_JSON.to_owned()) .expect("Failed to initialize the node") .spawn_process() @@ -559,23 +559,21 @@ mod tests { #[test] fn init_works() { - Instance::new(&test_config().0, Vec::::with_capacity(0)) + Instance::new(&test_config().0) .init(GENESIS_JSON.to_string()) .unwrap(); } #[test] fn spawn_works() { - Instance::new(&test_config().0, Vec::::with_capacity(0)) + Instance::new(&test_config().0) .spawn(GENESIS_JSON.to_string()) .unwrap(); } #[test] fn version_works() { - let version = Instance::new(&test_config().0, Vec::::with_capacity(0)) - .version() - .unwrap(); + let version = Instance::new(&test_config().0).version().unwrap(); assert!( version.starts_with("geth version"), "expected version string, got: '{version}'" diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 91dec27..3820f08 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -13,9 +13,11 @@ use alloy::{ genesis::{Genesis, GenesisAccount}, network::{ Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder, - TransactionBuilderError, TxSigner, UnbuiltTransactionError, + TransactionBuilderError, UnbuiltTransactionError, + }, + primitives::{ + Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256, }, - primitives::{Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, U256}, providers::{ Provider, ProviderBuilder, ext::DebugApi, @@ -26,7 +28,7 @@ use alloy::{ eth::{Block, Header, Transaction}, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, - signers::Signature, + signers::local::PrivateKeySigner, }; use serde::{Deserialize, Serialize}; use serde_json::{Value as JsonValue, json}; @@ -504,17 +506,18 @@ impl EthereumNode for KitchensinkNode { } impl Node for KitchensinkNode { - fn new( - config: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self { + fn new(config: &Arguments) -> Self { let kitchensink_directory = config.directory().join(Self::BASE_DIRECTORY); let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst); let base_directory = kitchensink_directory.join(id.to_string()); let logs_directory = base_directory.join(Self::LOGS_DIRECTORY); let mut wallet = config.wallet(); - for signer in additional_signers { + 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); } @@ -1030,7 +1033,7 @@ impl BlockHeader for KitchenSinkHeader { #[cfg(test)] mod tests { - use alloy::{rpc::types::TransactionRequest, signers::local::PrivateKeySigner}; + use alloy::rpc::types::TransactionRequest; use revive_dt_config::Arguments; use std::path::PathBuf; use std::sync::{LazyLock, Mutex}; @@ -1073,7 +1076,7 @@ mod tests { let _guard = NODE_START_MUTEX.lock().unwrap(); let (args, temp_dir) = test_config(); - let mut node = KitchensinkNode::new(&args, Vec::::with_capacity(0)); + let mut node = KitchensinkNode::new(&args); node.init(GENESIS_JSON) .expect("Failed to initialize the node") .spawn_process() @@ -1128,8 +1131,7 @@ mod tests { } "#; - let mut dummy_node = - KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); + let mut dummy_node = KitchensinkNode::new(&test_config().0); // Call `init()` dummy_node.init(genesis_content).expect("init failed"); @@ -1173,8 +1175,7 @@ mod tests { } "#; - let node = - KitchensinkNode::new(&test_config().0, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&test_config().0); let result = node .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap()) @@ -1247,7 +1248,7 @@ mod tests { fn spawn_works() { let (config, _temp_dir) = test_config(); - let mut node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let mut node = KitchensinkNode::new(&config); node.spawn(GENESIS_JSON.to_string()).unwrap(); } @@ -1255,7 +1256,7 @@ mod tests { fn version_works() { let (config, _temp_dir) = test_config(); - let node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&config); let version = node.version().unwrap(); assert!( @@ -1268,7 +1269,7 @@ mod tests { fn eth_rpc_version_works() { let (config, _temp_dir) = test_config(); - let node = KitchensinkNode::new(&config, Vec::::with_capacity(0)); + let node = KitchensinkNode::new(&config); let version = node.eth_rpc_version().unwrap(); assert!( diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 4b43474..8084150 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -1,6 +1,5 @@ //! This crate implements the testing nodes. -use alloy::{network::TxSigner, signers::Signature}; use revive_dt_config::Arguments; use revive_dt_node_interaction::EthereumNode; @@ -15,10 +14,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, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - ) -> Self; + fn new(config: &Arguments) -> Self; /// Spawns a node configured according to the genesis json. /// diff --git a/crates/node/src/pool.rs b/crates/node/src/pool.rs index 363dc29..10d4d59 100644 --- a/crates/node/src/pool.rs +++ b/crates/node/src/pool.rs @@ -6,7 +6,6 @@ use std::{ thread, }; -use alloy::{network::TxSigner, signers::Signature}; use anyhow::Context; use revive_dt_config::Arguments; @@ -24,14 +23,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, - additional_signers: impl IntoIterator + Send + Sync + 'static> - + Clone - + Send - + Sync - + 'static, - ) -> anyhow::Result { + pub fn new(config: &Arguments) -> anyhow::Result { let nodes = config.workers; let genesis = read_to_string(&config.genesis_file).context(format!( "can not read genesis file: {}", @@ -42,10 +34,7 @@ where for _ in 0..nodes { let config = config.clone(); let genesis = genesis.clone(); - let additional_signers = additional_signers.clone(); - handles.push(thread::spawn(move || { - spawn_node::(&config, additional_signers, genesis) - })); + handles.push(thread::spawn(move || spawn_node::(&config, genesis))); } let mut nodes = Vec::with_capacity(nodes); @@ -71,12 +60,8 @@ where } } -fn spawn_node( - args: &Arguments, - additional_signers: impl IntoIterator + Send + Sync + 'static>, - genesis: String, -) -> anyhow::Result { - let mut node = T::new(args, additional_signers); +fn spawn_node(args: &Arguments, genesis: String) -> anyhow::Result { + let mut node = T::new(args); tracing::info!("starting node: {}", node.connection_string()); node.spawn(genesis)?; Ok(node) From c81279fc8f1b69efd579dcb9461081b37cf83cdf Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 14:37:02 +0300 Subject: [PATCH 13/19] Correct the arguments --- crates/config/src/lib.rs | 2 +- crates/format/src/case.rs | 14 -------------- crates/format/src/input.rs | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 9cc51df..61211ad 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -76,7 +76,7 @@ pub struct Arguments { /// 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(short, long = "account", default_value_t = 30)] + #[arg(short, long = "private-keys-count", default_value_t = 30)] pub private_keys_to_add: usize, /// The differential testing leader node implementation. diff --git a/crates/format/src/case.rs b/crates/format/src/case.rs index 998c1d8..29e4ef5 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -3,7 +3,6 @@ use serde::Deserialize; use crate::{ define_wrapper_type, input::{Expected, Input}, - metadata::AddressReplacementMap, mode::Mode, }; @@ -41,19 +40,6 @@ impl Case { } }) } - - pub fn handle_address_replacement( - &mut self, - old_to_new_mapping: &mut AddressReplacementMap, - ) -> anyhow::Result<()> { - for input in self.inputs.iter_mut() { - input.handle_address_replacement(old_to_new_mapping)?; - } - if let Some(ref mut expected) = self.expected { - expected.handle_address_replacement(old_to_new_mapping)?; - } - Ok(()) - } } define_wrapper_type!( diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index ad59177..0420f63 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -324,7 +324,7 @@ pub const 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 -pub fn resolve_argument( +fn resolve_argument( value: &str, deployed_contracts: &HashMap, chain_state_provider: &impl EthereumNode, From 51191013c114925ce5db5b3c9f6ae81da4900275 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Tue, 22 Jul 2025 15:13:38 +0300 Subject: [PATCH 14/19] Remove empty impl --- crates/format/src/input.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index 0420f63..59156e5 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -196,8 +196,6 @@ impl Calldata { } } -impl Expected {} - impl Input { fn instance_to_address( &self, From e434c163c7c917b171eae4b4f5711516e0ae4aee Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 23 Jul 2025 18:39:56 +0300 Subject: [PATCH 15/19] Make initial balance a constant --- crates/node/src/constants.rs | 5 +++++ crates/node/src/geth.rs | 10 +++++----- crates/node/src/kitchensink.rs | 10 +++++----- crates/node/src/lib.rs | 1 + 4 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 crates/node/src/constants.rs diff --git a/crates/node/src/constants.rs b/crates/node/src/constants.rs new file mode 100644 index 0000000..25b5976 --- /dev/null +++ b/crates/node/src/constants.rs @@ -0,0 +1,5 @@ +/// 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; diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 794650c..0745942 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -29,7 +29,7 @@ use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; use tracing::Level; -use crate::{Node, common::FallbackGasFiller}; +use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE}; static NODE_COUNT: AtomicU32 = AtomicU32::new(0); @@ -84,10 +84,10 @@ impl Instance { for signer_address in >::signer_addresses(&self.wallet) { - genesis.alloc.entry(signer_address).or_insert( - GenesisAccount::default() - .with_balance(10000000000000000000000u128.try_into().unwrap()), - ); + genesis + .alloc + .entry(signer_address) + .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE))); } let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE); serde_json::to_writer(File::create(&genesis_path)?, &genesis)?; diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 3820f08..b6294ca 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -39,7 +39,7 @@ use tracing::Level; use revive_dt_config::Arguments; use revive_dt_node_interaction::{BlockingExecutor, EthereumNode}; -use crate::{Node, common::FallbackGasFiller}; +use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE}; static NODE_COUNT: AtomicU32 = AtomicU32::new(0); @@ -131,10 +131,10 @@ impl KitchensinkNode { for signer_address in >::signer_addresses(&self.wallet) { - genesis.alloc.entry(signer_address).or_insert( - GenesisAccount::default() - .with_balance(10000000000000000000000u128.try_into().unwrap()), - ); + genesis + .alloc + .entry(signer_address) + .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE))); } self.extract_balance_from_genesis_file(&genesis)? }; diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 8084150..1232e97 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -4,6 +4,7 @@ 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; From 6303f3b91725c473b27aaa1b757454d8bd692539 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 23 Jul 2025 09:54:58 +0300 Subject: [PATCH 16/19] Fix size_requirement underflow --- crates/format/src/input.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index 59156e5..bd9773a 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -190,7 +190,11 @@ impl Calldata { pub fn size_requirement(&self) -> usize { match self { - Calldata::Single(single) => (single.len() - 2) / 2, + Calldata::Single(single) => single + .len() + .checked_sub(2) + .and_then(|value| value.checked_div(2)) + .unwrap_or_default(), Calldata::Compound(items) => items.len() * 32, } } From 3d28179dde5deb4c3b11f721ee7f51b16573518d Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 23 Jul 2025 10:05:07 +0300 Subject: [PATCH 17/19] Add support for wildcards in exceptions --- crates/core/src/driver/mod.rs | 52 +++++++++++++++++++---------------- crates/format/src/input.rs | 38 +++++++++++++++++++++---- 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index 544307f..745fc25 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -5,7 +5,6 @@ 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, @@ -442,9 +441,8 @@ where // 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(); + 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; @@ -458,17 +456,16 @@ where // Handling the calldata assertion if let Some(ref expected_calldata) = expectation.return_data { - let expected = expected_calldata - .calldata(self.deployed_contracts.entry(case_idx).or_default(), node) - .map(Bytes::from)?; - let actual = tracing_result.output.clone().unwrap_or_default(); - if !expected.starts_with(&actual) { + 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!( - %expected, + ?execution_receipt, + ?expected, %actual, "Calldata assertion failed" ); - anyhow::bail!("Calldata assertion failed - Expected {expected} but got {actual}",); + anyhow::bail!("Calldata assertion failed - Expected {expected:?} but got {actual}",); } } @@ -505,17 +502,24 @@ where } // Handling the topics assertion. - for (expected_topic, actual_topic) in expected_event + for (expected, actual) 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",); + 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:?}", ); @@ -523,13 +527,15 @@ where } // Handling the values assertion. - let expected = &expected_event - .values - .calldata(self.deployed_contracts.entry(case_idx).or_default(), node) - .map(Bytes::from)?; + let expected = &expected_event.values; let actual = &actual_event.data().data; - if !expected.starts_with(actual) { - tracing::error!(?expected, ?actual, "Event value assertion failed",); + if !expected.is_equivalent(&actual.0, deployed_contracts, chain_state_provider)? { + tracing::error!( + ?execution_receipt, + ?expected, + ?actual, + "Event value assertion failed", + ); anyhow::bail!( "Event value assertion failed - Expected {expected:?} but got {actual:?}", ); diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index bd9773a..ce2effc 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -57,7 +57,7 @@ pub struct Event { #[derive(Clone, Debug, Deserialize, Eq, PartialEq)] #[serde(untagged)] pub enum Calldata { - Single(String), + Single(Bytes), Compound(Vec), } @@ -190,14 +190,40 @@ impl Calldata { pub fn size_requirement(&self) -> usize { match self { - Calldata::Single(single) => single - .len() - .checked_sub(2) - .and_then(|value| value.checked_div(2)) - .unwrap_or_default(), + Calldata::Single(single) => single.len(), 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, + chain_state_provider: &impl EthereumNode, + ) -> anyhow::Result { + 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 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 { From ca1ce3e5b41e71fca208a427ed03f1553e180c89 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 23 Jul 2025 10:13:31 +0300 Subject: [PATCH 18/19] Fix calldata construction of single calldata --- crates/format/src/input.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index ce2effc..d16444e 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -168,8 +168,8 @@ impl Calldata { chain_state_provider: &impl EthereumNode, ) -> anyhow::Result<()> { match self { - Calldata::Single(string) => { - alloy::hex::decode_to_slice(string, buffer)?; + Calldata::Single(bytes) => { + buffer.extend_from_slice(bytes); } Calldata::Compound(items) => { for (arg_idx, arg) in items.iter().enumerate() { From 2b6ee18e4076e3ff37913fbe5d5cfc8a4dc3be49 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 23 Jul 2025 14:53:19 +0300 Subject: [PATCH 19/19] Better handling for length in equivalency checks --- crates/format/src/input.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index d16444e..2bc0a88 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -214,8 +214,16 @@ impl Calldata { 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); + let other = U256::from_be_slice(&other); if this != other { return Ok(false); }