Remove unneeded dependency

Cargo.lock

@@ -67,9 +67,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "1.0.22"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad4eb51e7845257b70c51b38ef8d842d5e5e93196701fcbd757577971a043c6"
+checksum = "ae58d888221eecf621595e2096836ce7cfc37be06bfa39d7f64aa6a3ea4c9e5b"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -102,16 +102,15 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3b746060277f3d7f9c36903bb39b593a741cb7afcb0044164c28f0e9b673f0"
+checksum = "ad451f9a70c341d951bca4e811d74dbe1e193897acd17e9dbac1353698cc430b"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
  "alloy-trie",
- "alloy-tx-macros",
  "auto_impl",
  "c-kzg",
  "derive_more 2.0.1",
@@ -127,9 +126,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf98679329fa708fa809ea596db6d974da892b068ad45e48ac1956f582edf946"
+checksum = "142daffb15d5be1a2b20d2cd540edbcef03037b55d4ff69dc06beb4d06286dba"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -141,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10e47f5305ea08c37b1772086c1573e9a0a257227143996841172d37d3831bb"
+checksum = "ebf25443920ecb9728cb087fe4dc04a0b290bd6ac85638c58fe94aba70f1a44e"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -158,7 +157,6 @@ dependencies = [
  "alloy-transport",
  "futures",
  "futures-util",
- "serde_json",
  "thiserror 2.0.12",
 ]
 
@@ -229,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f562a81278a3ed83290e68361f2d1c75d018ae3b8589a314faf9303883e18ec9"
+checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -249,16 +247,15 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc41384e9ab8c9b2fb387c52774d9d432656a28edcda1c2d4083e96051524518"
+checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-serde",
  "alloy-trie",
  "serde",
- "serde_with",
 ]
 
 [[package]]
@@ -275,13 +272,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12c454fcfcd5d26ed3b8cae5933cbee9da5f0b05df19b46d4bd4446d1f082565"
+checksum = "dc08b31ebf9273839bd9a01f9333cbb7a3abb4e820c312ade349dd18bdc79581"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
- "http",
  "serde",
  "serde_json",
  "thiserror 2.0.12",
