Merge remote-tracking branch 'origin/main' into cleanup-execution-logic

Fix an issue where kitchensink won't advance

Cargo.lock

@@ -336,7 +336,7 @@ dependencies = [
  "derive_more 2.0.1",
  "foldhash",
  "hashbrown 0.15.3",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itoa",
  "k256",
  "keccak-asm",
@@ -597,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",
@@ -2400,7 +2400,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2842,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",
@@ -3962,7 +3962,6 @@ dependencies = [
  "alloy",
  "anyhow",
  "clap",
- "indexmap 2.10.0",
  "rayon",
  "revive-dt-compiler",
  "revive-dt-config",
@@ -4508,7 +4507,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5397,7 +5396,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",

Cargo.toml

@@ -51,7 +51,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" }

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/core/Cargo.toml

@@ -23,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/common.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/core/src/lib.rs

@@ -1,14 +1,13 @@
 //! 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_node::{geth, kitchensink::KitchensinkNode};
 use revive_dt_node_interaction::EthereumNode;
 
-pub mod common;
 pub mod driver;
 
 /// One platform can be tested differentially against another.

crates/format/src/case.rs

@@ -1,10 +1,6 @@
 use serde::Deserialize;
 
-use crate::{
-    define_wrapper_type,
-    input::{Expected, Input},
-    mode::Mode,
-};
+use crate::{input::Input, mode::Mode};
 
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Case {
@@ -13,29 +9,4 @@ pub struct Case {
     pub modes: Option<Vec<Mode>>,
     pub inputs: Vec<Input>,
     pub group: Option<String>,
-    pub expected: Option<Expected>,
-}
-
-define_wrapper_type!(
-    /// A wrapper type for the index of test cases found in metadata file.
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    CaseIdx(usize);
-);
-
-impl Case {
-    pub fn inputs_iterator(&self) -> impl Iterator<Item = Input> {
-        let inputs_len = self.inputs.len();
-        self.inputs
-            .clone()
-            .into_iter()
-            .enumerate()
-            .map(move |(idx, mut input)| {
-                if idx + 1 == inputs_len {
-                    input.expected = self.expected.clone();
-                    input
-                } else {
-                    input
-                }
-            })
-    }
 }

crates/format/src/input.rs

@@ -7,24 +7,21 @@ use alloy::{
     primitives::{Address, Bytes, U256},
     rpc::types::TransactionRequest,
 };
-use alloy_primitives::B256;
 use semver::VersionReq;
 use serde::Deserialize;
+use serde_json::Value;
 
 use revive_dt_node_interaction::EthereumNode;
 
-use crate::metadata::ContractInstance;
-
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
     #[serde(default = "default_caller")]
     pub caller: Address,
     pub comment: Option<String>,
     #[serde(default = "default_instance")]
-    pub instance: ContractInstance,
+    pub instance: String,
     pub method: Method,
-    #[serde(default)]
-    pub calldata: Calldata,
+    pub calldata: Option<Calldata>,
     pub expected: Option<Expected>,
     pub value: Option<String>,
     pub storage: Option<HashMap<String, Calldata>>,
@@ -40,18 +37,10 @@ pub enum Expected {
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct ExpectedOutput {
-    pub compiler_version: Option<VersionReq>,
-    pub return_data: Option<Calldata>,
-    pub events: Option<Vec<Event>>,
-    #[serde(default)]
-    pub exception: bool,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
-pub struct Event {
-    pub address: Option<Address>,
-    pub topics: Vec<B256>,
-    pub values: Calldata,
+    compiler_version: Option<VersionReq>,
+    return_data: Option<Calldata>,
+    events: Option<Value>,
+    exception: Option<bool>,
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
@@ -82,175 +71,109 @@ pub enum Method {
     FunctionName(String),
 }
 
-impl ExpectedOutput {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn with_success(mut self) -> Self {
-        self.exception = false;
-        self
-    }
-
-    pub fn with_failure(mut self) -> Self {
-        self.exception = true;
-        self
-    }
-
-    pub fn with_calldata(mut self, calldata: Calldata) -> Self {
-        self.return_data = Some(calldata);
-        self
-    }
-}
-
-impl Default for Calldata {
-    fn default() -> Self {
-        Self::Compound(Default::default())
-    }
-}
-
-impl Calldata {
-    pub fn find_all_contract_instances(&self, vec: &mut Vec<ContractInstance>) {
-        if let Calldata::Compound(compound) = self {
-            for item in compound {
-                if let Some(instance) = item.strip_suffix(".address") {
-                    vec.push(ContractInstance::new_from(instance))
-                }
-            }
-        }
-    }
-
-    pub fn calldata(
-        &self,
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl EthereumNode,
-    ) -> anyhow::Result<Vec<u8>> {
-        let mut buffer = Vec::<u8>::with_capacity(self.size_requirement());
-        self.calldata_into_slice(&mut buffer, deployed_contracts, chain_state_provider)?;
-        Ok(buffer)
-    }
-
-    pub fn calldata_into_slice(
-        &self,
-        buffer: &mut Vec<u8>,
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
-        chain_state_provider: &impl EthereumNode,
-    ) -> anyhow::Result<()> {
-        match self {
-            Calldata::Single(string) => {
-                alloy::hex::decode_to_slice(string, buffer)?;
-            }
-            Calldata::Compound(items) => {
-                for (arg_idx, arg) in items.iter().enumerate() {
-                    match resolve_argument(arg, deployed_contracts, chain_state_provider) {
-                        Ok(resolved) => {
-                            buffer.extend(resolved.to_be_bytes::<32>());
-                        }
-                        Err(error) => {
-                            tracing::error!(arg, arg_idx, ?error, "Failed to resolve argument");
-                            return Err(error);
-                        }
-                    };
-                }
-            }
-        };
-        Ok(())
-    }
-
-    pub fn size_requirement(&self) -> usize {
-        match self {
-            Calldata::Single(single) => (single.len() - 2) / 2,
-            Calldata::Compound(items) => items.len() * 32,
-        }
-    }
-}
-
 impl Input {
     fn instance_to_address(
         &self,
-        instance: &ContractInstance,
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        instance: &str,
+        deployed_contracts: &HashMap<String, Address>,
     ) -> anyhow::Result<Address> {
         deployed_contracts
             .get(instance)
-            .map(|(a, _)| *a)
-            .ok_or_else(|| anyhow::anyhow!("instance {instance:?} not deployed"))
+            .copied()
+            .ok_or_else(|| anyhow::anyhow!("instance {instance} not deployed"))
     }
 
     pub fn encoded_input(
         &self,
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        deployed_abis: &HashMap<String, JsonAbi>,
+        deployed_contracts: &HashMap<String, Address>,
         chain_state_provider: &impl EthereumNode,
     ) -> anyhow::Result<Bytes> {
-        match self.method {
-            Method::Deployer | Method::Fallback => {
-                let calldata = self
-                    .calldata
-                    .calldata(deployed_contracts, chain_state_provider)?;
+        let Method::FunctionName(ref function_name) = self.method else {
+            return Ok(Bytes::default()); // fallback or deployer — no input
+        };
 
-                Ok(calldata.into())
-            }
-            Method::FunctionName(ref function_name) => {
-                let Some(abi) = deployed_contracts.get(&self.instance).map(|(_, a)| a) else {
-                    tracing::error!(
-                        contract_name = self.instance.as_ref(),
-                        available_abis = ?deployed_contracts.keys().collect::<Vec<_>>(),
-                        "Attempted to lookup ABI of contract but it wasn't found"
-                    );
-                    anyhow::bail!("ABI for instance '{}' not found", self.instance.as_ref());
-                };
+        let Some(abi) = deployed_abis.get(&self.instance) else {
+            tracing::error!(
+                contract_name = self.instance,
+                available_abis = ?deployed_abis.keys().collect::<Vec<_>>(),
+                "Attempted to lookup ABI of contract but it wasn't found"
+            );
+            anyhow::bail!("ABI for instance '{}' not found", &self.instance);
+        };
 
-                tracing::trace!("ABI found for instance: {}", &self.instance.as_ref());
+        tracing::trace!("ABI found for instance: {}", &self.instance);
 
-                // We follow the same logic that's implemented in the matter-labs-tester where they resolve
-                // the function name into a function selector and they assume that he function doesn't have
-                // any existing overloads.
-                // https://github.com/matter-labs/era-compiler-tester/blob/1dfa7d07cba0734ca97e24704f12dd57f6990c2c/compiler_tester/src/test/case/input/mod.rs#L158-L190
-                let function = abi
-                    .functions()
-                    .find(|function| function.signature().starts_with(function_name))
-                    .ok_or_else(|| {
-                        anyhow::anyhow!(
-                            "Function with name {:?} not found in ABI for the instance {:?}",
-                            function_name,
-                            &self.instance
-                        )
-                    })?;
+        // We follow the same logic that's implemented in the matter-labs-tester where they resolve
+        // the function name into a function selector and they assume that he function doesn't have
+        // any existing overloads.
+        // https://github.com/matter-labs/era-compiler-tester/blob/1dfa7d07cba0734ca97e24704f12dd57f6990c2c/compiler_tester/src/test/case/input/mod.rs#L158-L190
+        let function = abi
+            .functions()
+            .find(|function| function.name.starts_with(function_name))
+            .ok_or_else(|| {
+                anyhow::anyhow!(
+                    "Function with name {:?} not found in ABI for the instance {:?}",
+                    function_name,
+                    &self.instance
+                )
+            })?;
 
-                tracing::trace!("Functions found for instance: {}", self.instance.as_ref());
+        tracing::trace!("Functions found for instance: {}", &self.instance);
 
-                tracing::trace!(
-                    "Starting encoding ABI's parameters for instance: {}",
-                    self.instance.as_ref()
-                );
+        let calldata_args = match &self.calldata {
+            Some(Calldata::Compound(args)) => args,
+            _ => anyhow::bail!("Expected compound calldata for function call"),
+        };
 
-                // Allocating a vector that we will be using for the calldata. The vector size will be:
-                // 4 bytes for the function selector.
-                // function.inputs.len() * 32 bytes for the arguments (each argument is a U256).
-                //
-                // We're using indices in the following code in order to avoid the need for us to allocate
-                // a new buffer for each one of the resolved arguments.
-                let mut calldata = Vec::<u8>::with_capacity(4 + self.calldata.size_requirement());
-                calldata.extend(function.selector().0);
-                self.calldata.calldata_into_slice(
-                    &mut calldata,
-                    deployed_contracts,
-                    chain_state_provider,
-                )?;
-
-                Ok(calldata.into())
-            }
+        if calldata_args.len() != function.inputs.len() {
+            anyhow::bail!(
+                "Function expects {} args, but got {}",
+                function.inputs.len(),
+                calldata_args.len()
+            );
         }
+
+        tracing::trace!(
+            "Starting encoding ABI's parameters for instance: {}",
+            &self.instance
+        );
+
+        // Allocating a vector that we will be using for the calldata. The vector size will be:
+        // 4 bytes for the function selector.
+        // function.inputs.len() * 32 bytes for the arguments (each argument is a U256).
+        //
+        // We're using indices in the following code in order to avoid the need for us to allocate
+        // a new buffer for each one of the resolved arguments.
+        let mut calldata = Vec::<u8>::with_capacity(4 + calldata_args.len() * 32);
+        calldata.extend(function.selector().0);
+
+        for (arg_idx, arg) in calldata_args.iter().enumerate() {
+            match resolve_argument(arg, deployed_contracts, chain_state_provider) {
+                Ok(resolved) => {
+                    calldata.extend(resolved.to_be_bytes::<32>());
+                }
+                Err(error) => {
+                    tracing::error!(arg, arg_idx, ?error, "Failed to resolve argument");
+                    return Err(error);
+                }
+            };
+        }
+
+        Ok(calldata.into())
     }
 
     /// Parse this input into a legacy transaction.
     pub fn legacy_transaction(
         &self,
-        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        nonce: u64,
+        deployed_contracts: &HashMap<String, Address>,
+        deployed_abis: &HashMap<String, JsonAbi>,
         chain_state_provider: &impl EthereumNode,
     ) -> anyhow::Result<TransactionRequest> {
-        let input_data = self.encoded_input(deployed_contracts, chain_state_provider)?;
-        let transaction_request = TransactionRequest::default();
+        let input_data =
+            self.encoded_input(deployed_abis, deployed_contracts, chain_state_provider)?;
+        let transaction_request = TransactionRequest::default().nonce(nonce);
         match self.method {
             Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
             _ => Ok(transaction_request
@@ -258,19 +181,10 @@ impl Input {
                 .input(input_data.into())),
         }
     }
-
-    pub fn find_all_contract_instances(&self) -> Vec<ContractInstance> {
-        let mut vec = Vec::new();
-        vec.push(self.instance.clone());
-
-        self.calldata.find_all_contract_instances(&mut vec);
-
-        vec
-    }
 }
 
-fn default_instance() -> ContractInstance {
-    ContractInstance::new_from("Test")
+fn default_instance() -> String {
+    "Test".to_string()
 }
 
 fn default_caller() -> Address {
@@ -287,14 +201,13 @@ fn default_caller() -> Address {
 /// https://github.com/matter-labs/era-compiler-tester/blob/0ed598a27f6eceee7008deab3ff2311075a2ec69/compiler_tester/src/test/case/input/value.rs#L43-L146
 fn resolve_argument(
     value: &str,
-    deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+    deployed_contracts: &HashMap<String, Address>,
     chain_state_provider: &impl EthereumNode,
 ) -> anyhow::Result<U256> {
     if let Some(instance) = value.strip_suffix(".address") {
         Ok(U256::from_be_slice(
             deployed_contracts
-                .get(&ContractInstance::new_from(instance))
-                .map(|(a, _)| *a)
+                .get(instance)
                 .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))?
                 .as_ref(),
         ))
@@ -369,19 +282,22 @@ mod tests {
 
         fn trace_transaction(
             &self,
-            _: &alloy::rpc::types::TransactionReceipt,
-            _: alloy::rpc::types::trace::geth::GethDebugTracingOptions,
+            _: alloy::rpc::types::TransactionReceipt,
         ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
             unimplemented!()
         }
 
         fn state_diff(
             &self,
-            _: &alloy::rpc::types::TransactionReceipt,
+            _: alloy::rpc::types::TransactionReceipt,
         ) -> anyhow::Result<alloy::rpc::types::trace::geth::DiffMode> {
             unimplemented!()
         }
 
+        fn fetch_add_nonce(&self, _: Address) -> anyhow::Result<u64> {
+            unimplemented!()
+        }
+
         fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
             Ok(0x123)
         }
@@ -441,19 +357,19 @@ mod tests {
             .0;
 
         let input = Input {
-            instance: ContractInstance::new_from("Contract"),
+            instance: "Contract".to_string(),
             method: Method::FunctionName("store".to_owned()),
-            calldata: Calldata::Compound(vec!["42".into()]),
+            calldata: Some(Calldata::Compound(vec!["42".into()])),
             ..Default::default()
         };
 
-        let mut contracts = HashMap::new();
-        contracts.insert(
-            ContractInstance::new_from("Contract"),
-            (Address::ZERO, parsed_abi),
-        );
+        let mut deployed_abis = HashMap::new();
+        deployed_abis.insert("Contract".to_string(), parsed_abi);
+        let deployed_contracts = HashMap::new();
 
-        let encoded = input.encoded_input(&contracts, &DummyEthereumNode).unwrap();
+        let encoded = input
+            .encoded_input(&deployed_abis, &deployed_contracts, &DummyEthereumNode)
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (u64,);
@@ -483,68 +399,21 @@ mod tests {
             .0;
 
         let input: Input = Input {
-            instance: ContractInstance::new_from("Contract"),
+            instance: "Contract".to_string(),
             method: Method::FunctionName("send".to_owned()),
-            calldata: Calldata::Compound(vec![
+            calldata: Some(Calldata::Compound(vec![
                 "0x1000000000000000000000000000000000000001".to_string(),
-            ]),
+            ])),
             ..Default::default()
         };
 
-        let mut contracts = HashMap::new();
-        contracts.insert(
-            ContractInstance::new_from("Contract"),
-            (Address::ZERO, parsed_abi),
-        );
+        let mut abis = HashMap::new();
+        abis.insert("Contract".to_string(), parsed_abi);
+        let contracts = HashMap::new();
 
-        let encoded = input.encoded_input(&contracts, &DummyEthereumNode).unwrap();
-        assert!(encoded.0.starts_with(&selector));
-
-        type T = (alloy_primitives::Address,);
-        let decoded: T = T::abi_decode(&encoded.0[4..]).unwrap();
-        assert_eq!(
-            decoded.0,
-            address!("0x1000000000000000000000000000000000000001")
-        );
-    }
-
-    #[test]
-    fn test_encoded_input_address_with_signature() {
-        let raw_abi = r#"[
-        {
-            "inputs": [{"name": "recipient", "type": "address"}],
-            "name": "send",
-            "outputs": [],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        }
-        ]"#;
-
-        let parsed_abi: JsonAbi = serde_json::from_str(raw_abi).unwrap();
-        let selector = parsed_abi
-            .function("send")
-            .unwrap()
-            .first()
-            .unwrap()
-            .selector()
-            .0;
-
-        let input: Input = Input {
-            instance: ContractInstance::new_from("Contract"),
-            method: Method::FunctionName("send(address)".to_owned()),
-            calldata: Calldata::Compound(vec![
-                "0x1000000000000000000000000000000000000001".to_string(),
-            ]),
-            ..Default::default()
-        };
-
-        let mut contracts = HashMap::new();
-        contracts.insert(
-            ContractInstance::new_from("Contract"),
-            (Address::ZERO, parsed_abi),
-        );
-
-        let encoded = input.encoded_input(&contracts, &DummyEthereumNode).unwrap();
+        let encoded = input
+            .encoded_input(&abis, &contracts, &DummyEthereumNode)
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (alloy_primitives::Address,);

crates/format/src/lib.rs

@@ -3,6 +3,5 @@
 pub mod case;
 pub mod corpus;
 pub mod input;
-pub mod macros;
 pub mod metadata;
 pub mod mode;

crates/format/src/macros.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>>
-/// }
-/// ```
-#[macro_export]
-macro_rules! define_wrapper_type {
-    (
-        $(#[$meta: meta])*
-        $ident: ident($ty: ty) $(;)?
-    ) => {
-        $(#[$meta])*
-        pub struct $ident($ty);
-
-        impl $ident {
-            pub fn new(value: $ty) -> Self {
-                Self(value)
-            }
-
-            pub fn new_from<T: Into<$ty>>(value: T) -> 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
-            }
-        }
-    };
-}

crates/format/src/metadata.rs

@@ -1,17 +1,14 @@
 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 crate::{
     case::Case,
-    define_wrapper_type,
     mode::{Mode, SolcMode},
 };
 
@@ -45,8 +42,7 @@ impl Deref for MetadataFile {
 #[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
     pub cases: Vec<Case>,
-    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdentifier>>,
-    // TODO: Convert into wrapper types for clarity.
+    pub contracts: Option<BTreeMap<String, String>>,
     pub libraries: Option<BTreeMap<String, BTreeMap<String, String>>>,
     pub ignore: Option<bool>,
     pub modes: Option<Vec<Mode>>,
@@ -81,35 +77,28 @@ impl Metadata {
             .to_path_buf())
     }
 
-    /// Returns the contract sources with canonicalized paths for the files
-    pub fn contract_sources(
-        &self,
-    ) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdentifier>> {
+    /// Extract the contract sources.
+    ///
+    /// Returns a mapping of contract IDs to their source path and contract name.
+    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 (
-            alias,
-            ContractPathAndIdentifier {
-                contract_source_path,
-                contract_ident,
-            },
-        ) in contracts
-        {
-            let alias = alias.clone();
-            let absolute_path = directory.join(contract_source_path).canonicalize()?;
-            let contract_ident = contract_ident.clone();
+        for (id, contract) in contracts {
+            // TODO: broken if a colon is in the dir name..
+            let mut parts = contract.split(':');
+            let (Some(file_name), Some(contract_name)) = (parts.next(), parts.next()) else {
+                anyhow::bail!("metadata contains invalid contract: {contract}");
+            };
+            let file = directory.to_path_buf().join(file_name);
+            if !file.is_file() {
+                anyhow::bail!("contract {id} is not a file: {}", file.display());
+            }
 
-            sources.insert(
-                alias,
-                ContractPathAndIdentifier {
-                    contract_source_path: absolute_path,
-                    contract_ident,
-                },
-            );
+            sources.insert(id.clone(), (file, contract_name.to_string()));
         }
 
         Ok(sources)
@@ -189,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(
-                    [(
-                        ContractInstance::new_from("test"),
-                        ContractPathAndIdentifier {
-                            contract_source_path: path.to_path_buf(),
-                            contract_ident: ContractIdent::new_from("Test"),
-                        },
-                    )]
-                    .into(),
-                );
+                let name = path
+                    .file_name()
+                    .expect("this should be the path to a Solidity file")
+                    .to_str()
+                    .expect("the file name should be valid UTF-8k");
+                metadata.contracts = Some([(String::from("Test"), format!("{name}:Test"))].into());
                 Some(metadata)
             }
             Err(error) => {
@@ -211,139 +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)]
-    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)]
-    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 ContractPathAndIdentifier {
-    /// 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 ContractPathAndIdentifier {
-    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 ContractPathAndIdentifier {
-    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 ContractPathAndIdentifier {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Self::from_str(&value)
-    }
-}
-
-impl From<ContractPathAndIdentifier> for String {
-    fn from(value: ContractPathAndIdentifier) -> 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 = ContractPathAndIdentifier::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/node-interaction/src/lib.rs

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

crates/node/src/common.rs

@@ -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/geth.rs

@@ -1,11 +1,15 @@
 //! The go-ethereum node implementation.
 
 use std::{
+    collections::HashMap,
     fs::{File, OpenOptions, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
     path::PathBuf,
     process::{Child, Command, Stdio},
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        Mutex,
+        atomic::{AtomicU32, Ordering},
+    },
     time::{Duration, Instant},
 };
 
@@ -16,7 +20,7 @@ use alloy::{
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
-        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
+        fillers::{FillProvider, TxFiller},
     },
     rpc::types::{
         TransactionReceipt, TransactionRequest,
@@ -27,7 +31,7 @@ use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 use tracing::Level;
 
-use crate::{Node, common::FallbackGasFiller};
+use crate::Node;
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -50,7 +54,7 @@ pub struct Instance {
     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
@@ -202,19 +206,8 @@ impl Instance {
     > + 'static {
         let connection_string = self.connection_string();
         let wallet = self.wallet.clone();
-
-        // Note: We would like all providers to make use of the same nonce manager so that we have
-        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
-        // its implementation and therefore it means that when we clone it then it still references
-        // the same state.
-        let nonce_manager = self.nonce_manager.clone();
-
         Box::pin(async move {
             ProviderBuilder::new()
-                .disable_recommended_fillers()
-                .filler(FallbackGasFiller::new(500_000_000, 500_000_000, 1))
-                .filler(ChainIdFiller::default())
-                .filler(NonceFiller::new(nonce_manager))
                 .wallet(wallet)
                 .connect(&connection_string)
                 .await
@@ -231,7 +224,7 @@ impl EthereumNode for Instance {
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
         let provider = self.provider();
         BlockingExecutor::execute(async move {
-            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
+            let outer_span = tracing::debug_span!("Submitting transaction", ?transaction,);
             let _outer_guard = outer_span.enter();
 
             let provider = provider.await?;
@@ -312,28 +305,30 @@ impl EthereumNode for Instance {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn trace_transaction(
         &self,
-        transaction: &TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
+        transaction: TransactionReceipt,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let tx_hash = transaction.transaction_hash;
-        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 provider = self.provider();
+
+        BlockingExecutor::execute(async move {
+            Ok(provider
+                .await?
+                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .await?)
+        })?
+    }
+
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    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),
@@ -341,6 +336,24 @@ impl EthereumNode for Instance {
         }
     }
 
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
+        let provider = self.provider();
+        let onchain_nonce = BlockingExecutor::execute::<anyhow::Result<_>>(async move {
+            provider
+                .await?
+                .get_transaction_count(address)
+                .await
+                .map_err(Into::into)
+        })??;
+
+        let mut nonces = self.nonces.lock().unwrap();
+        let current = nonces.entry(address).or_insert(onchain_nonce);
+        let value = *current;
+        *current += 1;
+        Ok(value)
+    }
+
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         let provider = self.provider();
@@ -440,10 +453,10 @@ impl Node for Instance {
             network_id: config.network_id,
             start_timeout: config.geth_start_timeout,
             wallet: config.wallet(),
+            nonces: Mutex::new(HashMap::new()),
             // We know that we only need to be storing 2 files so we can specify that when creating
             // the vector. It's the stdout and stderr of the geth node.
             logs_file_to_flush: Vec::with_capacity(2),
-            nonce_manager: Default::default(),
         }
     }
 

crates/node/src/kitchensink.rs

@@ -1,9 +1,13 @@
 use std::{
+    collections::HashMap,
     fs::{File, OpenOptions, create_dir_all, remove_dir_all},
     io::{BufRead, Write},
     path::{Path, PathBuf},
     process::{Child, Command, Stdio},
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        Mutex,
+        atomic::{AtomicU32, Ordering},
+    },
     time::Duration,
 };
 
@@ -19,7 +23,7 @@ use alloy::{
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
-        fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
+        fillers::{FillProvider, TxFiller},
     },
     rpc::types::{
         TransactionReceipt,
@@ -36,7 +40,7 @@ use tracing::Level;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 
-use crate::{Node, common::FallbackGasFiller};
+use crate::Node;
 
 static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 
@@ -51,7 +55,7 @@ pub struct KitchensinkNode {
     logs_directory: PathBuf,
     process_substrate: Option<Child>,
     process_proxy: Option<Child>,
-    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
@@ -346,24 +350,9 @@ impl KitchensinkNode {
     > + 'static {
         let connection_string = self.connection_string();
         let wallet = self.wallet.clone();
-
-        // Note: We would like all providers to make use of the same nonce manager so that we have
-        // monotonically increasing nonces that are cached. The cached nonce manager uses Arc's in
-        // its implementation and therefore it means that when we clone it then it still references
-        // the same state.
-        let nonce_manager = self.nonce_manager.clone();
-
         Box::pin(async move {
             ProviderBuilder::new()
-                .disable_recommended_fillers()
                 .network::<KitchenSinkNetwork>()
-                .filler(FallbackGasFiller::new(
-                    30_000_000,
-                    200_000_000_000,
-                    3_000_000_000,
-                ))
-                .filler(ChainIdFiller::default())
-                .filler(NonceFiller::new(nonce_manager))
                 .wallet(wallet)
                 .connect(&connection_string)
                 .await
@@ -395,28 +384,27 @@ impl EthereumNode for KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn trace_transaction(
         &self,
-        transaction: &TransactionReceipt,
-        trace_options: GethDebugTracingOptions,
+        transaction: TransactionReceipt,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let tx_hash = transaction.transaction_hash;
-        let provider = self.provider();
-        BlockingExecutor::execute(async move {
-            Ok(provider
-                .await?
-                .debug_trace_transaction(tx_hash, trace_options)
-                .await?)
-        })?
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
         let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
             diff_mode: Some(true),
             disable_code: None,
             disable_storage: None,
         });
+        let provider = self.provider();
+
+        BlockingExecutor::execute(async move {
+            Ok(provider
+                .await?
+                .debug_trace_transaction(transaction.transaction_hash, trace_options)
+                .await?)
+        })?
+    }
+
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    fn state_diff(&self, transaction: TransactionReceipt) -> anyhow::Result<DiffMode> {
         match self
-            .trace_transaction(transaction, trace_options)?
+            .trace_transaction(transaction)?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
@@ -424,6 +412,24 @@ impl EthereumNode for KitchensinkNode {
         }
     }
 
+    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    fn fetch_add_nonce(&self, address: Address) -> anyhow::Result<u64> {
+        let provider = self.provider();
+        let onchain_nonce = BlockingExecutor::execute::<anyhow::Result<_>>(async move {
+            provider
+                .await?
+                .get_transaction_count(address)
+                .await
+                .map_err(Into::into)
+        })??;
+
+        let mut nonces = self.nonces.lock().unwrap();
+        let current = nonces.entry(address).or_insert(onchain_nonce);
+        let value = *current;
+        *current += 1;
+        Ok(value)
+    }
+
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         let provider = self.provider();
@@ -523,7 +529,7 @@ impl Node for KitchensinkNode {
             logs_directory,
             process_substrate: None,
             process_proxy: None,
-            nonce_manager: Default::default(),
+            nonces: Mutex::new(HashMap::new()),
             // We know that we only need to be storing 4 files so we can specify that when creating
             // the vector. It's the stdout and stderr of the substrate-node and the eth-rpc.
             logs_file_to_flush: Vec::with_capacity(4),
@@ -1014,7 +1020,7 @@ mod tests {
     use alloy::rpc::types::TransactionRequest;
     use revive_dt_config::Arguments;
     use std::path::PathBuf;
-    use std::sync::{LazyLock, Mutex};
+    use std::sync::LazyLock;
     use temp_dir::TempDir;
 
     use std::fs;
@@ -1290,7 +1296,8 @@ mod tests {
         let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
 
         // Assert
-        let _ = coinbase.expect("Failed to get the coinbase");
+        let coinbase = coinbase.expect("Failed to get the coinbase");
+        assert_eq!(coinbase, Address::ZERO)
     }
 
     #[test]
@@ -1302,7 +1309,8 @@ mod tests {
         let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
 
         // Assert
-        let _ = block_difficulty.expect("Failed to get the block difficulty");
+        let block_difficulty = block_difficulty.expect("Failed to get the block difficulty");
+        assert_eq!(block_difficulty, U256::ZERO)
     }
 
     #[test]
@@ -1338,6 +1346,7 @@ mod tests {
         let block_number = node.last_block_number();
 
         // Assert
-        let _ = block_number.expect("Failed to get the block number");
+        let block_number = block_number.expect("Failed to get the block number");
+        assert_eq!(block_number, 0)
     }
 }

crates/node/src/lib.rs

@@ -3,7 +3,6 @@
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
-pub mod common;
 pub mod geth;
 pub mod kitchensink;
 pub mod pool;

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();
     }
 }