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/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/config/src/lib.rs b/crates/config/src/lib.rs index 7f1c92e..61211ad 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 = "private-keys-count", default_value_t = 30)] + pub private_keys_to_add: usize, + /// The differential testing leader node implementation. #[arg(short, long = "leader", default_value = "geth")] pub leader: TestingPlatform, diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs index f07835d..745fc25 100644 --- a/crates/core/src/driver/mod.rs +++ b/crates/core/src/driver/mod.rs @@ -7,7 +7,8 @@ use alloy::json_abi::JsonAbi; use alloy::network::{Ethereum, TransactionBuilder}; 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, @@ -24,6 +25,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; @@ -248,6 +250,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) }; @@ -364,23 +372,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)), .. @@ -396,6 +388,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. @@ -403,12 +406,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( @@ -429,7 +434,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. @@ -443,12 +448,7 @@ where 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,7 @@ where // Handling the calldata assertion if let Some(ref expected_calldata) = expectation.return_data { let expected = expected_calldata; - let actual = &tracing_result.return_value; + let actual = &tracing_result.output.as_ref().unwrap_or_default(); if !expected.is_equivalent(actual, deployed_contracts, chain_state_provider)? { tracing::error!( ?execution_receipt, @@ -475,12 +475,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}", ); @@ -496,7 +491,6 @@ where let actual = actual_event.address(); if actual != expected { tracing::error!( - ?execution_receipt, %expected, %actual, "Event emitter assertion failed", @@ -655,6 +649,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(); @@ -698,6 +708,7 @@ where // For cases if one of the inputs fail then we move on to the next case and we do NOT // bail out of the whole thing. + 'case_loop: for (case_idx, case) in self.metadata.cases.iter().enumerate() { let tracing_span = tracing::info_span!( "Handling case", 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 6b2f107..29e4ef5 100644 --- a/crates/format/src/case.rs +++ b/crates/format/src/case.rs @@ -25,7 +25,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 5ea2acb..2bc0a88 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -7,12 +7,13 @@ use alloy::{ primitives::{Address, Bytes, U256}, rpc::types::TransactionRequest, }; +use alloy_primitives::{FixedBytes, utils::parse_units}; use semver::VersionReq; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use revive_dt_node_interaction::EthereumNode; -use crate::metadata::ContractInstance; +use crate::{define_wrapper_type, metadata::ContractInstance}; #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)] pub struct Input { @@ -25,7 +26,7 @@ pub struct Input { #[serde(default)] pub calldata: Calldata, pub expected: Option, - pub value: Option, + pub value: Option, pub storage: Option>, } @@ -81,6 +82,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() @@ -287,7 +319,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(); + 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 @@ -310,8 +346,10 @@ 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 diff --git a/crates/format/src/metadata.rs b/crates/format/src/metadata.rs index abd4150..c1cef62 100644 --- a/crates/format/src/metadata.rs +++ b/crates/format/src/metadata.rs @@ -44,6 +44,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-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) { 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 1f5e9f1..0745942 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -11,8 +11,9 @@ use std::{ use alloy::{ eips::BlockNumberOrTag, - network::{Ethereum, EthereumWallet}, - primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, U256}, + genesis::{Genesis, GenesisAccount}, + network::{Ethereum, EthereumWallet, NetworkWallet}, + primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256}, providers::{ Provider, ProviderBuilder, ext::DebugApi, @@ -22,12 +23,13 @@ use alloy::{ TransactionReceipt, TransactionRequest, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, + signers::local::PrivateKeySigner, }; 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); @@ -78,8 +80,17 @@ impl Instance { create_dir_all(&self.base_directory)?; create_dir_all(&self.logs_directory)?; + let mut genesis = serde_json::from_str::(&genesis)?; + for signer_address in + >::signer_addresses(&self.wallet) + { + 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); - 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") @@ -429,6 +440,15 @@ impl Node for Instance { let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst); let base_directory = geth_directory.join(id.to_string()); + let mut wallet = config.wallet(); + for signer in (1..=config.private_keys_to_add) + .map(|id| U256::from(id)) + .map(|id| id.to_be_bytes::<32>()) + .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap()) + { + wallet.register_signer(signer); + } + Self { connection_string: base_directory.join(Self::IPC_FILE).display().to_string(), data_directory: base_directory.join(Self::DATA_DIRECTORY), @@ -439,7 +459,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), @@ -492,6 +512,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 { @@ -504,6 +532,7 @@ impl Drop for Instance { #[cfg(test)] mod tests { use revive_dt_config::Arguments; + use temp_dir::TempDir; use crate::{GENESIS_JSON, Node}; diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index 4c9401c..b6294ca 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -10,12 +10,14 @@ use std::{ use alloy::{ consensus::{BlockHeader, TxEnvelope}, eips::BlockNumberOrTag, - hex, + genesis::{Genesis, GenesisAccount}, network::{ - Ethereum, EthereumWallet, Network, TransactionBuilder, TransactionBuilderError, - UnbuiltTransactionError, + Ethereum, EthereumWallet, Network, NetworkWallet, TransactionBuilder, + TransactionBuilderError, 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,6 +28,7 @@ use alloy::{ eth::{Block, Header, Transaction}, trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame}, }, + signers::local::PrivateKeySigner, }; use serde::{Deserialize, Serialize}; use serde_json::{Value as JsonValue, json}; @@ -36,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); @@ -123,7 +126,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(U256::from(INITIAL_BALANCE))); + } + self.extract_balance_from_genesis_file(&genesis)? + }; merged_balances.append(&mut eth_balances); chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"] = @@ -237,42 +251,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<()> { @@ -513,12 +512,21 @@ impl Node for KitchensinkNode { let base_directory = kitchensink_directory.join(id.to_string()); let logs_directory = base_directory.join(Self::LOGS_DIRECTORY); + let mut wallet = config.wallet(); + for signer in (1..=config.private_keys_to_add) + .map(|id| U256::from(id)) + .map(|id| id.to_be_bytes::<32>()) + .map(|id| PrivateKeySigner::from_bytes(&FixedBytes(id)).unwrap()) + { + wallet.register_signer(signer); + } + Self { id, substrate_binary: config.kitchensink.clone(), eth_proxy_binary: config.eth_proxy.clone(), rpc_url: String::new(), - wallet: config.wallet(), + wallet, base_directory, logs_directory, process_substrate: None, @@ -579,6 +587,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 { @@ -634,6 +650,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) } @@ -1123,12 +1145,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), @@ -1156,7 +1178,7 @@ mod tests { let node = KitchensinkNode::new(&test_config().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(); @@ -1186,7 +1208,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}"); } @@ -1214,7 +1236,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}" diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 44eaf19..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; @@ -31,4 +32,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; } 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