@@ -290,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d6d39eabe5c7b3d8f23ac47b0b683b99faa4359797114636c66e0743103d05"
+checksum = "ed117b08f0cc190312bf0c38c34cf4f0dabfb4ea8f330071c587cd7160a88cb2"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -316,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3704fa8b7ba9ba3f378d99b3d628c8bc8c2fc431b709947930f154e22a8368b6"
+checksum = "c7162ff7be8649c0c391f4e248d1273e85c62076703a1f3ec7daf76b283d886d"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -340,13 +336,13 @@ dependencies = [
  "derive_more 2.0.1",
  "foldhash",
  "hashbrown 0.15.3",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.2",
+ "rand 0.9.1",
  "ruint",
  "rustc-hash",
  "serde",
@@ -356,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08800e8cbe70c19e2eb7cf3d7ff4b28bdd9b3933f8e1c8136c7d910617ba03bf"
+checksum = "d84eba1fd8b6fe8b02f2acd5dd7033d0f179e304bd722d11e817db570d1fa6c4"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -384,7 +380,6 @@ dependencies = [
  "either",
  "futures",
  "futures-utils-wasm",
- "http",
  "lru",
  "parking_lot",
  "pin-project",
@@ -400,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae68457a2c2ead6bd7d7acb5bf5f1623324b1962d4f8e7b0250657a3c3ab0a0b"
+checksum = "8550f7306e0230fc835eb2ff4af0a96362db4b6fc3f25767d161e0ad0ac765bf"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -443,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162301b5a57d4d8f000bf30f4dcb82f9f468f3e5e846eeb8598dd39e7886932c"
+checksum = "518a699422a3eab800f3dac2130d8f2edba8e4fff267b27a9c7dc6a2b0d313ee"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -453,6 +448,7 @@ dependencies = [
  "alloy-transport",
  "alloy-transport-http",
  "alloy-transport-ipc",
+ "async-stream",
  "futures",
  "pin-project",
  "reqwest",
@@ -462,15 +458,16 @@ dependencies = [
  "tokio-stream",
  "tower",
  "tracing",
+ "tracing-futures",
  "url",
  "wasmtimer",
 ]
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cd8ca94ae7e2b32cc3895d9981f3772aab0b4756aa60e9ed0bcfee50f0e1328"
+checksum = "c000cab4ec26a4b3e29d144e999e1c539c2fa0abed871bf90311eb3466187ca8"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -481,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076b47e834b367d8618c52dd0a0d6a711ddf66154636df394805300af4923b8a"
+checksum = "508b2fbe66d952089aa694e53802327798806498cd29ff88c75135770ecaabfc"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -492,9 +489,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a2a86ad7b7d718c15e79d0779bd255561b6b22968dc5ed2e7c0fbc43bb55fe"
+checksum = "8c832f2e851801093928dbb4b7bd83cd22270faf76b2e080646b806a285c8757"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -502,9 +499,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c2f847e635ec0be819d06e2ada4bcc4e4204026a83c4bfd78ae8d550e027ae7"
+checksum = "fcaf7dff0fdd756a714d58014f4f8354a1706ebf9fa2cf73431e0aeec3c9431e"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -517,15 +514,14 @@ dependencies = [
  "itertools 0.14.0",
  "serde",
  "serde_json",
- "serde_with",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fc58180302a94c934d455eeedb3ecb99cdc93da1dbddcdbbdb79dd6fe618b2a"
+checksum = "6e3507a04e868dd83219ad3cd6a8c58aefccb64d33f426b3934423a206343e84"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -537,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae699248d02ade9db493bbdae61822277dc14ae0f82a5a4153203b60e34422a6"
+checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -548,9 +544,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf7d793c813515e2b627b19a15693960b3ed06670f9f66759396d06ebe5747b"
+checksum = "6b0d2428445ec13edc711909e023d7779618504c4800be055a5b940025dbafe3"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -563,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51a424bc5a11df0d898ce0fd15906b88ebe2a6e4f17a514b51bc93946bb756bd"
+checksum = "e14fe6fedb7fe6e0dfae47fe020684f1d8e063274ef14bca387ddb7a6efa8ec1"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -601,7 +597,7 @@ dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
@@ -652,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f317d20f047b3de4d9728c556e2e9a92c9a507702d2016424cd8be13a74ca5e"
+checksum = "a712bdfeff42401a7dd9518f72f617574c36226a9b5414537fedc34350b73bf9"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -675,9 +671,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff084ac7b1f318c87b579d221f11b748341d68b9ddaa4ffca5e62ed2b8cfefb4"
+checksum = "7ea5a76d7f2572174a382aedf36875bedf60bcc41116c9f031cf08040703a2dc"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -690,9 +686,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.22"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb099cdad8ed2e6a80811cdf9bbf715ebf4e34c981b4a6e2d1f9daacbf8b218"
+checksum = "606af17a7e064d219746f6d2625676122c79d78bf73dfe746d6db9ecd7dbcb85"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -710,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962"
+checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -724,19 +720,6 @@ 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"
@@ -2417,7 +2400,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2859,9 +2842,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.3",
@@ -3285,14 +3268,13 @@ dependencies = [
 
 [[package]]
 name = "nybbles"
-version = "0.4.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "675b3a54e5b12af997abc8b6638b0aee51a28caedab70d4967e0d5db3a3f1d06"
+checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307"
 dependencies = [
  "alloy-rlp",
- "cfg-if",
+ "const-hex",
  "proptest",
- "ruint",
  "serde",
  "smallvec",
 ]
@@ -3737,9 +3719,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -3948,22 +3930,10 @@ dependencies = [
  "serde_stacker",
 ]
 
-[[package]]
-name = "revive-dt-common"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures",
- "once_cell",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "revive-dt-compiler"
 version = "0.1.0"
 dependencies = [
- "alloy-primitives",
  "anyhow",
  "revive-common",
  "revive-dt-config",
@@ -3992,9 +3962,7 @@ dependencies = [
  "alloy",
  "anyhow",
  "clap",
- "indexmap 2.10.0",
  "rayon",
- "revive-dt-common",
  "revive-dt-compiler",
  "revive-dt-config",
  "revive-dt-format",
@@ -4016,7 +3984,6 @@ dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
  "anyhow",
- "revive-dt-common",
  "semver 1.0.26",
  "serde",
  "serde_json",
@@ -4029,11 +3996,8 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
- "revive-dt-common",
  "revive-dt-config",
- "revive-dt-format",
  "revive-dt-node-interaction",
- "serde",
  "serde_json",
  "sp-core",
  "sp-runtime",
@@ -4048,6 +4012,9 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
+ "once_cell",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -4142,7 +4109,7 @@ dependencies = [
  "primitive-types 0.12.2",
  "proptest",
  "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde",
@@ -4537,7 +4504,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5426,7 +5393,7 @@ version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5518,6 +5485,18 @@ dependencies = [
  "valuable",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "futures",
+ "futures-task",
+ "pin-project",
+ "tracing",
+]
+
 [[package]]
 name = "tracing-log"
 version = "0.2.0"

Cargo.toml

@@ -11,7 +11,6 @@ repository = "https://github.com/paritytech/revive-differential-testing.git"
 rust-version = "1.85.0"
 
 [workspace.dependencies]
-revive-dt-common = { version = "0.1.0", path = "crates/common" }
 revive-dt-compiler = { version = "0.1.0", path = "crates/compiler" }
 revive-dt-config = { version = "0.1.0", path = "crates/config" }
 revive-dt-core = { version = "0.1.0", path = "crates/core" }
@@ -26,7 +25,6 @@ alloy-primitives = "1.2.1"
 alloy-sol-types = "1.2.1"
 anyhow = "1.0"
 clap = { version = "4", features = ["derive"] }
-futures = { version = "0.3.31" }
 hex = "0.4.3"
 reqwest = { version = "0.12.15", features = ["blocking", "json"] }
 once_cell = "1.21"
@@ -52,7 +50,6 @@ tracing-subscriber = { version = "0.3.19", default-features = false, features =
     "json",
     "env-filter",
 ] }
-indexmap = { version = "2.10.0", default-features = false }
 
 # revive compiler
 revive-solc-json-interface = { git = "https://github.com/paritytech/revive", rev = "3389865af7c3ff6f29a586d82157e8bc573c1a8e" }
@@ -60,7 +57,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.22"
+version = "1.0"
 default-features = false
 features = [
     "json-abi",
@@ -74,7 +71,6 @@ features = [
     "network",
     "serde",
     "rpc-types-eth",
-    "genesis",
 ]
 
 [profile.bench]

assets/test_metadata.json

@@ -1,326 +0,0 @@
-{
-    "modes": [
-        "Y >=0.8.9",
-        "E",
-        "I"
-    ],
-    "cases": [
-        {
-            "name": "first",
-            "inputs": [
-                {
-                    "instance": "WBTC_1",
-                    "method": "#deployer",
-                    "calldata": [
-                        "0x40",
-                        "0x80",
-                        "4",
-                        "0x5742544300000000000000000000000000000000000000000000000000000000",
-                        "14",
-                        "0x5772617070656420425443000000000000000000000000000000000000000000"
-                    ],
-                    "expected": [
-                        "WBTC_1.address"
-                    ]
-                },
-                {
-                    "instance": "WBTC_2",
-                    "method": "#deployer",
-                    "calldata": [
-                        "0x40",
-                        "0x80",
-                        "4",
-                        "0x5742544300000000000000000000000000000000000000000000000000000000",
-                        "14",
-                        "0x5772617070656420425443000000000000000000000000000000000000000000"
-                    ],
-                    "expected": [
-                        "WBTC_2.address"
-                    ]
-                },
-                {
-                    "instance": "Mooniswap",
-                    "method": "#deployer",
-                    "calldata": [
-                        "0x0000000000000000000000000000000000000000000000000000000000000060",
-                        "0x00000000000000000000000000000000000000000000000000000000000000c0",
-                        "0x0000000000000000000000000000000000000000000000000000000000000100",
-                        "0x0000000000000000000000000000000000000000000000000000000000000002",
-                        "WBTC_1.address",
-                        "WBTC_2.address",
-                        "4",
-                        "0x5742544300000000000000000000000000000000000000000000000000000000",
-                        "14",
-                        "0x5772617070656420425443000000000000000000000000000000000000000000"
-                    ],
-                    "expected": {
-                        "return_data": [
-                            "Mooniswap.address"
-                        ],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
-                                    "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                    "0xdeadbeef01000000000000000000000000000000"
-                                ],
-                                "values": []
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "WBTC_1",
-                    "method": "_mint",
-                    "calldata": [
-                        "0xdeadbeef00000000000000000000000000000042",
-                        "1000000000"
-                    ],
-                    "expected": {
-                        "return_data": [],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                    "0xdeadbeef00000000000000000000000000000042"
-                                ],
-                                "values": [
-                                    "1000000000"
-                                ]
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "WBTC_2",
-                    "method": "_mint",
-                    "calldata": [
-                        "0xdeadbeef00000000000000000000000000000042",
-                        "1000000000"
-                    ],
-                    "expected": {
-                        "return_data": [],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                    "0xdeadbeef00000000000000000000000000000042"
-                                ],
-                                "values": [
-                                    "1000000000"
-                                ]
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "WBTC_1",
-                    "caller": "0xdeadbeef00000000000000000000000000000042",
-                    "method": "approve",
-                    "calldata": [
-                        "Mooniswap.address",
-                        "500000000"
-                    ],
-                    "expected": {
-                        "return_data": [
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                        ],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "500000000"
-                                ]
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "WBTC_2",
-                    "caller": "0xdeadbeef00000000000000000000000000000042",
-                    "method": "approve",
-                    "calldata": [
-                        "Mooniswap.address",
-                        "500000000"
-                    ],
-                    "expected": {
-                        "return_data": [
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                        ],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "500000000"
-                                ]
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "Mooniswap",
-                    "caller": "0xdeadbeef00000000000000000000000000000042",
-                    "method": "deposit",
-                    "calldata": [
-                        "0x0000000000000000000000000000000000000000000000000000000000000040",
-                        "0x00000000000000000000000000000000000000000000000000000000000000a0",
-                        "0x0000000000000000000000000000000000000000000000000000000000000002",
-                        "10000000",
-                        "10000000",
-                        "0x0000000000000000000000000000000000000000000000000000000000000002",
-                        "1000000",
-                        "1000000"
-                    ],
-                    "expected": {
-                        "return_data": [
-                            "10000000"
-                        ],
-                        "events": [
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "1000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "10000000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "490000000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "10000000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
-                                    "0xdeadbeef00000000000000000000000000000042",
-                                    "Mooniswap.address"
-                                ],
-                                "values": [
-                                    "490000000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                                    "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                    "0xdeadbeef00000000000000000000000000000042"
-                                ],
-                                "values": [
-                                    "10000000"
-                                ]
-                            },
-                            {
-                                "topics": [
-                                    "0x2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c4",
-                                    "0xdeadbeef00000000000000000000000000000042"
-                                ],
-                                "values": [
-                                    "10000000"
-                                ]
-                            }
-                        ],
-                        "exception": false
-                    }
-                },
-                {
-                    "instance": "Mooniswap",
-                    "caller": "0xdeadbeef00000000000000000000000000000042",
-                    "method": "swap",
-                    "calldata": [
-                        "WBTC_1.address",
-                        "WBTC_2.address",
-                        "5000",
-                        "5000",
-                        "0"
-                    ]
-                }
-            ],
-            "expected": {
-                "return_data": [
-                    "5000"
-                ],
-                "events": [
-                    {
-                        "topics": [
-                            "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-                            "0xdeadbeef00000000000000000000000000000042",
-                            "Mooniswap.address"
-                        ],
-                        "values": [
-                            "5000"
-                        ]
-                    },
-                    {
-                        "topics": [
-                            "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
-                            "0xdeadbeef00000000000000000000000000000042",
-                            "Mooniswap.address"
-                        ],
-                        "values": [
-                            "489995000"
-                        ]
-                    }
-                ],
-                "exception": false
-            }
-        }
-    ],
-    "contracts": {
-        "Mooniswap": "Mooniswap.sol:Mooniswap",
-        "WBTC_1": "ERC20/ERC20.sol:ERC20",
-        "WBTC_2": "ERC20/ERC20.sol:ERC20",
-        "VirtualBalance": "Mooniswap.sol:VirtualBalance",
-        "Math": "math/Math.sol:Math"
-    },
-    "libraries": {
-        "Mooniswap.sol": {
-            "VirtualBalance": "VirtualBalance"
-        },
-        "math/Math.sol": {
-            "Math": "Math"
-        }
-    },
-    "group": "Real life"
-}

crates/common/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "revive-dt-common"
-description = "A library containing common concepts that other crates in the workspace can rely on"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-
-[dependencies]
-anyhow = { workspace = true }
-futures = { workspace = true }
-tracing = { workspace = true }
-once_cell = { workspace = true }
-tokio = { workspace = true }

crates/common/src/concepts/blocking_executor.rs

@@ -1,225 +0,0 @@
-//! The alloy crate __requires__ a tokio runtime.
-//! We contain any async rust right here.
-
-use std::{any::Any, panic::AssertUnwindSafe, pin::Pin, thread};
-
-use futures::FutureExt;
-use once_cell::sync::Lazy;
-use tokio::{
-    runtime::Builder,
-    sync::{mpsc::UnboundedSender, oneshot},
-};
-use tracing::Instrument;
-
-/// A blocking async executor.
-///
-/// This struct exposes the abstraction of a blocking async executor. It is a global and static
-/// executor which means that it doesn't require for new instances of it to be created, it's a
-/// singleton and can be accessed by any thread that wants to perform some async computation on the
-/// blocking executor thread.
-///
-/// The API of the blocking executor is created in a way so that it's very natural, simple to use,
-/// and unbounded to specific tasks or return types. The following is an example of using this
-/// executor to drive an async computation:
-///
-/// ```rust
-/// use revive_dt_common::concepts::*;
-///
-/// fn blocking_function() {
-///     let result = BlockingExecutor::execute(async move {
-///         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-///         0xFFu8
-///     })
-///     .expect("Computation failed");
-///
-///     assert_eq!(result, 0xFF);
-/// }
-/// ```
-///
-/// Users get to pass in their async tasks without needing to worry about putting them in a [`Box`],
-/// [`Pin`], needing to perform down-casting, or the internal channel mechanism used by the runtime.
-/// To the user, it just looks like a function that converts some async code into sync code.
-///
-/// This struct also handled panics that occur in the passed futures and converts them into errors
-/// that can be handled by the user. This is done to allow the executor to be robust.
-///
-/// Internally, the executor communicates with the tokio runtime thread through channels which carry
-/// the [`TaskMessage`] and the results of the execution.
-pub struct BlockingExecutor;
-
-impl BlockingExecutor {
-    pub fn execute<R>(future: impl Future<Output = R> + Send + 'static) -> Result<R, anyhow::Error>
-    where
-        R: Send + 'static,
-    {
-        // Note: The blocking executor is a singleton and therefore we store its state in a static
-        // so that it's assigned only once. Additionally, when we set the state of the executor we
-        // spawn the thread where the async runtime runs.
-        static STATE: Lazy<ExecutorState> = Lazy::new(|| {
-            tracing::trace!("Initializing the BlockingExecutor state");
-
-            // All communication with the tokio runtime thread happens over mspc channels where the
-            // producers here are the threads that want to run async tasks and the consumer here is
-            // the tokio runtime thread.
-            let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<TaskMessage>();
-
-            thread::spawn(move || {
-                tracing::info!(
-                    thread_id = ?std::thread::current().id(),
-                    "Starting async runtime thread"
-                );
-
-                let runtime = Builder::new_current_thread()
-                    .enable_all()
-                    .build()
-                    .expect("Failed to create the async runtime");
-
-                runtime.block_on(async move {
-                    while let Some(TaskMessage {
-                        future: task,
-                        response_tx: response_channel,
-                    }) = rx.recv().await
-                    {
-                        tracing::trace!("Received a new future to execute");
-                        tokio::spawn(async move {
-                            // One of the things that the blocking executor does is that it allows
-                            // us to catch panics if they occur. By wrapping the given future in an
-                            // AssertUnwindSafe::catch_unwind we are able to catch all panic unwinds
-                            // in the given future and convert them into errors.
-                            let task = AssertUnwindSafe(task).catch_unwind();
-
-                            let result = task.await;
-                            let _ = response_channel.send(result);
-                        });
-                    }
-                })
-            });
-
-            ExecutorState { tx }
-        });
-
-        // We need to perform blocking synchronous communication between the current thread and the
-        // tokio runtime thread with the result of the async computation and the oneshot channels
-        // from tokio allows us to do that. The sender side of the channel will be given to the
-        // tokio runtime thread to send the result when the computation is completed and the receive
-        // side of the channel will be kept with this thread to await for the response of the async
-        // task to come back.
-        let (response_tx, response_rx) =
-            oneshot::channel::<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>();
-
-        // The tokio runtime thread expects a Future<Output = Box<dyn Any + Send>> + Send to be
-        // sent to it to execute. However, this function has a typed Future<Output = R> + Send and
-        // therefore we need to change the type of the future to fit what the runtime thread expects
-        // in the task message. In doing this conversion, we lose some of the type information since
-        // we're converting R => dyn Any. However, we will perform down-casting on the result to
-        // convert it back into R.
-        let future = Box::pin(
-            async move { Box::new(future.await) as Box<dyn Any + Send> }.in_current_span(),
-        );
-
-        let task = TaskMessage::new(future, response_tx);
-        if let Err(error) = STATE.tx.send(task) {
-            tracing::error!(?error, "Failed to send the task to the blocking executor");
-            anyhow::bail!("Failed to send the task to the blocking executor: {error:?}")
-        }
-
-        let result = match response_rx.blocking_recv() {
-            Ok(result) => result,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    "Failed to get the response from the blocking executor"
-                );
-                anyhow::bail!("Failed to get the response from the blocking executor: {error:?}")
-            }
-        };
-
-        let result = match result {
-            Ok(result) => result,
-            Err(error) => {
-                tracing::error!(?error, "An error occurred when running the async task");
-                anyhow::bail!("An error occurred when running the async task: {error:?}")
-            }
-        };
-
-        Ok(*result
-            .downcast::<R>()
-            .expect("An error occurred when downcasting into R. This is a bug"))
-    }
-}
-/// Represents the state of the async runtime. This runtime is designed to be a singleton runtime
-/// which means that in the current running program there's just a single thread that has an async
-/// runtime.
-struct ExecutorState {
-    /// The sending side of the task messages channel. This is used by all of the other threads to
-    /// communicate with the async runtime thread.
-    tx: UnboundedSender<TaskMessage>,
-}
-
-/// Represents a message that contains an asynchronous task that's to be executed by the runtime
-/// as well as a way for the runtime to report back on the result of the execution.
-struct TaskMessage {
-    /// The task that's being requested to run. This is a future that returns an object that does
-    /// implement [`Any`] and [`Send`] to allow it to be sent between the requesting thread and the
-    /// async thread.
-    future: Pin<Box<dyn Future<Output = Box<dyn Any + Send>> + Send>>,
-
-    /// A one shot sender channel where the sender of the task is expecting to hear back on the
-    /// result of the task.
-    response_tx: oneshot::Sender<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>,
-}
-
-impl TaskMessage {
-    pub fn new(
-        future: Pin<Box<dyn Future<Output = Box<dyn Any + Send>> + Send>>,
-        response_tx: oneshot::Sender<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>,
-    ) -> Self {
-        Self {
-            future,
-            response_tx,
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn simple_future_works() {
-        // Act
-        let result = BlockingExecutor::execute(async move {
-            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-            0xFFu8
-        })
-        .unwrap();
-
-        // Assert
-        assert_eq!(result, 0xFFu8);
-    }
-
-    #[test]
-    #[allow(unreachable_code, clippy::unreachable)]
-    fn panics_in_futures_are_caught() {
-        // Act
-        let result = BlockingExecutor::execute(async move {
-            panic!(
-                "If this panic causes, well, a panic, then this is an issue. If it's caught then all good!"
-            );
-            0xFFu8
-        });
-
-        // Assert
-        assert!(result.is_err());
-
-        // Act
-        let result = BlockingExecutor::execute(async move {
-            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
-            0xFFu8
-        })
-        .unwrap();
-
-        // Assert
-        assert_eq!(result, 0xFFu8)
-    }
-}

crates/common/src/concepts/mod.rs

@@ -1,3 +0,0 @@
-mod blocking_executor;
-
-pub use blocking_executor::*;

crates/common/src/iterators/files_with_extension_iterator.rs

@@ -1,73 +0,0 @@
-use std::{borrow::Cow, collections::HashSet, path::PathBuf};
-
-/// An iterator that finds files of a certain extension in the provided directory. You can think of
-/// this a glob pattern similar to: `${path}/**/*.md`
-pub struct FilesWithExtensionIterator {
-    /// The set of allowed extensions that that match the requirement and that should be returned
-    /// when found.
-    allowed_extensions: HashSet<Cow<'static, str>>,
-
-    /// The set of directories to visit next. This iterator does BFS and so these directories will
-    /// only be visited if we can't find any files in our state.
-    directories_to_search: Vec<PathBuf>,
-
-    /// The set of files matching the allowed extensions that were found. If there are entries in
-    /// this vector then they will be returned when the [`Iterator::next`] method is called. If not
-    /// then we visit one of the next directories to visit.
-    files_matching_allowed_extensions: Vec<PathBuf>,
-}
-
-impl FilesWithExtensionIterator {
-    pub fn new(root_directory: PathBuf) -> Self {
-        Self {
-            allowed_extensions: Default::default(),
-            directories_to_search: vec![root_directory],
-            files_matching_allowed_extensions: Default::default(),
-        }
-    }
-
-    pub fn with_allowed_extension(
-        mut self,
-        allowed_extension: impl Into<Cow<'static, str>>,
-    ) -> Self {
-        self.allowed_extensions.insert(allowed_extension.into());
-        self
-    }
-}
-
-impl Iterator for FilesWithExtensionIterator {
-    type Item = PathBuf;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(file_path) = self.files_matching_allowed_extensions.pop() {
-            return Some(file_path);
-        };
-
-        let directory_to_search = self.directories_to_search.pop()?;
-
-        // Read all of the entries in the directory. If we failed to read this dir's entires then we
-        // elect to just ignore it and look in the next directory, we do that by calling the next
-        // method again on the iterator, which is an intentional decision that we made here instead
-        // of panicking.
-        let Ok(dir_entries) = std::fs::read_dir(directory_to_search) else {
-            return self.next();
-        };
-
-        for entry in dir_entries.flatten() {
-            let entry_path = entry.path();
-            if entry_path.is_dir() {
-                self.directories_to_search.push(entry_path)
-            } else if entry_path.is_file()
-                && entry_path.extension().is_some_and(|ext| {
-                    self.allowed_extensions
-                        .iter()
-                        .any(|allowed| ext.eq_ignore_ascii_case(allowed.as_ref()))
-                })
-            {
-                self.files_matching_allowed_extensions.push(entry_path)
-            }
-        }
-
-        self.next()
-    }
-}

crates/common/src/iterators/mod.rs

@@ -1,3 +0,0 @@
-mod files_with_extension_iterator;
-
-pub use files_with_extension_iterator::*;

crates/common/src/lib.rs

@@ -1,6 +0,0 @@
-//! This crate provides common concepts, functionality, types, macros, and more that other crates in
-//! the workspace can benefit from.
-
-pub mod concepts;
-pub mod iterators;
-pub mod macros;

crates/common/src/macros/define_wrapper_type.rs

@@ -1,106 +0,0 @@
-/// Defines wrappers around types.
-///
-/// For example, the macro invocation seen below:
-///
-/// ```rust,ignore
-/// define_wrapper_type!(CaseId => usize);
-/// ```
-///
-/// Would define a wrapper type that looks like the following:
-///
-/// ```rust,ignore
-/// pub struct CaseId(usize);
-/// ```
-///
-/// And would also implement a number of methods on this type making it easier to use.
-///
-/// These wrapper types become very useful as they make the code a lot easier to read.
-///
-/// Take the following as an example:
-///
-/// ```rust,ignore
-/// struct State {
-///     contracts: HashMap<usize, HashMap<String, Vec<u8>>>
-/// }
-/// ```
-///
-/// In the above code it's hard to understand what the various types refer to or what to expect them
-/// to contain.
-///
-/// With these wrapper types we're able to create code that's self-documenting in that the types
-/// tell us what the code is referring to. The above code is transformed into
-///
-/// ```rust,ignore
-/// struct State {
-///     contracts: HashMap<CaseId, HashMap<ContractName, ContractByteCode>>
-/// }
-/// ```
-///
-/// Note that we follow the same syntax for defining wrapper structs but we do not permit the use of
-/// generics.
-#[macro_export]
-macro_rules! define_wrapper_type {
-    (
-        $(#[$meta: meta])*
-        $vis:vis struct $ident: ident($ty: ty);
-    ) => {
-        $(#[$meta])*
-        $vis struct $ident($ty);
-
-        impl $ident {
-            pub fn new(value: impl Into<$ty>) -> Self {
-                Self(value.into())
-            }
-
-            pub fn into_inner(self) -> $ty {
-                self.0
-            }
-
-            pub fn as_inner(&self) -> &$ty {
-                &self.0
-            }
-        }
-
-        impl AsRef<$ty> for $ident {
-            fn as_ref(&self) -> &$ty {
-                &self.0
-            }
-        }
-
-        impl AsMut<$ty> for $ident {
-            fn as_mut(&mut self) -> &mut $ty {
-                &mut self.0
-            }
-        }
-
-        impl std::ops::Deref for $ident {
-            type Target = $ty;
-
-            fn deref(&self) -> &Self::Target {
-                &self.0
-            }
-        }
-
-        impl std::ops::DerefMut for $ident {
-            fn deref_mut(&mut self) -> &mut Self::Target {
-                &mut self.0
-            }
-        }
-
-        impl From<$ty> for $ident {
-            fn from(value: $ty) -> Self {
-                Self(value)
-            }
-        }
-
-        impl From<$ident> for $ty {
-            fn from(value: $ident) -> Self {
-                value.0
-            }
-        }
-    };
-}
-
-/// Technically not needed but this allows for the macro to be found in the `macros` module of the
-/// crate in addition to being found in the root of the crate.
-pub use define_wrapper_type;

crates/common/src/macros/mod.rs

@@ -1,3 +0,0 @@
-mod define_wrapper_type;
-
-pub use define_wrapper_type::*;

crates/compiler/Cargo.toml

@@ -9,13 +9,11 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+anyhow = { workspace = true }
 revive-solc-json-interface = { workspace = true }
 revive-dt-config = { workspace = true }
 revive-dt-solc-binaries = { workspace = true }
 revive-common = { workspace = true }
-
-alloy-primitives = { workspace = true }
-anyhow = { workspace = true }
 semver = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }

crates/compiler/src/lib.rs

@@ -9,7 +9,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use alloy_primitives::Address;
 use revive_dt_config::Arguments;
 
 use revive_common::EVMVersion;
@@ -45,12 +44,9 @@ pub trait SolidityCompiler {
 pub struct CompilerInput<T: PartialEq + Eq + Hash> {
     pub extra_options: T,
     pub input: SolcStandardJsonInput,
-    pub allow_paths: Vec<PathBuf>,
-    pub base_path: Option<PathBuf>,
 }
 
 /// The generic compilation output configuration.
-#[derive(Debug)]
 pub struct CompilerOutput<T: PartialEq + Eq + Hash> {
     /// The solc standard JSON input.
     pub input: CompilerInput<T>,
@@ -87,8 +83,8 @@ where
 pub struct Compiler<T: SolidityCompiler> {
     input: SolcStandardJsonInput,
     extra_options: T::Options,
-    allow_paths: Vec<PathBuf>,
+    allow_paths: Vec<String>,
-    base_path: Option<PathBuf>,
+    base_path: Option<String>,
 }
 
 impl Default for Compiler<solc::Solc> {
@@ -149,42 +145,20 @@ where
         self
     }
 
-    pub fn allow_path(mut self, path: PathBuf) -> Self {
+    pub fn allow_path(mut self, path: String) -> Self {
         self.allow_paths.push(path);
         self
     }
 
-    pub fn base_path(mut self, base_path: PathBuf) -> Self {
+    pub fn base_path(mut self, base_path: String) -> Self {
         self.base_path = Some(base_path);
         self
     }
 
-    pub fn with_library(
-        mut self,
-        scope: impl AsRef<Path>,
-        library_ident: impl AsRef<str>,
-        library_address: Address,
-    ) -> Self {
-        self.input
-            .settings
-            .libraries
-            .get_or_insert_with(Default::default)
-            .entry(scope.as_ref().display().to_string())
-            .or_default()
-            .insert(
-                library_ident.as_ref().to_owned(),
-                library_address.to_string(),
-            );
-
-        self
-    }
-
     pub fn try_build(self, solc_path: PathBuf) -> anyhow::Result<CompilerOutput<T::Options>> {
         T::new(solc_path).build(CompilerInput {
             extra_options: self.extra_options,
             input: self.input,
-            allow_paths: self.allow_paths,
-            base_path: self.base_path,
         })
     }
 

crates/compiler/src/revive_resolc.rs

@@ -10,12 +10,7 @@ use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_solc_json_interface::SolcStandardJsonOutput;
 
-// TODO: I believe that we need to also pass the solc compiler to resolc so that resolc uses the
-// specified solc compiler. I believe that currently we completely ignore the specified solc binary
-// when invoking resolc which doesn't seem right if we're using solc as a compiler frontend.
-
 /// A wrapper around the `resolc` binary, emitting PVM-compatible bytecode.
-#[derive(Debug)]
 pub struct Resolc {
     /// Path to the `resolc` executable
     resolc_path: PathBuf,
@@ -24,32 +19,17 @@ pub struct Resolc {
 impl SolidityCompiler for Resolc {
     type Options = Vec<String>;
 
-    #[tracing::instrument(level = "debug", ret)]
     fn build(
         &self,
         input: CompilerInput<Self::Options>,
     ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-        let mut command = Command::new(&self.resolc_path);
+        let mut child = Command::new(&self.resolc_path)
-        command
+            .arg("--standard-json")
+            .args(&input.extra_options)
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
-            .arg("--standard-json");
+            .spawn()?;
-
-        if let Some(ref base_path) = input.base_path {
-            command.arg("--base-path").arg(base_path);
-        }
-        if !input.allow_paths.is_empty() {
-            command.arg("--allow-paths").arg(
-                input
-                    .allow_paths
-                    .iter()
-                    .map(|path| path.display().to_string())
-                    .collect::<Vec<_>>()
-                    .join(","),
-            );
-        }
-        let mut child = command.spawn()?;
 
         let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
         serde_json::to_writer(stdin_pipe, &input.input)?;
@@ -75,65 +55,13 @@ impl SolidityCompiler for Resolc {
             });
         }
 
-        let mut parsed =
+        let parsed: SolcStandardJsonOutput = serde_json::from_slice(&stdout).map_err(|e| {
-            serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
             anyhow::anyhow!(
                 "failed to parse resolc JSON output: {e}\nstderr: {}",
                 String::from_utf8_lossy(&stderr)
             )
         })?;
 
-        // Detecting if the compiler output contained errors and reporting them through logs and
-        // errors instead of returning the compiler output that might contain errors.
-        for error in parsed.errors.iter().flatten() {
-            if error.severity == "error" {
-                tracing::error!(?error, ?input, "Encountered an error in the compilation");
-                anyhow::bail!("Encountered an error in the compilation: {error}")
-            }
-        }
-
-        // We need to do some post processing on the output to make it in the same format that solc
-        // outputs. More specifically, for each contract, the `.metadata` field should be replaced
-        // with the `.metadata.solc_metadata` field which contains the ABI and other information
-        // about the compiled contracts. We do this because we do not want any downstream logic to
-        // need to differentiate between which compiler is being used when extracting the ABI of the
-        // contracts.
-        if let Some(ref mut contracts) = parsed.contracts {
-            for (contract_path, contracts_map) in contracts.iter_mut() {
-                for (contract_name, contract_info) in contracts_map.iter_mut() {
-                    let Some(metadata) = contract_info.metadata.take() else {
-                        continue;
-                    };
-
-                    // Get the `solc_metadata` in the metadata of the contract.
-                    let Some(solc_metadata) = metadata
-                        .get("solc_metadata")
-                        .and_then(|metadata| metadata.as_str())
-                    else {
-                        tracing::error!(
-                            contract_path,
-                            contract_name,
-                            metadata = serde_json::to_string(&metadata).unwrap(),
-                            "Encountered a contract compiled with resolc that has no solc_metadata"
-                        );
-                        anyhow::bail!(
-                            "Contract {} compiled with resolc that has no solc_metadata",
-                            contract_name
-                        );
-                    };
-
-                    // Replace the original metadata with the new solc_metadata.
-                    contract_info.metadata =
-                        Some(serde_json::Value::String(solc_metadata.to_string()));
-                }
-            }
-        }
-
-        tracing::debug!(
-            output = %serde_json::to_string(&parsed).unwrap(),
-            "Compiled successfully"
-        );
-
         Ok(CompilerOutput {
             input,
             output: parsed,

crates/compiler/src/solc.rs

@@ -9,9 +9,7 @@ use std::{
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_dt_solc_binaries::download_solc;
-use revive_solc_json_interface::SolcStandardJsonOutput;
 
-#[derive(Debug)]
 pub struct Solc {
     solc_path: PathBuf,
 }
@@ -19,32 +17,16 @@ pub struct Solc {
 impl SolidityCompiler for Solc {
     type Options = ();
 
-    #[tracing::instrument(level = "debug", ret)]
     fn build(
         &self,
         input: CompilerInput<Self::Options>,
     ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-        let mut command = Command::new(&self.solc_path);
+        let mut child = Command::new(&self.solc_path)
-        command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
-            .arg("--standard-json");
+            .arg("--standard-json")
-
+            .spawn()?;
-        if let Some(ref base_path) = input.base_path {
-            command.arg("--base-path").arg(base_path);
-        }
-        if !input.allow_paths.is_empty() {
-            command.arg("--allow-paths").arg(
-                input
-                    .allow_paths
-                    .iter()
-                    .map(|path| path.display().to_string())
-                    .collect::<Vec<_>>()
-                    .join(","),
-            );
-        }
-        let mut child = command.spawn()?;
 
         let stdin = child.stdin.as_mut().expect("should be piped");
         serde_json::to_writer(stdin, &input.input)?;
@@ -60,31 +42,9 @@ impl SolidityCompiler for Solc {
             });
         }
 
-        let parsed =
-            serde_json::from_slice::<SolcStandardJsonOutput>(&output.stdout).map_err(|e| {
-                anyhow::anyhow!(
-                    "failed to parse resolc JSON output: {e}\nstderr: {}",
-                    String::from_utf8_lossy(&output.stdout)
-                )
-            })?;
-
-        // Detecting if the compiler output contained errors and reporting them through logs and
-        // errors instead of returning the compiler output that might contain errors.
-        for error in parsed.errors.iter().flatten() {
-            if error.severity == "error" {
-                tracing::error!(?error, ?input, "Encountered an error in the compilation");
-                anyhow::bail!("Encountered an error in the compilation: {error}")
-            }
-        }
-
-        tracing::debug!(
-            output = %String::from_utf8_lossy(&output.stdout).to_string(),
-            "Compiled successfully"
-        );
-
         Ok(CompilerOutput {
             input,
-            output: parsed,
+            output: serde_json::from_slice(&output.stdout)?,
             error: None,
         })
     }

crates/config/src/lib.rs

@@ -73,12 +73,6 @@ pub struct Arguments {
     )]
     pub account: String,
 
-    /// This argument controls which private keys the nodes should have access to and be added to
-    /// its wallet signers. With a value of N, private keys (0, N] will be added to the signer set
-    /// of the node.
-    #[arg(long = "private-keys-count", default_value_t = 30)]
-    pub private_keys_to_add: usize,
-
     /// The differential testing leader node implementation.
     #[arg(short, long = "leader", default_value = "geth")]
     pub leader: TestingPlatform,

crates/core/Cargo.toml

@@ -13,7 +13,6 @@ name = "retester"
 path = "src/main.rs"
 
 [dependencies]
-revive-dt-common = { workspace = true }
 revive-dt-compiler = { workspace = true }
 revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }
@@ -24,7 +23,6 @@ revive-dt-report = { workspace = true }
 alloy = { workspace = true }
 anyhow = { workspace = true }
 clap = { workspace = true }
-indexmap = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 rayon = { workspace = true }

crates/core/src/lib.rs

@@ -1,12 +1,11 @@
 //! The revive differential testing core library.
 //!
 //! This crate defines the testing configuration and
-//! provides a helper utility to execute tests.
+//! provides a helper utilty to execute tests.
 
 use revive_dt_compiler::{SolidityCompiler, revive_resolc, solc};
 use revive_dt_config::TestingPlatform;
-use revive_dt_format::traits::ResolverApi;
+use revive_dt_node::{geth, kitchensink::KitchensinkNode};
-use revive_dt_node::{Node, geth, kitchensink::KitchensinkNode};
 use revive_dt_node_interaction::EthereumNode;
 
 pub mod driver;
@@ -15,7 +14,7 @@ pub mod driver;
 ///
 /// For this we need a blockchain node implementation and a compiler.
 pub trait Platform {
-    type Blockchain: EthereumNode + Node + ResolverApi;
+    type Blockchain: EthereumNode;
     type Compiler: SolidityCompiler;
 
     /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].

crates/core/src/main.rs

@@ -13,7 +13,7 @@ use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
 use temp_dir::TempDir;
 use tracing::Level;
-use tracing_subscriber::{EnvFilter, FmtSubscriber};
+use tracing_subscriber::{EnvFilter, FmtSubscriber, fmt::format::FmtSpan};
 
 static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 
@@ -39,7 +39,7 @@ fn init_cli() -> anyhow::Result<Arguments> {
         .with_thread_ids(true)
         .with_thread_names(true)
         .with_env_filter(EnvFilter::from_default_env())
-        .with_ansi(false)
+        .with_span_events(FmtSpan::ENTER | FmtSpan::CLOSE)
         .pretty()
         .finish();
     tracing::subscriber::set_global_default(subscriber)?;
@@ -116,24 +116,19 @@ where
                 follower_nodes.round_robbin(),
             );
 
-            let execution_result = driver.execute(span);
+            match driver.execute(span) {
+                Ok(_) => {
                     tracing::info!(
-                case_success_count = execution_result.successful_cases_count,
+                        "metadata {} success",
-                case_failure_count = execution_result.failed_cases_count,
+                        metadata.directory().as_ref().unwrap().display()
-                "Execution completed"
                     );
-
-            let mut error_count = 0;
-            for result in execution_result.results.iter() {
-                if !result.is_success() {
-                    tracing::error!(execution_error = ?result, "Encountered an error");
-                    error_count += 1;
                 }
+                Err(error) => {
+                    tracing::warn!(
+                        "metadata {} failure: {error:?}",
+                        metadata.file_path.as_ref().unwrap().display()
+                    );
                 }
-            if error_count == 0 {
-                tracing::info!("Execution succeeded");
-            } else {
-                tracing::info!("Execution failed");
             }
         },
     );

crates/format/Cargo.toml

@@ -9,8 +9,6 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-revive-dt-common = { workspace = true }
-
 alloy = { workspace = true }
 alloy-primitives = { workspace = true }
 alloy-sol-types = { workspace = true }

crates/format/src/case.rs

@@ -1,11 +1,6 @@
 use serde::Deserialize;
 
-use revive_dt_common::macros::define_wrapper_type;
+use crate::{input::Input, mode::Mode};
-
-use crate::{
-    input::{Expected, Input},
-    mode::Mode,
-};
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Case {
@@ -14,37 +9,4 @@ pub struct Case {
     pub modes: Option<Vec<Mode>>,
     pub inputs: Vec<Input>,
     pub group: Option<String>,
-    pub expected: Option<Expected>,
 }
-
-impl Case {
-    pub fn inputs_iterator(&self) -> impl Iterator<Item = Input> {
-        let inputs_len = self.inputs.len();
-        self.inputs
-            .clone()
-            .into_iter()
-            .enumerate()
-            .map(move |(idx, mut input)| {
-                if idx + 1 == inputs_len {
-                    if input.expected.is_none() {
-                        input.expected = self.expected.clone();
-                    }
-
-                    // TODO: What does it mean for us to have an `expected` field on the case itself
-                    // but the final input also has an expected field that doesn't match the one on
-                    // the case? What are we supposed to do with that final expected field on the
-                    // case?
-
-                    input
-                } else {
-                    input
-                }
-            })
-    }
-}
-
-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)]
-    pub struct CaseIdx(usize);
-);

crates/format/src/lib.rs

@@ -5,4 +5,3 @@ pub mod corpus;
 pub mod input;
 pub mod metadata;
 pub mod mode;
-pub mod traits;

crates/format/src/metadata.rs

@@ -1,15 +1,11 @@
 use std::{
     collections::BTreeMap,
-    fmt::Display,
     fs::{File, read_to_string},
     ops::Deref,
     path::{Path, PathBuf},
-    str::FromStr,
 };
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
-
-use revive_dt_common::macros::define_wrapper_type;
 
 use crate::{
     case::Case,
@@ -45,11 +41,9 @@ impl Deref for MetadataFile {
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
-    pub targets: Option<Vec<String>>,
     pub cases: Vec<Case>,
-    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
+    pub contracts: Option<BTreeMap<String, String>>,
-    // TODO: Convert into wrapper types for clarity.
+    pub libraries: Option<BTreeMap<String, BTreeMap<String, String>>>,
-    pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
     pub ignore: Option<bool>,
     pub modes: Option<Vec<Mode>>,
     pub file_path: Option<PathBuf>,
@@ -83,35 +77,28 @@ impl Metadata {
             .to_path_buf())
     }
 
-    /// Returns the contract sources with canonicalized paths for the files
+    /// Extract the contract sources.
-    pub fn contract_sources(
+    ///
-        &self,
+    /// Returns a mapping of contract IDs to their source path and contract name.
-    ) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdent>> {
+    pub fn contract_sources(&self) -> anyhow::Result<BTreeMap<String, (PathBuf, String)>> {
         let directory = self.directory()?;
         let mut sources = BTreeMap::new();
         let Some(contracts) = &self.contracts else {
             return Ok(sources);
         };
 
-        for (
+        for (id, contract) in contracts {
-            alias,
+            // TODO: broken if a colon is in the dir name..
-            ContractPathAndIdent {
+            let mut parts = contract.split(':');
-                contract_source_path,
+            let (Some(file_name), Some(contract_name)) = (parts.next(), parts.next()) else {
-                contract_ident,
+                anyhow::bail!("metadata contains invalid contract: {contract}");
-            },
+            };
-        ) in contracts
+            let file = directory.to_path_buf().join(file_name);
-        {
+            if !file.is_file() {
-            let alias = alias.clone();
+                anyhow::bail!("contract {id} is not a file: {}", file.display());
-            let absolute_path = directory.join(contract_source_path).canonicalize()?;
+            }
-            let contract_ident = contract_ident.clone();
 
-            sources.insert(
+            sources.insert(id.clone(), (file, contract_name.to_string()));
-                alias,
-                ContractPathAndIdent {
-                    contract_source_path: absolute_path,
-                    contract_ident,
-                },
-            );
         }
 
         Ok(sources)
@@ -191,16 +178,12 @@ impl Metadata {
         match serde_json::from_str::<Self>(&spec) {
             Ok(mut metadata) => {
                 metadata.file_path = Some(path.to_path_buf());
-                metadata.contracts = Some(
+                let name = path
-                    [(
+                    .file_name()
-                        ContractInstance::new("test"),
+                    .expect("this should be the path to a Solidity file")
-                        ContractPathAndIdent {
+                    .to_str()
-                            contract_source_path: path.to_path_buf(),
+                    .expect("the file name should be valid UTF-8k");
-                            contract_ident: ContractIdent::new("Test"),
+                metadata.contracts = Some([(String::from("Test"), format!("{name}:Test"))].into());
-                        },
-                    )]
-                    .into(),
-                );
                 Some(metadata)
             }
             Err(error) => {
@@ -213,143 +196,3 @@ impl Metadata {
         }
     }
 }
-
-define_wrapper_type!(
-    /// Represents a contract instance found a metadata file.
-    ///
-    /// Typically, this is used as the key to the "contracts" field of metadata files.
-    #[derive(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
-    #[serde(transparent)]
-    pub struct ContractInstance(String);
-);
-
-define_wrapper_type!(
-    /// Represents a contract identifier found a metadata file.
-    ///
-    /// A contract identifier is the name of the contract in the source code.
-    #[derive(
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
-    #[serde(transparent)]
-    pub struct ContractIdent(String);
-);
-
-/// Represents an identifier used for contracts.
-///
-/// The type supports serialization from and into the following string format:
-///
-/// ```text
-/// ${path}:${contract_ident}
-/// ```
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(try_from = "String", into = "String")]
-pub struct ContractPathAndIdent {
-    /// The path of the contract source code relative to the directory containing the metadata file.
-    pub contract_source_path: PathBuf,
-
-    /// The identifier of the contract.
-    pub contract_ident: ContractIdent,
-}
-
-impl Display for ContractPathAndIdent {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}:{}",
-            self.contract_source_path.display(),
-            self.contract_ident.as_ref()
-        )
-    }
-}
-
-impl FromStr for ContractPathAndIdent {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut splitted_string = s.split(":").peekable();
-        let mut path = None::<String>;
-        let mut identifier = None::<String>;
-        loop {
-            let Some(next_item) = splitted_string.next() else {
-                break;
-            };
-            if splitted_string.peek().is_some() {
-                match path {
-                    Some(ref mut path) => {
-                        path.push(':');
-                        path.push_str(next_item);
-                    }
-                    None => path = Some(next_item.to_owned()),
-                }
-            } else {
-                identifier = Some(next_item.to_owned())
-            }
-        }
-        let Some(path) = path else {
-            anyhow::bail!("Path is not defined");
-        };
-        let Some(identifier) = identifier else {
-            anyhow::bail!("Contract identifier is not defined")
-        };
-        Ok(Self {
-            contract_source_path: PathBuf::from(path),
-            contract_ident: ContractIdent::new(identifier),
-        })
-    }
-}
-
-impl TryFrom<String> for ContractPathAndIdent {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Self::from_str(&value)
-    }
-}
-
-impl From<ContractPathAndIdent> for String {
-    fn from(value: ContractPathAndIdent) -> Self {
-        value.to_string()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn contract_identifier_respects_roundtrip_property() {
-        // Arrange
-        let string = "ERC20/ERC20.sol:ERC20";
-
-        // Act
-        let identifier = ContractPathAndIdent::from_str(string);
-
-        // Assert
-        let identifier = identifier.expect("Failed to parse");
-        assert_eq!(
-            identifier.contract_source_path.display().to_string(),
-            "ERC20/ERC20.sol"
-        );
-        assert_eq!(identifier.contract_ident, "ERC20".to_owned().into());
-
-        // Act
-        let reserialized = identifier.to_string();
-
-        // Assert
-        assert_eq!(string, reserialized);
-    }
-
-    #[test]
-    fn complex_metadata_file_can_be_deserialized() {
-        // Arrange
-        const JSON: &str = include_str!("../../../assets/test_metadata.json");
-
-        // Act
-        let metadata = serde_json::from_str::<Metadata>(JSON);
-
-        // Assert
-        metadata.expect("Failed to deserialize metadata");
-    }
-}

crates/format/src/traits.rs

@@ -1,30 +0,0 @@
-use alloy::eips::BlockNumberOrTag;
-use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
-use anyhow::Result;
-
-/// A trait of the interface are required to implement to be used by the resolution logic that this
-/// crate implements to go from string calldata and into the bytes calldata.
-pub trait ResolverApi {
-    /// Returns the ID of the chain that the node is on.
-    fn chain_id(&self) -> Result<ChainId>;
-
-    // TODO: This is currently a u128 due to Kitchensink needing more than 64 bits for its gas limit
-    // when we implement the changes to the gas we need to adjust this to be a u64.
-    /// Returns the gas limit of the specified block.
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> Result<u128>;
-
-    /// Returns the coinbase of the specified block.
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> Result<Address>;
-
-    /// Returns the difficulty of the specified block.
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> Result<U256>;
-
-    /// Returns the hash of the specified block.
-    fn block_hash(&self, number: BlockNumberOrTag) -> Result<BlockHash>;
-
-    /// Returns the timestamp of the specified block,
-    fn block_timestamp(&self, number: BlockNumberOrTag) -> Result<BlockTimestamp>;
-
-    /// Returns the number of the last block.
-    fn last_block_number(&self) -> Result<BlockNumber>;
-}

crates/node-interaction/Cargo.toml

@@ -11,3 +11,6 @@ rust-version.workspace = true
 [dependencies]
 alloy = { workspace = true }
 anyhow = { workspace = true }
+tracing = { workspace = true }
+once_cell = { workspace = true }
+tokio = { workspace = true }

crates/node-interaction/src/lib.rs

@@ -1,21 +1,29 @@
 //! This crate implements all node interactions.
 
-use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
+use alloy::primitives::Address;
+use alloy::rpc::types::trace::geth::{DiffMode, GethTrace};
 use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
-use anyhow::Result;
+use tokio_runtime::TO_TOKIO;
+
+pub mod nonce;
+mod tokio_runtime;
+pub mod trace;
+pub mod transaction;
 
 /// 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<TransactionReceipt>;
+    fn execute_transaction(
+        &self,
+        transaction: TransactionRequest,
+    ) -> anyhow::Result<TransactionReceipt>;
 
     /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
-    fn trace_transaction(
+    fn trace_transaction(&self, transaction: TransactionReceipt) -> anyhow::Result<GethTrace>;
-        &self,
-        receipt: &TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
-    ) -> Result<GethTrace>;
 
     /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, receipt: &TransactionReceipt) -> Result<DiffMode>;
+    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode>;
+
+    /// Returns the next available nonce for the given [Address].
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64>;
 }

crates/node-interaction/src/nonce.rs

@@ -0,0 +1,55 @@
+use std::pin::Pin;
+
+use alloy::{
+    primitives::Address,
+    providers::{Provider, ProviderBuilder},
+};
+use tokio::sync::oneshot;
+
+use crate::{TO_TOKIO, tokio_runtime::AsyncNodeInteraction};
+
+pub type Task = Pin<Box<dyn Future<Output = anyhow::Result<u64>> + Send>>;
+
+pub(crate) struct Nonce {
+    sender: oneshot::Sender<anyhow::Result<u64>>,
+    task: Task,
+}
+
+impl AsyncNodeInteraction for Nonce {
+    type Output = anyhow::Result<u64>;
+
+    fn split(
+        self,
+    ) -> (
+        std::pin::Pin<Box<dyn Future<Output = Self::Output> + Send>>,
+        oneshot::Sender<Self::Output>,
+    ) {
+        (self.task, self.sender)
+    }
+}
+
+/// This is like `trace_transaction`, just for nonces.
+pub fn fetch_onchain_nonce(
+    connection: String,
+    wallet: alloy::network::EthereumWallet,
+    address: Address,
+) -> anyhow::Result<u64> {
+    let sender = TO_TOKIO.lock().unwrap().nonce_sender.clone();
+
+    let (tx, rx) = oneshot::channel();
+    let task: Task = Box::pin(async move {
+        let provider = ProviderBuilder::new()
+            .wallet(wallet)
+            .connect(&connection)
+            .await?;
+        let onchain = provider.get_transaction_count(address).await?;
+        Ok(onchain)
+    });
+
+    sender
+        .blocking_send(Nonce { task, sender: tx })
+        .expect("not in async context");
+
+    rx.blocking_recv()
+        .unwrap_or_else(|err| anyhow::bail!("nonce fetch failed: {err}"))
+}

crates/node-interaction/src/tokio_runtime.rs

@@ -0,0 +1,87 @@
+//! The alloy crate __requires__ a tokio runtime.
+//! We contain any async rust right here.
+
+use once_cell::sync::Lazy;
+use std::pin::Pin;
+use std::sync::Mutex;
+use std::thread;
+use tokio::runtime::Runtime;
+use tokio::spawn;
+use tokio::sync::{mpsc, oneshot};
+use tokio::task::JoinError;
+
+use crate::nonce::Nonce;
+use crate::trace::Trace;
+use crate::transaction::Transaction;
+
+pub(crate) static TO_TOKIO: Lazy<Mutex<TokioRuntime>> =
+    Lazy::new(|| Mutex::new(TokioRuntime::spawn()));
+
+/// Common interface for executing async node interactions from a non-async context.
+#[allow(clippy::type_complexity)]
+pub(crate) trait AsyncNodeInteraction: Send + 'static {
+    type Output: Send;
+
+    //// Returns the task and the output sender.
+    fn split(
+        self,
+    ) -> (
+        Pin<Box<dyn Future<Output = Self::Output> + Send>>,
+        oneshot::Sender<Self::Output>,
+    );
+}
+
+pub(crate) struct TokioRuntime {
+    pub(crate) transaction_sender: mpsc::Sender<Transaction>,
+    pub(crate) trace_sender: mpsc::Sender<Trace>,
+    pub(crate) nonce_sender: mpsc::Sender<Nonce>,
+}
+
+impl TokioRuntime {
+    fn spawn() -> Self {
+        let rt = Runtime::new().expect("should be able to create the tokio runtime");
+        let (transaction_sender, transaction_receiver) = mpsc::channel::<Transaction>(1024);
+        let (trace_sender, trace_receiver) = mpsc::channel::<Trace>(1024);
+        let (nonce_sender, nonce_receiver) = mpsc::channel::<Nonce>(1024);
+
+        thread::spawn(move || {
+            rt.block_on(async move {
+                let transaction_task = spawn(interaction::<Transaction>(transaction_receiver));
+                let trace_task = spawn(interaction::<Trace>(trace_receiver));
+                let nonce_task = spawn(interaction::<Nonce>(nonce_receiver));
+
+                if let Err(error) = transaction_task.await {
+                    tracing::error!("tokio transaction task failed: {error}");
+                }
+                if let Err(error) = trace_task.await {
+                    tracing::error!("tokio trace transaction task failed: {error}");
+                }
+                if let Err(error) = nonce_task.await {
+                    tracing::error!("tokio nonce task failed: {error}");
+                }
+            });
+        });
+
+        Self {
+            transaction_sender,
+            trace_sender,
+            nonce_sender,
+        }
+    }
+}
+
+async fn interaction<T>(mut receiver: mpsc::Receiver<T>) -> Result<(), JoinError>
+where
+    T: AsyncNodeInteraction,
+{
+    while let Some(task) = receiver.recv().await {
+        spawn(async move {
+            let (task, sender) = task.split();
+            sender
+                .send(task.await)
+                .unwrap_or_else(|_| panic!("failed to send task output"));
+        });
+    }
+
+    Ok(())
+}

crates/node-interaction/src/trace.rs

@@ -0,0 +1,43 @@
+//! Trace transactions in a sync context.
+
+use std::pin::Pin;
+
+use alloy::rpc::types::trace::geth::GethTrace;
+use tokio::sync::oneshot;
+
+use crate::TO_TOKIO;
+use crate::tokio_runtime::AsyncNodeInteraction;
+
+pub type Task = Pin<Box<dyn Future<Output = anyhow::Result<GethTrace>> + Send>>;
+
+pub(crate) struct Trace {
+    sender: oneshot::Sender<anyhow::Result<GethTrace>>,
+    task: Task,
+}
+
+impl AsyncNodeInteraction for Trace {
+    type Output = anyhow::Result<GethTrace>;
+
+    fn split(
+        self,
+    ) -> (
+        std::pin::Pin<Box<dyn Future<Output = Self::Output> + Send>>,
+        oneshot::Sender<Self::Output>,
+    ) {
+        (self.task, self.sender)
+    }
+}
+
+/// Execute some [Task] that return a [GethTrace] result.
+pub fn trace_transaction(task: Task) -> anyhow::Result<GethTrace> {
+    let task_sender = TO_TOKIO.lock().unwrap().trace_sender.clone();
+    let (sender, receiver) = oneshot::channel();
+
+    task_sender
+        .blocking_send(Trace { task, sender })
+        .expect("we are not calling this from an async context");
+
+    receiver
+        .blocking_recv()
+        .unwrap_or_else(|error| anyhow::bail!("no trace received: {error}"))
+}

crates/node-interaction/src/transaction.rs

@@ -0,0 +1,46 @@
+//! Execute transactions in a sync context.
+
+use std::pin::Pin;
+
+use alloy::rpc::types::TransactionReceipt;
+use tokio::sync::oneshot;
+
+use crate::TO_TOKIO;
+use crate::tokio_runtime::AsyncNodeInteraction;
+
+pub type Task = Pin<Box<dyn Future<Output = anyhow::Result<TransactionReceipt>> + Send>>;
+
+pub(crate) struct Transaction {
+    receipt_sender: oneshot::Sender<anyhow::Result<TransactionReceipt>>,
+    task: Task,
+}
+
+impl AsyncNodeInteraction for Transaction {
+    type Output = anyhow::Result<TransactionReceipt>;
+
+    fn split(
+        self,
+    ) -> (
+        Pin<Box<dyn Future<Output = Self::Output> + Send>>,
+        oneshot::Sender<Self::Output>,
+    ) {
+        (self.task, self.receipt_sender)
+    }
+}
+
+/// Execute some [Task] that returns a [TransactionReceipt].
+pub fn execute_transaction(task: Task) -> anyhow::Result<TransactionReceipt> {
+    let request_sender = TO_TOKIO.lock().unwrap().transaction_sender.clone();
+    let (receipt_sender, receipt_receiver) = oneshot::channel();
+
+    request_sender
+        .blocking_send(Transaction {
+            receipt_sender,
+            task,
+        })
+        .expect("we are not calling this from an async context");
+
+    receipt_receiver
+        .blocking_recv()
+        .unwrap_or_else(|error| anyhow::bail!("no receipt received: {error}"))
+}

crates/node/Cargo.toml

@@ -14,12 +14,9 @@ alloy = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
 
-revive-dt-common = { workspace = true }
-revive-dt-config = { workspace = true }
-revive-dt-format = { workspace = true }
 revive-dt-node-interaction = { workspace = true }
+revive-dt-config = { workspace = true }
 
-serde = { workspace = true }
 serde_json = { workspace = true }
 
 sp-core = { workspace = true }
@@ -27,4 +24,3 @@ sp-runtime = { workspace = true }
 
 [dev-dependencies]
 temp-dir = { workspace = true }
-tokio = { workspace = true }

crates/node/src/common.rs

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

crates/node/src/constants.rs

@@ -1,5 +0,0 @@
-/// This constant defines how much Wei accounts are pre-seeded with in genesis.
-///
-/// Note: After changing this number, check that the tests for kitchensink work as we encountered
-/// some issues with different values of the initial balance on Kitchensink.
-pub const INITIAL_BALANCE: u128 = 10u128.pow(37);

crates/node/src/geth.rs

@@ -1,37 +1,35 @@
 //! The go-ethereum node implementation.
 
 use std::{
-    fs::{File, OpenOptions, create_dir_all, remove_dir_all},
+    collections::HashMap,
+    fs::{File, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
     path::PathBuf,
     process::{Child, Command, Stdio},
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        Mutex,
+        atomic::{AtomicU32, Ordering},
+    },
+    thread,
     time::{Duration, Instant},
 };
 
 use alloy::{
-    eips::BlockNumberOrTag,
+    network::EthereumWallet,
-    genesis::{Genesis, GenesisAccount},
+    primitives::Address,
-    network::{Ethereum, EthereumWallet, NetworkWallet},
+    providers::{Provider, ProviderBuilder, ext::DebugApi},
-    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256},
-    providers::{
-        Provider, ProviderBuilder,
-        ext::DebugApi,
-        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
-    },
     rpc::types::{
         TransactionReceipt, TransactionRequest,
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
-    signers::local::PrivateKeySigner,
 };
-use revive_dt_common::concepts::BlockingExecutor;
 use revive_dt_config::Arguments;
-use revive_dt_format::traits::ResolverApi;
+use revive_dt_node_interaction::{
-use revive_dt_node_interaction::EthereumNode;
+    EthereumNode, nonce::fetch_onchain_nonce, trace::trace_transaction,
-use tracing::Level;
+    transaction::execute_transaction,
+};
 
-use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
+use crate::Node;
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -47,25 +45,18 @@ pub struct Instance {
     connection_string: String,
     base_directory: PathBuf,
     data_directory: PathBuf,
-    logs_directory: PathBuf,
     geth: PathBuf,
     id: u32,
     handle: Option<Child>,
     network_id: u64,
     start_timeout: u64,
     wallet: EthereumWallet,
-    nonce_manager: CachedNonceManager,
+    nonces: Mutex<HashMap<Address, u64>>,
-    /// This vector stores [`File`] objects that we use for logging which we want to flush when the
-    /// node object is dropped. We do not store them in a structured fashion at the moment (in
-    /// separate fields) as the logic that we need to apply to them is all the same regardless of
-    /// what it belongs to, we just want to flush them on [`Drop`] of the node.
-    logs_file_to_flush: Vec<File>,
 }
 
 impl Instance {
     const BASE_DIRECTORY: &str = "geth";
     const DATA_DIRECTORY: &str = "data";
-    const LOGS_DIRECTORY: &str = "logs";
 
     const IPC_FILE: &str = "geth.ipc";
     const GENESIS_JSON_FILE: &str = "genesis.json";
@@ -73,30 +64,12 @@ impl Instance {
     const READY_MARKER: &str = "IPC endpoint opened";
     const ERROR_MARKER: &str = "Fatal:";
 
-    const GETH_STDOUT_LOG_FILE_NAME: &str = "node_stdout.log";
-    const GETH_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
-
-    const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress";
-
     /// Create the node directory and call `geth init` to configure the genesis.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn init(&mut self, genesis: String) -> anyhow::Result<&mut Self> {
         create_dir_all(&self.base_directory)?;
-        create_dir_all(&self.logs_directory)?;
 
-        let mut genesis = serde_json::from_str::<Genesis>(&genesis)?;
-        for signer_address in
-            <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
-        {
-            // Note, the use of the entry API here means that we only modify the entries for any
-            // account that is not in the `alloc` field of the genesis state.
-            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)?;
+        File::create(&genesis_path)?.write_all(genesis.as_bytes())?;
 
         let mut child = Command::new(&self.geth)
             .arg("init")
@@ -123,24 +96,8 @@ impl Instance {
 
     /// Spawn the go-ethereum node child process.
     ///
-    /// [Instance::init] must be called prior.
+    /// [Instance::init] must be called priorly.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn spawn_process(&mut self) -> anyhow::Result<&mut Self> {
-        // This is the `OpenOptions` that we wish to use for all of the log files that we will be
-        // opening in this method. We need to construct it in this way to:
-        // 1. Be consistent
-        // 2. Less verbose and more dry
-        // 3. Because the builder pattern uses mutable references so we need to get around that.
-        let open_options = {
-            let mut options = OpenOptions::new();
-            options.create(true).truncate(true).write(true);
-            options
-        };
-
-        let stdout_logs_file = open_options
-            .clone()
-            .open(self.geth_stdout_log_file_path())?;
-        let stderr_logs_file = open_options.open(self.geth_stderr_log_file_path())?;
         self.handle = Command::new(&self.geth)
             .arg("--dev")
             .arg("--datadir")
@@ -152,106 +109,64 @@ impl Instance {
             .arg("--nodiscover")
             .arg("--maxpeers")
             .arg("0")
-            .stderr(stderr_logs_file.try_clone()?)
+            .stderr(Stdio::piped())
-            .stdout(stdout_logs_file.try_clone()?)
+            .stdout(Stdio::null())
             .spawn()?
             .into();
-
-        if let Err(error) = self.wait_ready() {
-            tracing::error!(?error, "Failed to start geth, shutting down gracefully");
-            self.shutdown()?;
-            return Err(error);
-        }
-
-        self.logs_file_to_flush
-            .extend([stderr_logs_file, stdout_logs_file]);
-
         Ok(self)
     }
 
     /// Wait for the g-ethereum node child process getting ready.
     ///
     /// [Instance::spawn_process] must be called priorly.
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn wait_ready(&mut self) -> anyhow::Result<&mut Self> {
+        // Thanks clippy but geth is a server; we don't `wait` but eventually kill it.
+        #[allow(clippy::zombie_processes)]
+        let mut child = self.handle.take().expect("should be spawned");
         let start_time = Instant::now();
-
-        let logs_file = OpenOptions::new()
-            .read(true)
-            .write(false)
-            .append(false)
-            .truncate(false)
-            .open(self.geth_stderr_log_file_path())?;
-
         let maximum_wait_time = Duration::from_millis(self.start_timeout);
-        let mut stderr = BufReader::new(logs_file).lines();
+        let mut stderr = BufReader::new(child.stderr.take().expect("should be piped")).lines();
-        loop {
+        let error = loop {
-            if let Some(Ok(line)) = stderr.next() {
+            let Some(Ok(line)) = stderr.next() else {
+                break "child process stderr reading error".to_string();
+            };
             if line.contains(Self::ERROR_MARKER) {
-                    anyhow::bail!("Failed to start geth {line}");
+                break line;
             }
             if line.contains(Self::READY_MARKER) {
+                // Keep stderr alive
+                // https://github.com/alloy-rs/alloy/issues/2091#issuecomment-2676134147
+                thread::spawn(move || for _ in stderr.by_ref() {});
+
+                self.handle = child.into();
                 return Ok(self);
             }
-            }
             if Instant::now().duration_since(start_time) > maximum_wait_time {
-                anyhow::bail!("Timeout in starting geth");
+                break "spawn timeout".to_string();
-            }
-        }
             }
+        };
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
+        let _ = child.kill();
-    fn geth_stdout_log_file_path(&self) -> PathBuf {
+        anyhow::bail!("geth node #{} spawn error: {error}", self.id)
-        self.logs_directory.join(Self::GETH_STDOUT_LOG_FILE_NAME)
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id), level = Level::TRACE)]
-    fn geth_stderr_log_file_path(&self) -> PathBuf {
-        self.logs_directory.join(Self::GETH_STDERR_LOG_FILE_NAME)
-    }
-
-    fn provider(
-        &self,
-    ) -> impl Future<
-        Output = anyhow::Result<
-            FillProvider<impl TxFiller<Ethereum>, impl Provider<Ethereum>, Ethereum>,
-        >,
-    > + 'static {
-        let connection_string = self.connection_string();
-        let wallet = self.wallet.clone();
-
-        // Note: We would like all providers to make use of the same nonce manager so that we have
-        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
-        // its implementation and therefore it means that when we clone it then it still references
-        // the same state.
-        let nonce_manager = self.nonce_manager.clone();
-
-        Box::pin(async move {
-            ProviderBuilder::new()
-                .disable_recommended_fillers()
-                .filler(FallbackGasFiller::new(500_000_000, 500_000_000, 1))
-                .filler(ChainIdFiller::default())
-                .filler(NonceFiller::new(nonce_manager))
-                .wallet(wallet)
-                .connect(&connection_string)
-                .await
-                .map_err(Into::into)
-        })
     }
 }
 
 impl EthereumNode for Instance {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn execute_transaction(
         &self,
         transaction: TransactionRequest,
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let provider = self.provider();
+        let connection_string = self.connection_string();
-        BlockingExecutor::execute(async move {
+        let wallet = self.wallet.clone();
-            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
+
+        execute_transaction(Box::pin(async move {
+            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction,);
             let _outer_guard = outer_span.enter();
 
-            let provider = provider.await?;
+            let provider = ProviderBuilder::new()
+                .wallet(wallet)
+                .connect(&connection_string)
+                .await?;
 
             let pending_transaction = provider.send_transaction(transaction).await?;
             let transaction_hash = pending_transaction.tx_hash();
@@ -271,162 +186,107 @@ impl EthereumNode for Instance {
             // it eventually works, but we only do that if the error we get back is the "transaction
             // indexing is in progress" error or if the receipt is None.
             //
-            // Getting the transaction indexed and taking a receipt can take a long time especially
+            // At the moment we do not allow for the 60 seconds to be modified and we take it as
-            // when a lot of transactions are being submitted to the node. Thus, while initially we
+            // being an implementation detail that's invisible to anything outside of this module.
-            // only allowed for 60 seconds of waiting with a 1 second delay in polling, we need to
+            //
-            // allow for a larger wait time. Therefore, in here we allow for 5 minutes of waiting
+            // We allow a total of 60 retries for getting the receipt with one second between each
-            // with exponential backoff each time we attempt to get the receipt and find that it's
+            // retry and the next which means that we allow for a total of 60 seconds of waiting
-            // not available.
+            // before we consider that we're unable to get the transaction receipt.
             let mut retries = 0;
-            let mut total_wait_duration = Duration::from_secs(0);
-            let max_allowed_wait_duration = Duration::from_secs(5 * 60);
             loop {
-                if total_wait_duration >= max_allowed_wait_duration {
-                    tracing::error!(
-                        ?total_wait_duration,
-                        ?max_allowed_wait_duration,
-                        retry_count = retries,
-                        "Failed to get receipt after polling for it"
-                    );
-                    anyhow::bail!(
-                        "Polled for receipt for {total_wait_duration:?} but failed to get it"
-                    );
-                }
-
                 match provider.get_transaction_receipt(*transaction_hash).await {
-                    Ok(Some(receipt)) => break Ok(receipt),
+                    Ok(Some(receipt)) => {
-                    Ok(None) => {}
+                        tracing::info!("Obtained the transaction receipt");
+                        break Ok(receipt);
+                    }
+                    Ok(None) => {
+                        if retries == 60 {
+                            tracing::error!(
+                                "Polled for transaction receipt for 60 seconds but failed to get it"
+                            );
+                            break Err(anyhow::anyhow!("Failed to get the transaction receipt"));
+                        } else {
+                            tracing::trace!(
+                                retries,
+                                "Sleeping for 1 second and trying to get the receipt again"
+                            );
+                            retries += 1;
+                            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                            continue;
+                        }
+                    }
                     Err(error) => {
                         let error_string = error.to_string();
-                        if !error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+                        if error_string.contains("transaction indexing is in progress") {
+                            if retries == 60 {
+                                tracing::error!(
+                                    "Polled for transaction receipt for 60 seconds but failed to get it"
+                                );
+                                break Err(error.into());
+                            } else {
+                                tracing::trace!(
+                                    retries,
+                                    "Sleeping for 1 second and trying to get the receipt again"
+                                );
+                                retries += 1;
+                                tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                                continue;
+                            }
+                        } else {
                             break Err(error.into());
                         }
                     }
-                };
-
-                let next_wait_duration = Duration::from_secs(2u64.pow(retries))
-                    .min(max_allowed_wait_duration - total_wait_duration);
-                total_wait_duration += next_wait_duration;
-                retries += 1;
-
-                tokio::time::sleep(next_wait_duration).await;
                 }
-        })?
+            }
+        }))
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn trace_transaction(
         &self,
-        transaction: &TransactionReceipt,
+        transaction: TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let tx_hash = transaction.transaction_hash;
+        let connection_string = self.connection_string();
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            Ok(provider
-                .await?
-                .debug_trace_transaction(tx_hash, trace_options)
-                .await?)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
         let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
             diff_mode: Some(true),
             disable_code: None,
             disable_storage: None,
         });
+        let wallet = self.wallet.clone();
+
+        trace_transaction(Box::pin(async move {
+            Ok(ProviderBuilder::new()
+                .wallet(wallet)
+                .connect(&connection_string)
+                .await?
+                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .await?)
+        }))
+    }
+
+    fn state_diff(
+        &self,
+        transaction: alloy::rpc::types::TransactionReceipt,
+    ) -> anyhow::Result<DiffMode> {
         match self
-            .trace_transaction(transaction, trace_options)?
+            .trace_transaction(transaction)?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
             _ => anyhow::bail!("expected a diff mode trace"),
         }
     }
-}
 
-impl ResolverApi for Instance {
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+        let connection_string = self.connection_string.clone();
-    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+        let wallet = self.wallet.clone();
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider.await?.get_chain_id().await.map_err(Into::into)
-        })?
-    }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+        let onchain_nonce = fetch_onchain_nonce(connection_string, wallet, address)?;
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider
-                .await?
-                .get_block_by_number(number)
-                .await?
-                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.gas_limit as _)
-        })?
-    }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+        let mut nonces = self.nonces.lock().unwrap();
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+        let current = nonces.entry(address).or_insert(onchain_nonce);
-        let provider = self.provider();
+        let value = *current;
-        BlockingExecutor::execute(async move {
+        *current += 1;
-            provider
+        Ok(value)
-                .await?
-                .get_block_by_number(number)
-                .await?
-                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.beneficiary)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider
-                .await?
-                .get_block_by_number(number)
-                .await?
-                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.difficulty)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider
-                .await?
-                .get_block_by_number(number)
-                .await?
-                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.hash)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider
-                .await?
-                .get_block_by_number(number)
-                .await?
-                .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-                .map(|block| block.header.timestamp)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            provider.await?.get_block_number().await.map_err(Into::into)
-        })?
     }
 }
 
@@ -436,67 +296,33 @@ 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),
-            logs_directory: base_directory.join(Self::LOGS_DIRECTORY),
             base_directory,
             geth: config.geth.clone(),
             id,
             handle: None,
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
-            wallet,
+            wallet: config.wallet(),
-            // We know that we only need to be storing 2 files so we can specify that when creating
+            nonces: Mutex::new(HashMap::new()),
-            // the vector. It's the stdout and stderr of the geth node.
-            logs_file_to_flush: Vec::with_capacity(2),
-            nonce_manager: Default::default(),
         }
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn connection_string(&self) -> String {
         self.connection_string.clone()
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn shutdown(self) -> anyhow::Result<()> {
-    fn shutdown(&mut self) -> anyhow::Result<()> {
-        // Terminate the processes in a graceful manner to allow for the output to be flushed.
-        if let Some(mut child) = self.handle.take() {
-            child
-                .kill()
-                .map_err(|error| anyhow::anyhow!("Failed to kill the geth process: {error:?}"))?;
-        }
-
-        // Flushing the files that we're using for keeping the logs before shutdown.
-        for file in self.logs_file_to_flush.iter_mut() {
-            file.flush()?
-        }
-
-        // Remove the node's database so that subsequent runs do not run on the same database. We
-        // ignore the error just in case the directory didn't exist in the first place and therefore
-        // there's nothing to be deleted.
-        let _ = remove_dir_all(self.base_directory.join(Self::DATA_DIRECTORY));
-
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn spawn(&mut self, genesis: String) -> anyhow::Result<()> {
-        self.init(genesis)?.spawn_process()?;
+        self.init(genesis)?.spawn_process()?.wait_ready()?;
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn version(&self) -> anyhow::Result<String> {
         let output = Command::new(&self.geth)
             .arg("--version")
@@ -508,32 +334,28 @@ 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 {
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn drop(&mut self) {
-        self.shutdown().expect("Failed to shutdown")
+        tracing::info!(id = self.id, "Dropping node");
+        if let Some(child) = self.handle.as_mut() {
+            let _ = child.kill();
+        }
+        if self.base_directory.exists() {
+            let _ = remove_dir_all(&self.base_directory);
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use revive_dt_config::Arguments;
-
     use temp_dir::TempDir;
 
     use crate::{GENESIS_JSON, Node};
 
-    use super::*;
+    use super::Instance;
 
     fn test_config() -> (Arguments, TempDir) {
         let mut config = Arguments::default();
@@ -543,16 +365,6 @@ mod tests {
         (config, temp_dir)
     }
 
-    fn new_node() -> (Instance, TempDir) {
-        let (args, temp_dir) = test_config();
-        let mut node = Instance::new(&args);
-        node.init(GENESIS_JSON.to_owned())
-            .expect("Failed to initialize the node")
-            .spawn_process()
-            .expect("Failed to spawn the node process");
-        (node, temp_dir)
-    }
-
     #[test]
     fn init_works() {
         Instance::new(&test_config().0)
@@ -575,93 +387,4 @@ mod tests {
             "expected version string, got: '{version}'"
         );
     }
-
-    #[test]
-    fn can_get_chain_id_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let chain_id = node.chain_id();
-
-        // Assert
-        let chain_id = chain_id.expect("Failed to get the chain id");
-        assert_eq!(chain_id, 420_420_420);
-    }
-
-    #[test]
-    fn can_get_gas_limit_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
-
-        // Assert
-        let gas_limit = gas_limit.expect("Failed to get the gas limit");
-        assert_eq!(gas_limit, u32::MAX as u128)
-    }
-
-    #[test]
-    fn can_get_coinbase_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
-
-        // Assert
-        let coinbase = coinbase.expect("Failed to get the coinbase");
-        assert_eq!(coinbase, Address::new([0xFF; 20]))
-    }
-
-    #[test]
-    fn can_get_block_difficulty_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
-
-        // Assert
-        let block_difficulty = block_difficulty.expect("Failed to get the block difficulty");
-        assert_eq!(block_difficulty, U256::ZERO)
-    }
-
-    #[test]
-    fn can_get_block_hash_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
-
-        // Assert
-        let _ = block_hash.expect("Failed to get the block hash");
-    }
-
-    #[test]
-    fn can_get_block_timestamp_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
-
-        // Assert
-        let _ = block_timestamp.expect("Failed to get the block timestamp");
-    }
-
-    #[test]
-    fn can_get_block_number_from_node() {
-        // Arrange
-        let (node, _temp_dir) = new_node();
-
-        // Act
-        let block_number = node.last_block_number();
-
-        // Assert
-        let block_number = block_number.expect("Failed to get the block number");
-        assert_eq!(block_number, 0)
-    }
 }

crates/node/src/lib.rs

@@ -3,8 +3,6 @@
 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;
@@ -25,15 +23,11 @@ pub trait Node: EthereumNode {
     /// Prune the node instance and related data.
     ///
     /// Blocking until it's completely stopped.
-    fn shutdown(&mut self) -> anyhow::Result<()>;
+    fn shutdown(self) -> anyhow::Result<()>;
 
     /// Returns the nodes connection string.
     fn connection_string(&self) -> String;
 
     /// Returns the node version.
     fn version(&self) -> anyhow::Result<String>;
-
-    /// Given a list of targets from the metadata file, this function determines if the metadata
-    /// file can be ran on this node or not.
-    fn matches_target(&self, targets: Option<&[String]>) -> bool;
 }

crates/solc-binaries/src/download.rs

@@ -110,25 +110,37 @@ mod tests {
 
     #[test]
     fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL).unwrap().latest_release;
+        let version = List::download(List::WINDOWS_URL)
+            .unwrap()
+            .latest_release
+            .into();
         GHDownloader::windows(version).download().unwrap();
     }
 
     #[test]
     fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL).unwrap().latest_release;
+        let version = List::download(List::MACOSX_URL)
+            .unwrap()
+            .latest_release
+            .into();
         GHDownloader::macosx(version).download().unwrap();
     }
 
     #[test]
     fn try_get_linux() {
-        let version = List::download(List::LINUX_URL).unwrap().latest_release;
+        let version = List::download(List::LINUX_URL)
+            .unwrap()
+            .latest_release
+            .into();
         GHDownloader::linux(version).download().unwrap();
     }
 
     #[test]
     fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).unwrap().latest_release;
+        let version = List::download(List::WASM_URL)
+            .unwrap()
+            .latest_release
+            .into();
         GHDownloader::wasm(version).download().unwrap();
     }
 }

genesis.json

@@ -33,5 +33,9 @@
     "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "timestamp": "0x00",
-    "alloc": {}
+    "alloc": {
+        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": {
+            "balance": "1000000000000000000"
+        }
+    }
 }