Increase kitchensink wait time to 60 seconds

Cargo.lock

@@ -4030,7 +4030,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "semver 1.0.26",
- "tokio",
 ]
 
 [[package]]
@@ -4095,7 +4094,6 @@ dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
  "anyhow",
- "revive-common",
  "revive-dt-common",
  "semver 1.0.26",
  "serde",
@@ -4110,7 +4108,6 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
- "revive-common",
  "revive-dt-common",
  "revive-dt-config",
  "revive-dt-format",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT/Apache-2.0"
 edition = "2024"
 repository = "https://github.com/paritytech/revive-differential-testing.git"
-rust-version = "1.87.0"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
 revive-dt-common = { version = "0.1.0", path = "crates/common" }

assets/test_metadata.json

@@ -8,18 +8,6 @@
         {
             "name": "first",
             "inputs": [
-                {
-                    "address": "0xdeadbeef00000000000000000000000000000042",
-                    "expected_balance": "1233"
-                },
-                {
-                    "address": "0xdeadbeef00000000000000000000000000000042",
-                    "is_storage_empty": true
-                },
-                {
-                    "address": "0xdeadbeef00000000000000000000000000000042",
-                    "is_storage_empty": false
-                },
                 {
                     "instance": "WBTC_1",
                     "method": "#deployer",

crates/common/Cargo.toml

@@ -11,4 +11,3 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 semver = { workspace = true }
-tokio = { workspace = true, default-features = false, features = ["time"] }

crates/common/src/futures/mod.rs

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

crates/common/src/futures/poll.rs

@@ -1,69 +0,0 @@
-use std::ops::ControlFlow;
-use std::time::Duration;
-
-use anyhow::{Result, anyhow};
-
-const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60);
-
-/// A function that polls for a fallible future for some period of time and errors if it fails to
-/// get a result after polling.
-///
-/// Given a future that returns a [`Result<ControlFlow<O, ()>>`], this function calls the future
-/// repeatedly (with some wait period) until the future returns a [`ControlFlow::Break`] or until it
-/// returns an [`Err`] in which case the function stops polling and returns the error.
-///
-/// If the future keeps returning [`ControlFlow::Continue`] and fails to return a [`Break`] within
-/// the permitted polling duration then this function returns an [`Err`]
-///
-/// [`Break`]: ControlFlow::Break
-/// [`Continue`]: ControlFlow::Continue
-pub async fn poll<F, O>(
-    polling_duration: Duration,
-    polling_wait_behavior: PollingWaitBehavior,
-    mut future: impl FnMut() -> F,
-) -> Result<O>
-where
-    F: Future<Output = Result<ControlFlow<O, ()>>>,
-{
-    let mut retries = 0;
-    let mut total_wait_duration = Duration::ZERO;
-    let max_allowed_wait_duration = polling_duration;
-
-    loop {
-        if total_wait_duration >= max_allowed_wait_duration {
-            break Err(anyhow!(
-                "Polling failed after {} retries and a total of {:?} of wait time",
-                retries,
-                total_wait_duration
-            ));
-        }
-
-        match future().await? {
-            ControlFlow::Continue(()) => {
-                let next_wait_duration = match polling_wait_behavior {
-                    PollingWaitBehavior::Constant(duration) => duration,
-                    PollingWaitBehavior::ExponentialBackoff => {
-                        Duration::from_secs(2u64.pow(retries))
-                            .min(EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION)
-                    }
-                };
-                let next_wait_duration =
-                    next_wait_duration.min(max_allowed_wait_duration - total_wait_duration);
-                total_wait_duration += next_wait_duration;
-                retries += 1;
-
-                tokio::time::sleep(next_wait_duration).await;
-            }
-            ControlFlow::Break(output) => {
-                break Ok(output);
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub enum PollingWaitBehavior {
-    Constant(Duration),
-    #[default]
-    ExponentialBackoff,
-}

crates/common/src/iterators/files_with_extension_iterator.rs

@@ -1,8 +1,4 @@
-use std::{
-    borrow::Cow,
-    collections::HashSet,
-    path::{Path, PathBuf},
-};
+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`
@@ -22,10 +18,10 @@ pub struct FilesWithExtensionIterator {
 }
 
 impl FilesWithExtensionIterator {
-    pub fn new(root_directory: impl AsRef<Path>) -> Self {
+    pub fn new(root_directory: PathBuf) -> Self {
         Self {
             allowed_extensions: Default::default(),
-            directories_to_search: vec![root_directory.as_ref().to_path_buf()],
+            directories_to_search: vec![root_directory],
             files_matching_allowed_extensions: Default::default(),
         }
     }

crates/common/src/lib.rs

@@ -2,7 +2,6 @@
 //! the workspace can benefit from.
 
 pub mod fs;
-pub mod futures;
 pub mod iterators;
 pub mod macros;
 pub mod types;

crates/compiler/src/solc.rs

@@ -238,25 +238,4 @@ mod test {
             Version::new(0, 7, 6)
         )
     }
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained1() {
-        // Arrange
-        let args = Arguments::default();
-        println!("Getting compiler path");
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 4, 21))
-            .await
-            .unwrap();
-        println!("Got compiler path");
-        let compiler = Solc::new(path);
-
-        // Act
-        let version = compiler.version();
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 4, 21)
-        )
-    }
 }

crates/core/src/driver/mod.rs

@@ -4,11 +4,10 @@ use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::path::PathBuf;
 
-use alloy::consensus::EMPTY_ROOT_HASH;
-use alloy::hex;
+use alloy::eips::BlockNumberOrTag;
 use alloy::json_abi::JsonAbi;
 use alloy::network::{Ethereum, TransactionBuilder};
-use alloy::primitives::U256;
+use alloy::primitives::{BlockNumber, U256};
 use alloy::rpc::types::TransactionReceipt;
 use alloy::rpc::types::trace::geth::{
     CallFrame, GethDebugBuiltInTracerType, GethDebugTracerType, GethDebugTracingOptions, GethTrace,
@@ -23,16 +22,13 @@ use alloy::{
 };
 use anyhow::Context;
 use indexmap::IndexMap;
-use revive_dt_format::traits::{ResolutionContext, ResolverApi};
+use revive_dt_format::traits::ResolverApi;
 use semver::Version;
 
 use revive_dt_format::case::{Case, CaseIdx};
-use revive_dt_format::input::{
-    BalanceAssertion, Calldata, EtherValue, Expected, ExpectedOutput, Input, Method,
-    StorageEmptyAssertion,
-};
+use revive_dt_format::input::{Calldata, EtherValue, Expected, ExpectedOutput, Method};
 use revive_dt_format::metadata::{ContractInstance, ContractPathAndIdent};
-use revive_dt_format::{input::Step, metadata::Metadata};
+use revive_dt_format::{input::Input, metadata::Metadata};
 use revive_dt_node::Node;
 use revive_dt_node_interaction::EthereumNode;
 use tracing::Instrument;
@@ -74,32 +70,6 @@ where
         }
     }
 
-    pub async fn handle_step(
-        &mut self,
-        metadata: &Metadata,
-        case_idx: CaseIdx,
-        step: &Step,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<StepOutput> {
-        match step {
-            Step::FunctionCall(input) => {
-                let (receipt, geth_trace, diff_mode) =
-                    self.handle_input(metadata, case_idx, input, node).await?;
-                Ok(StepOutput::FunctionCall(receipt, geth_trace, diff_mode))
-            }
-            Step::BalanceAssertion(balance_assertion) => {
-                self.handle_balance_assertion(metadata, case_idx, balance_assertion, node)
-                    .await?;
-                Ok(StepOutput::BalanceAssertion)
-            }
-            Step::StorageEmptyAssertion(storage_empty) => {
-                self.handle_storage_empty(metadata, case_idx, storage_empty, node)
-                    .await?;
-                Ok(StepOutput::StorageEmptyAssertion)
-            }
-        }
-    }
-
     pub async fn handle_input(
         &mut self,
         metadata: &Metadata,
@@ -108,7 +78,7 @@ where
         node: &T::Blockchain,
     ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
         let deployment_receipts = self
-            .handle_input_contract_deployment(metadata, case_idx, input, node)
+            .handle_contract_deployment(metadata, case_idx, input, node)
             .await?;
         let execution_receipt = self
             .handle_input_execution(input, deployment_receipts, node)
@@ -117,42 +87,20 @@ where
             .handle_input_call_frame_tracing(&execution_receipt, node)
             .await?;
         self.handle_input_variable_assignment(input, &tracing_result)?;
-        self.handle_input_expectations(input, &execution_receipt, node, &tracing_result)
+        let resolver = BlockPinnedResolver::<'_, T> {
+            node,
+            block_number: execution_receipt
+                .block_number
+                .context("Transaction was not included in a block")?,
+        };
+        self.handle_input_expectations(input, &execution_receipt, &resolver, &tracing_result)
             .await?;
         self.handle_input_diff(case_idx, execution_receipt, node)
             .await
     }
 
-    pub async fn handle_balance_assertion(
-        &mut self,
-        metadata: &Metadata,
-        _: CaseIdx,
-        balance_assertion: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        self.handle_balance_assertion_contract_deployment(metadata, balance_assertion, node)
-            .await?;
-        self.handle_balance_assertion_execution(balance_assertion, node)
-            .await?;
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty(
-        &mut self,
-        metadata: &Metadata,
-        _: CaseIdx,
-        storage_empty: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        self.handle_storage_empty_assertion_contract_deployment(metadata, storage_empty, node)
-            .await?;
-        self.handle_storage_empty_assertion_execution(storage_empty, node)
-            .await?;
-        Ok(())
-    }
-
     /// Handles the contract deployment for a given input performing it if it needs to be performed.
-    async fn handle_input_contract_deployment(
+    async fn handle_contract_deployment(
         &mut self,
         metadata: &Metadata,
         case_idx: CaseIdx,
@@ -222,7 +170,7 @@ where
                 .context("Failed to find deployment receipt"),
             Method::Fallback | Method::FunctionName(_) => {
                 let tx = match input
-                    .legacy_transaction(node, self.default_resolution_context())
+                    .legacy_transaction(&self.deployed_contracts, &self.variables, node)
                     .await
                 {
                     Ok(tx) => {
@@ -294,11 +242,6 @@ where
         ) {
             let value = U256::from_be_slice(output_word);
             self.variables.insert(variable_name.clone(), value);
-            tracing::info!(
-                variable_name,
-                variable_value = hex::encode(value.to_be_bytes::<32>()),
-                "Assigned variable"
-            );
         }
 
         Ok(())
@@ -368,10 +311,8 @@ where
             }
         }
 
-        let resolution_context = self
-            .default_resolution_context()
-            .with_block_number(execution_receipt.block_number.as_ref())
-            .with_transaction_hash(&execution_receipt.transaction_hash);
+        let deployed_contracts = &mut self.deployed_contracts;
+        let variables = &mut self.variables;
 
         // Handling the receipt state assertion.
         let expected = !expectation.exception;
@@ -394,7 +335,7 @@ where
             let expected = expected_calldata;
             let actual = &tracing_result.output.as_ref().unwrap_or_default();
             if !expected
-                .is_equivalent(actual, resolver, resolution_context)
+                .is_equivalent(actual, deployed_contracts, &*variables, resolver)
                 .await?
             {
                 tracing::error!(
@@ -429,7 +370,7 @@ where
                 if let Some(ref expected_address) = expected_event.address {
                     let expected = Address::from_slice(
                         Calldata::new_compound([expected_address])
-                            .calldata(resolver, resolution_context)
+                            .calldata(deployed_contracts, &*variables, resolver)
                             .await?
                             .get(12..32)
                             .expect("Can't fail"),
@@ -457,7 +398,7 @@ where
                 {
                     let expected = Calldata::new_compound([expected]);
                     if !expected
-                        .is_equivalent(&actual.0, resolver, resolution_context)
+                        .is_equivalent(&actual.0, deployed_contracts, &*variables, resolver)
                         .await?
                     {
                         tracing::error!(
@@ -477,7 +418,7 @@ where
                 let expected = &expected_event.values;
                 let actual = &actual_event.data().data;
                 if !expected
-                    .is_equivalent(&actual.0, resolver, resolution_context)
+                    .is_equivalent(&actual.0, deployed_contracts, &*variables, resolver)
                     .await?
                 {
                     tracing::error!(
@@ -520,128 +461,6 @@ where
         Ok((execution_receipt, trace, diff))
     }
 
-    pub async fn handle_balance_assertion_contract_deployment(
-        &mut self,
-        metadata: &Metadata,
-        balance_assertion: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let Some(instance) = balance_assertion
-            .address
-            .strip_prefix(".address")
-            .map(ContractInstance::new)
-        else {
-            return Ok(());
-        };
-        self.get_or_deploy_contract_instance(
-            &instance,
-            metadata,
-            Input::default_caller(),
-            None,
-            None,
-            node,
-        )
-        .await?;
-        Ok(())
-    }
-
-    pub async fn handle_balance_assertion_execution(
-        &mut self,
-        BalanceAssertion {
-            address: address_string,
-            expected_balance: amount,
-            ..
-        }: &BalanceAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let address = Address::from_slice(
-            Calldata::new_compound([address_string])
-                .calldata(node, self.default_resolution_context())
-                .await?
-                .get(12..32)
-                .expect("Can't fail"),
-        );
-
-        let balance = node.balance_of(address).await?;
-
-        let expected = *amount;
-        let actual = balance;
-        if expected != actual {
-            tracing::error!(%expected, %actual, %address, "Balance assertion failed");
-            anyhow::bail!(
-                "Balance assertion failed - Expected {} but got {} for {} resolved to {}",
-                expected,
-                actual,
-                address_string,
-                address,
-            )
-        }
-
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty_assertion_contract_deployment(
-        &mut self,
-        metadata: &Metadata,
-        storage_empty_assertion: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let Some(instance) = storage_empty_assertion
-            .address
-            .strip_prefix(".address")
-            .map(ContractInstance::new)
-        else {
-            return Ok(());
-        };
-        self.get_or_deploy_contract_instance(
-            &instance,
-            metadata,
-            Input::default_caller(),
-            None,
-            None,
-            node,
-        )
-        .await?;
-        Ok(())
-    }
-
-    pub async fn handle_storage_empty_assertion_execution(
-        &mut self,
-        StorageEmptyAssertion {
-            address: address_string,
-            is_storage_empty,
-            ..
-        }: &StorageEmptyAssertion,
-        node: &T::Blockchain,
-    ) -> anyhow::Result<()> {
-        let address = Address::from_slice(
-            Calldata::new_compound([address_string])
-                .calldata(node, self.default_resolution_context())
-                .await?
-                .get(12..32)
-                .expect("Can't fail"),
-        );
-
-        let storage = node.latest_state_proof(address, Default::default()).await?;
-        let is_empty = storage.storage_hash == EMPTY_ROOT_HASH;
-
-        let expected = is_storage_empty;
-        let actual = is_empty;
-
-        if *expected != actual {
-            tracing::error!(%expected, %actual, %address, "Storage Empty Assertion failed");
-            anyhow::bail!(
-                "Storage Empty Assertion failed - Expected {} but got {} for {} resolved to {}",
-                expected,
-                actual,
-                address_string,
-                address,
-            )
-        };
-
-        Ok(())
-    }
-
     /// Gets the information of a deployed contract or library from the state. If it's found to not
     /// be deployed then it will be deployed.
     ///
@@ -705,7 +524,7 @@ where
 
         if let Some(calldata) = calldata {
             let calldata = calldata
-                .calldata(node, self.default_resolution_context())
+                .calldata(&self.deployed_contracts, None, node)
                 .await?;
             code.extend(calldata);
         }
@@ -746,12 +565,6 @@ where
 
         Ok((address, abi, Some(receipt)))
     }
-
-    fn default_resolution_context(&self) -> ResolutionContext<'_> {
-        ResolutionContext::default()
-            .with_deployed_contracts(&self.deployed_contracts)
-            .with_variables(&self.variables)
-    }
 }
 
 pub struct CaseDriver<'a, Leader: Platform, Follower: Platform> {
@@ -831,55 +644,102 @@ where
             return Ok(0);
         }
 
-        let mut steps_executed = 0;
-        for (step_idx, step) in self.case.steps_iterator().enumerate() {
-            let tracing_span = tracing::info_span!("Handling input", step_idx);
+        let mut inputs_executed = 0;
+        for (input_idx, input) in self.case.inputs_iterator().enumerate() {
+            let tracing_span = tracing::info_span!("Handling input", input_idx);
 
-            let leader_step_output = self
+            let (leader_receipt, _, leader_diff) = self
                 .leader_state
-                .handle_step(self.metadata, self.case_idx, &step, self.leader_node)
+                .handle_input(self.metadata, self.case_idx, &input, self.leader_node)
                 .instrument(tracing_span.clone())
                 .await?;
-            let follower_step_output = self
+            let (follower_receipt, _, follower_diff) = self
                 .follower_state
-                .handle_step(self.metadata, self.case_idx, &step, self.follower_node)
+                .handle_input(self.metadata, self.case_idx, &input, self.follower_node)
                 .instrument(tracing_span)
                 .await?;
-            match (leader_step_output, follower_step_output) {
-                (
-                    StepOutput::FunctionCall(leader_receipt, _, leader_diff),
-                    StepOutput::FunctionCall(follower_receipt, _, follower_diff),
-                ) => {
-                    if leader_diff == follower_diff {
-                        tracing::debug!("State diffs match between leader and follower.");
-                    } else {
-                        tracing::debug!("State diffs mismatch between leader and follower.");
-                        Self::trace_diff_mode("Leader", &leader_diff);
-                        Self::trace_diff_mode("Follower", &follower_diff);
-                    }
 
-                    if leader_receipt.logs() != follower_receipt.logs() {
-                        tracing::debug!("Log/event mismatch between leader and follower.");
-                        tracing::trace!("Leader logs: {:?}", leader_receipt.logs());
-                        tracing::trace!("Follower logs: {:?}", follower_receipt.logs());
-                    }
-                }
-                (StepOutput::BalanceAssertion, StepOutput::BalanceAssertion) => {}
-                (StepOutput::StorageEmptyAssertion, StepOutput::StorageEmptyAssertion) => {}
-                _ => unreachable!("The two step outputs can not be of a different kind"),
+            if leader_diff == follower_diff {
+                tracing::debug!("State diffs match between leader and follower.");
+            } else {
+                tracing::debug!("State diffs mismatch between leader and follower.");
+                Self::trace_diff_mode("Leader", &leader_diff);
+                Self::trace_diff_mode("Follower", &follower_diff);
             }
 
-            steps_executed += 1;
+            if leader_receipt.logs() != follower_receipt.logs() {
+                tracing::debug!("Log/event mismatch between leader and follower.");
+                tracing::trace!("Leader logs: {:?}", leader_receipt.logs());
+                tracing::trace!("Follower logs: {:?}", follower_receipt.logs());
+            }
+
+            inputs_executed += 1;
         }
 
-        Ok(steps_executed)
+        Ok(inputs_executed)
     }
 }
 
-#[derive(Clone, Debug)]
-#[allow(clippy::large_enum_variant)]
-pub enum StepOutput {
-    FunctionCall(TransactionReceipt, GethTrace, DiffMode),
-    BalanceAssertion,
-    StorageEmptyAssertion,
+pub struct BlockPinnedResolver<'a, T: Platform> {
+    block_number: BlockNumber,
+    node: &'a T::Blockchain,
+}
+
+impl<'a, T: Platform> ResolverApi for BlockPinnedResolver<'a, T> {
+    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+        self.node.chain_id().await
+    }
+
+    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+        self.node
+            .block_gas_limit(self.resolve_block_number_or_tag(number))
+            .await
+    }
+
+    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+        self.node
+            .block_coinbase(self.resolve_block_number_or_tag(number))
+            .await
+    }
+
+    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+        self.node
+            .block_difficulty(self.resolve_block_number_or_tag(number))
+            .await
+    }
+
+    async fn block_hash(
+        &self,
+        number: BlockNumberOrTag,
+    ) -> anyhow::Result<alloy::primitives::BlockHash> {
+        self.node
+            .block_hash(self.resolve_block_number_or_tag(number))
+            .await
+    }
+
+    async fn block_timestamp(
+        &self,
+        number: BlockNumberOrTag,
+    ) -> anyhow::Result<alloy::primitives::BlockTimestamp> {
+        self.node
+            .block_timestamp(self.resolve_block_number_or_tag(number))
+            .await
+    }
+
+    async fn last_block_number(&self) -> anyhow::Result<alloy::primitives::BlockNumber> {
+        Ok(self.block_number)
+    }
+}
+
+impl<'a, T: Platform> BlockPinnedResolver<'a, T> {
+    fn resolve_block_number_or_tag(&self, number: BlockNumberOrTag) -> BlockNumberOrTag {
+        match number {
+            BlockNumberOrTag::Latest => BlockNumberOrTag::Number(self.block_number),
+            n @ BlockNumberOrTag::Finalized
+            | n @ BlockNumberOrTag::Safe
+            | n @ BlockNumberOrTag::Earliest
+            | n @ BlockNumberOrTag::Pending
+            | n @ BlockNumberOrTag::Number(_) => n,
+        }
+    }
 }

crates/core/src/main.rs

@@ -2,7 +2,6 @@ use std::{
     collections::HashMap,
     path::Path,
     sync::{Arc, LazyLock},
-    time::Instant,
 };
 
 use alloy::{
@@ -32,7 +31,7 @@ use revive_dt_core::{
 use revive_dt_format::{
     case::{Case, CaseIdx},
     corpus::Corpus,
-    input::{Input, Step},
+    input::Input,
     metadata::{ContractInstance, ContractPathAndIdent, Metadata, MetadataFile},
     mode::SolcMode,
 };
@@ -163,41 +162,6 @@ where
                 Some(false) | None => true,
             },
         )
-        .filter(
-            |(metadata_file_path, _, case_idx, case, _)| match case.ignore {
-                Some(true) => {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        case_idx,
-                        case_name = ?case.name,
-                        "Ignoring case"
-                    );
-                    false
-                }
-                Some(false) | None => true,
-            },
-        )
-        .filter(|(metadata_file_path, metadata, ..)| match metadata.required_evm_version {
-            Some(evm_version_requirement) => {
-                let is_allowed = evm_version_requirement
-                    .matches(&<L::Blockchain as revive_dt_node::Node>::evm_version())
-                    && evm_version_requirement
-                        .matches(&<F::Blockchain as revive_dt_node::Node>::evm_version());
-
-                if !is_allowed {
-                    tracing::warn!(
-                        metadata_file_path = %metadata_file_path.display(),
-                        leader_evm_version = %<L::Blockchain as revive_dt_node::Node>::evm_version(),
-                        follower_evm_version = %<F::Blockchain as revive_dt_node::Node>::evm_version(),
-                        version_requirement = %evm_version_requirement,
-                        "Skipped test since the EVM version requirement was not fulfilled."
-                    );
-                }
-
-                is_allowed
-            }
-            None => true,
-        })
         .collect::<Vec<_>>();
 
     let metadata_case_status = Arc::new(RwLock::new(test_cases.iter().fold(
@@ -211,7 +175,6 @@ where
     )));
     let status_reporter_task = {
         let metadata_case_status = metadata_case_status.clone();
-        let start = Instant::now();
         async move {
             const GREEN: &str = "\x1B[32m";
             const RED: &str = "\x1B[31m";
@@ -271,10 +234,10 @@ where
                         })
                         .collect::<Vec<_>>();
                     case_status.sort_by(|a, b| a.0.cmp(&b.0));
-                    for (case_idx, case_name, case_status) in case_status.into_iter() {
+                    for (_, case_name, case_status) in case_status.into_iter() {
                         if case_status {
                             eprintln!(
-                                "  {GREEN}Case Succeeded:{RESET} {} - Case Idx: {case_idx}",
+                                "{GREEN}  Case Succeeded:{RESET} {}",
                                 case_name
                                     .as_ref()
                                     .map(|string| string.as_str())
@@ -282,7 +245,7 @@ where
                             )
                         } else {
                             eprintln!(
-                                "  {RED}Case Failed:{RESET} {} - Case Idx: {case_idx}",
+                                "{RED}  Case Failed:{RESET} {}",
                                 case_name
                                     .as_ref()
                                     .map(|string| string.as_str())
@@ -304,12 +267,8 @@ where
                 tokio::time::sleep(std::time::Duration::from_secs(3)).await;
             }
 
-            let elapsed = start.elapsed();
             eprintln!(
-                "{GREEN}{}{RESET} cases succeeded, {RED}{}{RESET} cases failed in {} seconds",
-                number_of_successes,
-                number_of_failures,
-                elapsed.as_secs()
+                "{GREEN}{number_of_successes}{RESET} cases succeeded, {RED}{number_of_failures}{RESET} cases failed"
             );
         }
     };
@@ -467,13 +426,9 @@ where
         // doing the deployments from different accounts and therefore we're not slowed down by
         // the nonce.
         let deployer_address = case
-            .steps
+            .inputs
             .iter()
-            .filter_map(|step| match step {
-                Step::FunctionCall(input) => Some(input.caller),
-                Step::BalanceAssertion(..) => None,
-                Step::StorageEmptyAssertion(..) => None,
-            })
+            .map(|input| input.caller)
             .next()
             .unwrap_or(Input::default_caller());
         let leader_tx = TransactionBuilder::<Ethereum>::with_deploy_code(
@@ -508,17 +463,6 @@ where
             }
         };
 
-        tracing::info!(
-            ?library_instance,
-            library_address = ?leader_receipt.contract_address,
-            "Deployed library to leader"
-        );
-        tracing::info!(
-            ?library_instance,
-            library_address = ?follower_receipt.contract_address,
-            "Deployed library to follower"
-        );
-
         let Some(leader_library_address) = leader_receipt.contract_address else {
             tracing::error!("Contract deployment transaction didn't return an address");
             anyhow::bail!("Contract deployment didn't return an address");

crates/format/Cargo.toml

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

crates/format/src/case.rs

@@ -1,44 +1,31 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use revive_dt_common::macros::define_wrapper_type;
 
 use crate::{
-    input::{Expected, Step},
+    input::{Expected, Input},
     mode::Mode,
 };
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Case {
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub comment: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub modes: Option<Vec<Mode>>,
-    #[serde(rename = "inputs")]
-    pub steps: Vec<Step>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub inputs: Vec<Input>,
     pub group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub expected: Option<Expected>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ignore: Option<bool>,
 }
 
 impl Case {
-    #[allow(irrefutable_let_patterns)]
-    pub fn steps_iterator(&self) -> impl Iterator<Item = Step> {
-        let steps_len = self.steps.len();
-        self.steps
+    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 step)| {
-                let Step::FunctionCall(ref mut input) = step else {
-                    return step;
-                };
-
-                if idx + 1 == steps_len {
+            .map(move |(idx, mut input)| {
+                if idx + 1 == inputs_len {
                     if input.expected.is_none() {
                         input.expected = self.expected.clone();
                     }
@@ -48,9 +35,9 @@ impl Case {
                     // the case? What are we supposed to do with that final expected field on the
                     // case?
 
-                    step
+                    input
                 } else {
-                    step
+                    input
                 }
             })
     }

crates/format/src/input.rs

@@ -3,6 +3,7 @@ use std::collections::HashMap;
 use alloy::{
     eips::BlockNumberOrTag,
     hex::ToHexExt,
+    json_abi::JsonAbi,
     network::TransactionBuilder,
     primitives::{Address, Bytes, U256},
     rpc::types::TransactionRequest,
@@ -14,82 +15,26 @@ use serde::{Deserialize, Serialize};
 
 use revive_dt_common::macros::define_wrapper_type;
 
+use crate::metadata::ContractInstance;
 use crate::traits::ResolverApi;
-use crate::{metadata::ContractInstance, traits::ResolutionContext};
 
-/// A test step.
-///
-/// A test step can be anything. It could be an invocation to a function, an assertion, or any other
-/// action that needs to be run or executed on the nodes used in the tests.
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(untagged)]
-pub enum Step {
-    /// A function call or an invocation to some function on some smart contract.
-    FunctionCall(Box<Input>),
-    /// A step for performing a balance assertion on some account or contract.
-    BalanceAssertion(Box<BalanceAssertion>),
-    /// A step for asserting that the storage of some contract or account is empty.
-    StorageEmptyAssertion(Box<StorageEmptyAssertion>),
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Input {
     #[serde(default = "Input::default_caller")]
     pub caller: Address,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub comment: Option<String>,
     #[serde(default = "Input::default_instance")]
     pub instance: ContractInstance,
     pub method: Method,
     #[serde(default)]
     pub calldata: Calldata,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub expected: Option<Expected>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub value: Option<EtherValue>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub storage: Option<HashMap<String, Calldata>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub variable_assignments: Option<VariableAssignments>,
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
-pub struct BalanceAssertion {
-    /// An optional comment on the balance assertion.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub comment: Option<String>,
-
-    /// The address that the balance assertion should be done on.
-    ///
-    /// This is a string which will be resolved into an address when being processed. Therefore,
-    /// this could be a normal hex address, a variable such as `Test.address`, or perhaps even a
-    /// full on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are
-    /// followed in the calldata.
-    pub address: String,
-
-    /// The amount of balance to assert that the account or contract has.
-    pub expected_balance: U256,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
-pub struct StorageEmptyAssertion {
-    /// An optional comment on the storage empty assertion.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub comment: Option<String>,
-
-    /// The address that the balance assertion should be done on.
-    ///
-    /// This is a string which will be resolved into an address when being processed. Therefore,
-    /// this could be a normal hex address, a variable such as `Test.address`, or perhaps even a
-    /// full on variable like `$VARIABLE:Uniswap`. It follows the same resolution rules that are
-    /// followed in the calldata.
-    pub address: String,
-
-    /// A boolean of whether the storage of the address is empty or not.
-    pub is_storage_empty: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Expected {
     Calldata(Calldata),
@@ -97,21 +42,17 @@ pub enum Expected {
     ExpectedMany(Vec<ExpectedOutput>),
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct ExpectedOutput {
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub compiler_version: Option<VersionReq>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub return_data: Option<Calldata>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub events: Option<Vec<Event>>,
     #[serde(default)]
     pub exception: bool,
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct Event {
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub address: Option<String>,
     pub topics: Vec<String>,
     pub values: Calldata,
@@ -168,7 +109,7 @@ pub struct Event {
 /// [`Single`]: Calldata::Single
 /// [`Compound`]: Calldata::Compound
 /// [reverse polish notation]: https://en.wikipedia.org/wiki/Reverse_Polish_notation
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq)]
 #[serde(untagged)]
 pub enum Calldata {
     Single(Bytes),
@@ -202,7 +143,7 @@ enum Operation {
 }
 
 /// Specify how the contract is called.
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub enum Method {
     /// Initiate a deploy transaction, calling contracts constructor.
     ///
@@ -227,7 +168,7 @@ define_wrapper_type!(
     pub struct EtherValue(U256);
 );
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
 pub struct VariableAssignments {
     /// A vector of the variable names to assign to the return data.
     ///
@@ -246,21 +187,37 @@ impl Input {
         ContractInstance::new("Test")
     }
 
-    pub async fn encoded_input(
+    fn instance_to_address(
         &self,
+        instance: &ContractInstance,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+    ) -> anyhow::Result<Address> {
+        deployed_contracts
+            .get(instance)
+            .map(|(a, _)| *a)
+            .ok_or_else(|| anyhow::anyhow!("instance {instance:?} not deployed"))
+    }
+
+    pub async fn encoded_input<'a>(
+        &'a self,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<Bytes> {
         match self.method {
             Method::Deployer | Method::Fallback => {
-                let calldata = self.calldata.calldata(resolver, context).await?;
+                let calldata = self
+                    .calldata
+                    .calldata(deployed_contracts, variables, resolver)
+                    .await?;
 
                 Ok(calldata.into())
             }
             Method::FunctionName(ref function_name) => {
-                let Some(abi) = context.deployed_contract_abi(&self.instance) else {
+                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());
@@ -299,7 +256,7 @@ impl Input {
                 let mut calldata = Vec::<u8>::with_capacity(4 + self.calldata.size_requirement());
                 calldata.extend(function.selector().0);
                 self.calldata
-                    .calldata_into_slice(&mut calldata, resolver, context)
+                    .calldata_into_slice(&mut calldata, deployed_contracts, variables, resolver)
                     .await?;
 
                 Ok(calldata.into())
@@ -308,12 +265,15 @@ impl Input {
     }
 
     /// Parse this input into a legacy transaction.
-    pub async fn legacy_transaction(
-        &self,
+    pub async fn legacy_transaction<'a>(
+        &'a self,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<TransactionRequest> {
-        let input_data = self.encoded_input(resolver, context).await?;
+        let input_data = self
+            .encoded_input(deployed_contracts, variables, resolver)
+            .await?;
         let transaction_request = TransactionRequest::default().from(self.caller).value(
             self.value
                 .map(|value| value.into_inner())
@@ -322,10 +282,7 @@ impl Input {
         match self.method {
             Method::Deployer => Ok(transaction_request.with_deploy_code(input_data)),
             _ => Ok(transaction_request
-                .to(context
-                    .deployed_contract_address(&self.instance)
-                    .context("Failed to get the contract address")
-                    .copied()?)
+                .to(self.instance_to_address(&self.instance, deployed_contracts)?)
                 .input(input_data.into())),
         }
     }
@@ -394,22 +351,24 @@ impl Calldata {
         }
     }
 
-    pub async fn calldata(
-        &self,
+    pub async fn calldata<'a>(
+        &'a self,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<Vec<u8>> {
         let mut buffer = Vec::<u8>::with_capacity(self.size_requirement());
-        self.calldata_into_slice(&mut buffer, resolver, context)
+        self.calldata_into_slice(&mut buffer, deployed_contracts, variables, resolver)
             .await?;
         Ok(buffer)
     }
 
-    pub async fn calldata_into_slice(
-        &self,
+    pub async fn calldata_into_slice<'a>(
+        &'a self,
         buffer: &mut Vec<u8>,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<()> {
         match self {
             Calldata::Single(bytes) => {
@@ -417,7 +376,10 @@ impl Calldata {
             }
             Calldata::Compound(items) => {
                 for (arg_idx, arg) in items.iter().enumerate() {
-                    match arg.resolve(resolver, context).await {
+                    match arg
+                        .resolve(deployed_contracts, variables.clone(), resolver)
+                        .await
+                    {
                         Ok(resolved) => {
                             buffer.extend(resolved.to_be_bytes::<32>());
                         }
@@ -440,11 +402,12 @@ impl Calldata {
     }
 
     /// Checks if this [`Calldata`] is equivalent to the passed calldata bytes.
-    pub async fn is_equivalent(
-        &self,
+    pub async fn is_equivalent<'a>(
+        &'a self,
         other: &[u8],
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<bool> {
         match self {
             Calldata::Single(calldata) => Ok(calldata == other),
@@ -466,7 +429,9 @@ impl Calldata {
                         std::borrow::Cow::Borrowed(other)
                     };
 
-                    let this = this.resolve(resolver, context).await?;
+                    let this = this
+                        .resolve(deployed_contracts, variables.clone(), resolver)
+                        .await?;
                     let other = U256::from_be_slice(&other);
                     if this != other {
                         return Ok(false);
@@ -479,16 +444,17 @@ impl Calldata {
 }
 
 impl CalldataItem {
-    async fn resolve(
-        &self,
+    async fn resolve<'a>(
+        &'a self,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<U256> {
         let mut stack = Vec::<CalldataToken<U256>>::new();
 
         for token in self
             .calldata_tokens()
-            .map(|token| token.resolve(resolver, context))
+            .map(|token| token.resolve(deployed_contracts, variables.clone(), resolver))
         {
             let token = token.await?;
             let new_token = match token {
@@ -543,7 +509,7 @@ impl CalldataItem {
         }
     }
 
-    fn calldata_tokens(&self) -> impl Iterator<Item = CalldataToken<&str>> {
+    fn calldata_tokens<'a>(&'a self) -> impl Iterator<Item = CalldataToken<&'a str>> + 'a {
         self.0.split(' ').map(|item| match item {
             "+" => CalldataToken::Operation(Operation::Addition),
             "-" => CalldataToken::Operation(Operation::Subtraction),
@@ -567,11 +533,9 @@ impl<T> CalldataToken<T> {
     const GAS_LIMIT_VARIABLE: &str = "$GAS_LIMIT";
     const COINBASE_VARIABLE: &str = "$COINBASE";
     const DIFFICULTY_VARIABLE: &str = "$DIFFICULTY";
-    const BLOCK_BASE_FEE_VARIABLE: &str = "$BASE_FEE";
     const BLOCK_HASH_VARIABLE_PREFIX: &str = "$BLOCK_HASH";
     const BLOCK_NUMBER_VARIABLE: &str = "$BLOCK_NUMBER";
     const BLOCK_TIMESTAMP_VARIABLE: &str = "$BLOCK_TIMESTAMP";
-    const TRANSACTION_GAS_PRICE: &str = "$TRANSACTION_GAS_PRICE";
     const VARIABLE_PREFIX: &str = "$VARIABLE:";
 
     fn into_item(self) -> Option<T> {
@@ -591,21 +555,24 @@ impl<T: AsRef<str>> CalldataToken<T> {
     /// This piece of code is taken from the matter-labs-tester repository which is licensed under
     /// MIT or Apache. The original source code can be found here:
     /// https://github.com/matter-labs/era-compiler-tester/blob/0ed598a27f6eceee7008deab3ff2311075a2ec69/compiler_tester/src/test/case/input/value.rs#L43-L146
-    async fn resolve(
+    async fn resolve<'a>(
         self,
+        deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
+        variables: impl Into<Option<&'a HashMap<String, U256>>> + Clone,
         resolver: &impl ResolverApi,
-        context: ResolutionContext<'_>,
     ) -> anyhow::Result<CalldataToken<U256>> {
         match self {
             Self::Item(item) => {
                 let item = item.as_ref();
                 let value = if let Some(instance) = item.strip_suffix(Self::ADDRESS_VARIABLE_SUFFIX)
                 {
-                    context
-                        .deployed_contract_address(&ContractInstance::new(instance))
-                        .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))
-                        .map(AsRef::as_ref)
-                        .map(U256::from_be_slice)
+                    Ok(U256::from_be_slice(
+                        deployed_contracts
+                            .get(&ContractInstance::new(instance))
+                            .map(|(a, _)| *a)
+                            .ok_or_else(|| anyhow::anyhow!("Instance `{}` not found", instance))?
+                            .as_ref(),
+                    ))
                 } else if let Some(value) = item.strip_prefix(Self::NEGATIVE_VALUE_PREFIX) {
                     let value = U256::from_str_radix(value, 10).map_err(|error| {
                         anyhow::anyhow!("Invalid decimal literal after `-`: {}", error)
@@ -618,36 +585,22 @@ impl<T: AsRef<str>> CalldataToken<T> {
                         .ok_or_else(|| anyhow::anyhow!("`-0` is invalid literal"))?;
                     Ok(U256::MAX.checked_sub(value).expect("Always valid"))
                 } else if let Some(value) = item.strip_prefix(Self::HEX_LITERAL_PREFIX) {
-                    U256::from_str_radix(value, 16)
-                        .map_err(|error| anyhow::anyhow!("Invalid hexadecimal literal: {}", error))
+                    Ok(U256::from_str_radix(value, 16).map_err(|error| {
+                        anyhow::anyhow!("Invalid hexadecimal literal: {}", error)
+                    })?)
                 } else if item == Self::CHAIN_VARIABLE {
-                    resolver.chain_id().await.map(U256::from)
-                } else if item == Self::TRANSACTION_GAS_PRICE {
-                    context
-                        .transaction_hash()
-                        .context("No transaction hash provided to get the transaction gas price")
-                        .map(|tx_hash| resolver.transaction_gas_price(tx_hash))?
-                        .await
-                        .map(U256::from)
+                    let chain_id = resolver.chain_id().await?;
+                    Ok(U256::from(chain_id))
                 } else if item == Self::GAS_LIMIT_VARIABLE {
-                    resolver
-                        .block_gas_limit(context.resolve_block_number(BlockNumberOrTag::Latest))
-                        .await
-                        .map(U256::from)
+                    let gas_limit = resolver.block_gas_limit(BlockNumberOrTag::Latest).await?;
+                    Ok(U256::from(gas_limit))
                 } else if item == Self::COINBASE_VARIABLE {
-                    resolver
-                        .block_coinbase(context.resolve_block_number(BlockNumberOrTag::Latest))
-                        .await
-                        .map(|address| U256::from_be_slice(address.as_ref()))
+                    let coinbase = resolver.block_coinbase(BlockNumberOrTag::Latest).await?;
+                    Ok(U256::from_be_slice(coinbase.as_ref()))
                 } else if item == Self::DIFFICULTY_VARIABLE {
-                    resolver
-                        .block_difficulty(context.resolve_block_number(BlockNumberOrTag::Latest))
-                        .await
-                } else if item == Self::BLOCK_BASE_FEE_VARIABLE {
-                    resolver
-                        .block_base_fee(context.resolve_block_number(BlockNumberOrTag::Latest))
-                        .await
-                        .map(U256::from)
+                    let block_difficulty =
+                        resolver.block_difficulty(BlockNumberOrTag::Latest).await?;
+                    Ok(block_difficulty)
                 } else if item.starts_with(Self::BLOCK_HASH_VARIABLE_PREFIX) {
                     let offset: u64 = item
                         .split(':')
@@ -655,34 +608,31 @@ impl<T: AsRef<str>> CalldataToken<T> {
                         .and_then(|value| value.parse().ok())
                         .unwrap_or_default();
 
-                    let current_block_number = match context.tip_block_number() {
-                        Some(block_number) => *block_number,
-                        None => resolver.last_block_number().await?,
-                    };
-                    let desired_block_number = current_block_number.saturating_sub(offset);
+                    let current_block_number = resolver.last_block_number().await?;
+                    let desired_block_number = current_block_number - offset;
 
                     let block_hash = resolver.block_hash(desired_block_number.into()).await?;
 
                     Ok(U256::from_be_bytes(block_hash.0))
                 } else if item == Self::BLOCK_NUMBER_VARIABLE {
-                    let current_block_number = match context.tip_block_number() {
-                        Some(block_number) => *block_number,
-                        None => resolver.last_block_number().await?,
-                    };
+                    let current_block_number = resolver.last_block_number().await?;
                     Ok(U256::from(current_block_number))
                 } else if item == Self::BLOCK_TIMESTAMP_VARIABLE {
-                    resolver
-                        .block_timestamp(context.resolve_block_number(BlockNumberOrTag::Latest))
-                        .await
-                        .map(U256::from)
+                    let timestamp = resolver.block_timestamp(BlockNumberOrTag::Latest).await?;
+                    Ok(U256::from(timestamp))
                 } else if let Some(variable_name) = item.strip_prefix(Self::VARIABLE_PREFIX) {
-                    context
-                        .variable(variable_name)
-                        .context("Variable lookup failed")
-                        .copied()
+                    let Some(variables) = variables.into() else {
+                        anyhow::bail!(
+                            "Variable resolution required but no variables were passed in"
+                        );
+                    };
+                    let Some(variable) = variables.get(variable_name) else {
+                        anyhow::bail!("No variable found with the name {}", variable_name)
+                    };
+                    Ok(*variable)
                 } else {
-                    U256::from_str_radix(item, 10)
-                        .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))
+                    Ok(U256::from_str_radix(item, 10)
+                        .map_err(|error| anyhow::anyhow!("Invalid decimal literal: {}", error))?)
                 };
                 value.map(CalldataToken::Item)
             }
@@ -721,49 +671,50 @@ impl<'de> Deserialize<'de> for EtherValue {
 mod tests {
 
     use super::*;
-    use alloy::{eips::BlockNumberOrTag, json_abi::JsonAbi};
-    use alloy_primitives::{BlockHash, BlockNumber, BlockTimestamp, ChainId, TxHash, address};
+    use alloy::json_abi::JsonAbi;
+    use alloy_primitives::address;
     use alloy_sol_types::SolValue;
     use std::collections::HashMap;
 
     struct MockResolver;
 
     impl ResolverApi for MockResolver {
-        async fn chain_id(&self) -> anyhow::Result<ChainId> {
+        async fn chain_id(&self) -> anyhow::Result<alloy_primitives::ChainId> {
             Ok(0x123)
         }
 
-        async fn block_gas_limit(&self, _: BlockNumberOrTag) -> anyhow::Result<u128> {
+        async fn block_gas_limit(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<u128> {
             Ok(0x1234)
         }
 
-        async fn block_coinbase(&self, _: BlockNumberOrTag) -> anyhow::Result<Address> {
+        async fn block_coinbase(
+            &self,
+            _: alloy::eips::BlockNumberOrTag,
+        ) -> anyhow::Result<Address> {
             Ok(Address::ZERO)
         }
 
-        async fn block_difficulty(&self, _: BlockNumberOrTag) -> anyhow::Result<U256> {
+        async fn block_difficulty(&self, _: alloy::eips::BlockNumberOrTag) -> anyhow::Result<U256> {
             Ok(U256::from(0x12345u128))
         }
 
-        async fn block_base_fee(&self, _: BlockNumberOrTag) -> anyhow::Result<u64> {
-            Ok(0x100)
-        }
-
-        async fn block_hash(&self, _: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+        async fn block_hash(
+            &self,
+            _: alloy::eips::BlockNumberOrTag,
+        ) -> anyhow::Result<alloy_primitives::BlockHash> {
             Ok([0xEE; 32].into())
         }
 
-        async fn block_timestamp(&self, _: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+        async fn block_timestamp(
+            &self,
+            _: alloy::eips::BlockNumberOrTag,
+        ) -> anyhow::Result<alloy_primitives::BlockTimestamp> {
             Ok(0x123456)
         }
 
-        async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+        async fn last_block_number(&self) -> anyhow::Result<alloy_primitives::BlockNumber> {
             Ok(0x1234567)
         }
-
-        async fn transaction_gas_price(&self, _: &TxHash) -> anyhow::Result<u128> {
-            Ok(0x200)
-        }
     }
 
     #[tokio::test]
@@ -802,9 +753,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let resolver = MockResolver;
-        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
-        let encoded = input.encoded_input(&resolver, context).await.unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (u64,);
@@ -846,9 +798,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let resolver = MockResolver;
-        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
-        let encoded = input.encoded_input(&resolver, context).await.unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (alloy_primitives::Address,);
@@ -893,9 +846,10 @@ mod tests {
             (Address::ZERO, parsed_abi),
         );
 
-        let resolver = MockResolver;
-        let context = ResolutionContext::new_from_parts(&contracts, None, None, None);
-        let encoded = input.encoded_input(&resolver, context).await.unwrap();
+        let encoded = input
+            .encoded_input(&contracts, None, &MockResolver)
+            .await
+            .unwrap();
         assert!(encoded.0.starts_with(&selector));
 
         type T = (alloy_primitives::Address,);
@@ -911,8 +865,9 @@ mod tests {
         deployed_contracts: &HashMap<ContractInstance, (Address, JsonAbi)>,
         resolver: &impl ResolverApi,
     ) -> anyhow::Result<U256> {
-        let context = ResolutionContext::new_from_parts(deployed_contracts, None, None, None);
-        CalldataItem::new(input).resolve(resolver, context).await
+        CalldataItem::new(input)
+            .resolve(deployed_contracts, None, resolver)
+            .await
     }
 
     #[tokio::test]
@@ -990,26 +945,6 @@ mod tests {
         )
     }
 
-    #[tokio::test]
-    async fn resolver_can_resolve_block_base_fee_variable() {
-        // Arrange
-        let input = "$BASE_FEE";
-
-        // Act
-        let resolved = resolve_calldata_item(input, &Default::default(), &MockResolver).await;
-
-        // Assert
-        let resolved = resolved.expect("Failed to resolve argument");
-        assert_eq!(
-            resolved,
-            MockResolver
-                .block_base_fee(Default::default())
-                .await
-                .map(U256::from)
-                .unwrap()
-        )
-    }
-
     #[tokio::test]
     async fn resolver_can_resolve_block_hash_variable() {
         // Arrange

crates/format/src/metadata.rs

@@ -1,5 +1,4 @@
 use std::{
-    cmp::Ordering,
     collections::BTreeMap,
     fmt::Display,
     fs::{File, read_to_string},
@@ -10,7 +9,6 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use revive_common::EVMVersion;
 use revive_dt_common::{iterators::FilesWithExtensionIterator, macros::define_wrapper_type};
 
 use crate::{
@@ -45,27 +43,16 @@ impl Deref for MetadataFile {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq)]
+#[derive(Debug, Default, Deserialize, Clone, Eq, PartialEq)]
 pub struct Metadata {
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub targets: Option<Vec<String>>,
     pub cases: Vec<Case>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    // TODO: Convert into wrapper types for clarity.
     pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub ignore: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub modes: Option<Vec<Mode>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub file_path: Option<PathBuf>,
-
-    /// This field specifies an EVM version requirement that the test case has
-    /// where the test might be run of the evm version of the nodes match the
-    /// evm version specified here.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required_evm_version: Option<EvmVersionRequirement>,
 }
 
 impl Metadata {
@@ -356,131 +343,6 @@ impl From<ContractPathAndIdent> for String {
     }
 }
 
-/// An EVM version requirement that the test case has. This gets serialized and
-/// deserialized from and into [`String`].
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(try_from = "String", into = "String")]
-pub struct EvmVersionRequirement {
-    ordering: Ordering,
-    or_equal: bool,
-    evm_version: EVMVersion,
-}
-
-impl EvmVersionRequirement {
-    pub fn new_greater_than_or_equals(version: EVMVersion) -> Self {
-        Self {
-            ordering: Ordering::Greater,
-            or_equal: true,
-            evm_version: version,
-        }
-    }
-
-    pub fn new_greater_than(version: EVMVersion) -> Self {
-        Self {
-            ordering: Ordering::Greater,
-            or_equal: false,
-            evm_version: version,
-        }
-    }
-
-    pub fn new_equals(version: EVMVersion) -> Self {
-        Self {
-            ordering: Ordering::Equal,
-            or_equal: false,
-            evm_version: version,
-        }
-    }
-
-    pub fn new_less_than(version: EVMVersion) -> Self {
-        Self {
-            ordering: Ordering::Less,
-            or_equal: false,
-            evm_version: version,
-        }
-    }
-
-    pub fn new_less_than_or_equals(version: EVMVersion) -> Self {
-        Self {
-            ordering: Ordering::Less,
-            or_equal: true,
-            evm_version: version,
-        }
-    }
-
-    pub fn matches(&self, other: &EVMVersion) -> bool {
-        let ordering = other.cmp(&self.evm_version);
-        ordering == self.ordering || (self.or_equal && matches!(ordering, Ordering::Equal))
-    }
-}
-
-impl Display for EvmVersionRequirement {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let Self {
-            ordering,
-            or_equal,
-            evm_version,
-        } = self;
-        match ordering {
-            Ordering::Less => write!(f, "<")?,
-            Ordering::Equal => write!(f, "=")?,
-            Ordering::Greater => write!(f, ">")?,
-        }
-        if *or_equal && !matches!(ordering, Ordering::Equal) {
-            write!(f, "=")?;
-        }
-        write!(f, "{evm_version}")
-    }
-}
-
-impl FromStr for EvmVersionRequirement {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.as_bytes() {
-            [b'>', b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Greater,
-                or_equal: true,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
-            [b'>', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Greater,
-                or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
-            [b'<', b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Less,
-                or_equal: true,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
-            [b'<', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Less,
-                or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
-            [b'=', remaining @ ..] => Ok(Self {
-                ordering: Ordering::Equal,
-                or_equal: false,
-                evm_version: str::from_utf8(remaining)?.try_into()?,
-            }),
-            _ => anyhow::bail!("Invalid EVM version requirement {s}"),
-        }
-    }
-}
-
-impl TryFrom<String> for EvmVersionRequirement {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        value.parse()
-    }
-}
-
-impl From<EvmVersionRequirement> for String {
-    fn from(value: EvmVersionRequirement) -> Self {
-        value.to_string()
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

crates/format/src/mode.rs

@@ -16,7 +16,6 @@ pub struct SolcMode {
     pub solc_version: Option<semver::VersionReq>,
     solc_optimize: Option<bool>,
     pub llvm_optimizer_settings: Vec<String>,
-    mode_string: String,
 }
 
 impl SolcMode {
@@ -30,10 +29,7 @@ impl SolcMode {
     /// - A solc `SemVer version requirement` string
     /// - One or more `-OX` where X is a supposed to be an LLVM opt mode
     pub fn parse_from_mode_string(mode_string: &str) -> Option<Self> {
-        let mut result = Self {
-            mode_string: mode_string.to_string(),
-            ..Default::default()
-        };
+        let mut result = Self::default();
 
         let mut parts = mode_string.trim().split(" ");
 
@@ -108,16 +104,3 @@ impl<'de> Deserialize<'de> for Mode {
         Ok(Self::Unknown(mode_string))
     }
 }
-
-impl Serialize for Mode {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let string = match self {
-            Mode::Solidity(solc_mode) => &solc_mode.mode_string,
-            Mode::Unknown(string) => string,
-        };
-        string.serialize(serializer)
-    }
-}

crates/format/src/traits.rs

@@ -1,22 +1,13 @@
-use std::collections::HashMap;
-
 use alloy::eips::BlockNumberOrTag;
-use alloy::json_abi::JsonAbi;
 use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
-use alloy_primitives::TxHash;
 use anyhow::Result;
 
-use crate::metadata::ContractInstance;
-
 /// 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) -> impl Future<Output = Result<ChainId>>;
 
-    /// Returns the gas price for the specified transaction.
-    fn transaction_gas_price(&self, tx_hash: &TxHash) -> impl Future<Output = Result<u128>>;
-
     // 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.
@@ -28,9 +19,6 @@ pub trait ResolverApi {
     /// Returns the difficulty of the specified block.
     fn block_difficulty(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<U256>>;
 
-    /// Returns the base fee of the specified block.
-    fn block_base_fee(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u64>>;
-
     /// Returns the hash of the specified block.
     fn block_hash(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<BlockHash>>;
 
@@ -43,108 +31,3 @@ pub trait ResolverApi {
     /// Returns the number of the last block.
     fn last_block_number(&self) -> impl Future<Output = Result<BlockNumber>>;
 }
-
-#[derive(Clone, Copy, Debug, Default)]
-/// Contextual information required by the code that's performing the resolution.
-pub struct ResolutionContext<'a> {
-    /// When provided the contracts provided here will be used for resolutions.
-    deployed_contracts: Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>,
-
-    /// When provided the variables in here will be used for performing resolutions.
-    variables: Option<&'a HashMap<String, U256>>,
-
-    /// When provided this block number will be treated as the tip of the chain.
-    block_number: Option<&'a BlockNumber>,
-
-    /// When provided the resolver will use this transaction hash for all of its resolutions.
-    transaction_hash: Option<&'a TxHash>,
-}
-
-impl<'a> ResolutionContext<'a> {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn new_from_parts(
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
-        block_number: impl Into<Option<&'a BlockNumber>>,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
-    ) -> Self {
-        Self {
-            deployed_contracts: deployed_contracts.into(),
-            variables: variables.into(),
-            block_number: block_number.into(),
-            transaction_hash: transaction_hash.into(),
-        }
-    }
-
-    pub fn with_deployed_contracts(
-        mut self,
-        deployed_contracts: impl Into<Option<&'a HashMap<ContractInstance, (Address, JsonAbi)>>>,
-    ) -> Self {
-        self.deployed_contracts = deployed_contracts.into();
-        self
-    }
-
-    pub fn with_variables(
-        mut self,
-        variables: impl Into<Option<&'a HashMap<String, U256>>>,
-    ) -> Self {
-        self.variables = variables.into();
-        self
-    }
-
-    pub fn with_block_number(mut self, block_number: impl Into<Option<&'a BlockNumber>>) -> Self {
-        self.block_number = block_number.into();
-        self
-    }
-
-    pub fn with_transaction_hash(
-        mut self,
-        transaction_hash: impl Into<Option<&'a TxHash>>,
-    ) -> Self {
-        self.transaction_hash = transaction_hash.into();
-        self
-    }
-
-    pub fn resolve_block_number(&self, number: BlockNumberOrTag) -> BlockNumberOrTag {
-        match self.block_number {
-            Some(block_number) => match number {
-                BlockNumberOrTag::Latest => BlockNumberOrTag::Number(*block_number),
-                n @ (BlockNumberOrTag::Finalized
-                | BlockNumberOrTag::Safe
-                | BlockNumberOrTag::Earliest
-                | BlockNumberOrTag::Pending
-                | BlockNumberOrTag::Number(_)) => n,
-            },
-            None => number,
-        }
-    }
-
-    pub fn deployed_contract(&self, instance: &ContractInstance) -> Option<&(Address, JsonAbi)> {
-        self.deployed_contracts
-            .and_then(|deployed_contracts| deployed_contracts.get(instance))
-    }
-
-    pub fn deployed_contract_address(&self, instance: &ContractInstance) -> Option<&Address> {
-        self.deployed_contract(instance).map(|(a, _)| a)
-    }
-
-    pub fn deployed_contract_abi(&self, instance: &ContractInstance) -> Option<&JsonAbi> {
-        self.deployed_contract(instance).map(|(_, a)| a)
-    }
-
-    pub fn variable(&self, name: impl AsRef<str>) -> Option<&U256> {
-        self.variables
-            .and_then(|variables| variables.get(name.as_ref()))
-    }
-
-    pub fn tip_block_number(&self) -> Option<&'a BlockNumber> {
-        self.block_number
-    }
-
-    pub fn transaction_hash(&self) -> Option<&'a TxHash> {
-        self.transaction_hash
-    }
-}

crates/node-interaction/src/lib.rs

@@ -1,8 +1,7 @@
 //! This crate implements all node interactions.
 
-use alloy::primitives::{Address, StorageKey, U256};
 use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
-use alloy::rpc::types::{EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest};
+use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
 use anyhow::Result;
 
 /// An interface for all interactions with Ethereum compatible nodes.
@@ -22,14 +21,4 @@ pub trait EthereumNode {
 
     /// Returns the state diff of the transaction hash in the [TransactionReceipt].
     fn state_diff(&self, receipt: &TransactionReceipt) -> impl Future<Output = Result<DiffMode>>;
-
-    /// Returns the balance of the provided [`Address`] back.
-    fn balance_of(&self, address: Address) -> impl Future<Output = Result<U256>>;
-
-    /// Returns the latest storage proof of the provided [`Address`]
-    fn latest_state_proof(
-        &self,
-        address: Address,
-        keys: Vec<StorageKey>,
-    ) -> impl Future<Output = Result<EIP1186AccountProofResponse>>;
 }

crates/node/Cargo.toml

@@ -14,7 +14,6 @@ alloy = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
 
-revive-common = { workspace = true }
 revive-dt-common = { workspace = true }
 revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }

crates/node/src/geth.rs

@@ -3,13 +3,9 @@
 use std::{
     fs::{File, OpenOptions, create_dir_all, remove_dir_all},
     io::{BufRead, BufReader, Read, Write},
-    ops::ControlFlow,
     path::PathBuf,
     process::{Child, Command, Stdio},
-    sync::{
-        Arc,
-        atomic::{AtomicU32, Ordering},
-    },
+    sync::atomic::{AtomicU32, Ordering},
     time::{Duration, Instant},
 };
 
@@ -17,28 +13,23 @@ use alloy::{
     eips::BlockNumberOrTag,
     genesis::{Genesis, GenesisAccount},
     network::{Ethereum, EthereumWallet, NetworkWallet},
-    primitives::{
-        Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, StorageKey, TxHash, U256,
-    },
+    primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, FixedBytes, U256},
     providers::{
         Provider, ProviderBuilder,
         ext::DebugApi,
         fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
     },
     rpc::types::{
-        EIP1186AccountProofResponse, TransactionReceipt, TransactionRequest,
+        TransactionReceipt, TransactionRequest,
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
     signers::local::PrivateKeySigner,
 };
-use anyhow::Context;
-use revive_common::EVMVersion;
-use tracing::{Instrument, Level};
-
-use revive_dt_common::{fs::clear_directory, futures::poll};
+use revive_dt_common::fs::clear_directory;
 use revive_dt_config::Arguments;
 use revive_dt_format::traits::ResolverApi;
 use revive_dt_node_interaction::EthereumNode;
+use tracing::Level;
 
 use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
 
@@ -86,10 +77,6 @@ impl GethNode {
     const GETH_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
 
     const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress";
-    const TRANSACTION_TRACING_ERROR: &str = "historical state not available in path scheme yet";
-
-    const RECEIPT_POLLING_DURATION: Duration = Duration::from_secs(5 * 60);
-    const TRACE_POLLING_DURATION: Duration = Duration::from_secs(60);
 
     /// Create the node directory and call `geth init` to configure the genesis.
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
@@ -115,8 +102,6 @@ impl GethNode {
         serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;
 
         let mut child = Command::new(&self.geth)
-            .arg("--state.scheme")
-            .arg("hash")
             .arg("init")
             .arg("--datadir")
             .arg(&self.data_directory)
@@ -174,12 +159,6 @@ impl GethNode {
             .arg("0")
             .arg("--cache.blocklogs")
             .arg("512")
-            .arg("--state.scheme")
-            .arg("hash")
-            .arg("--syncmode")
-            .arg("full")
-            .arg("--gcmode")
-            .arg("archive")
             .stderr(stderr_logs_file.try_clone()?)
             .stdout(stdout_logs_file.try_clone()?)
             .spawn()?
@@ -269,16 +248,21 @@ impl GethNode {
 }
 
 impl EthereumNode for GethNode {
-    #[tracing::instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     async fn execute_transaction(
         &self,
         transaction: TransactionRequest,
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let span = tracing::debug_span!("Submitting transaction", ?transaction);
-        let _guard = span.enter();
+        let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
+        let _outer_guard = outer_span.enter();
 
-        let provider = Arc::new(self.provider().await?);
-        let transaction_hash = *provider.send_transaction(transaction).await?.tx_hash();
+        let provider = self.provider().await?;
+
+        let pending_transaction = provider.send_transaction(transaction).await?;
+        let transaction_hash = pending_transaction.tx_hash();
+
+        let span = tracing::info_span!("Awaiting transaction receipt", ?transaction_hash);
+        let _guard = span.enter();
 
         // The following is a fix for the "transaction indexing is in progress" error that we
         // used to get. You can find more information on this in the following GH issue in geth
@@ -298,64 +282,57 @@ impl EthereumNode for GethNode {
         // allow for a larger wait time. Therefore, in here we allow for 5 minutes of waiting
         // with exponential backoff each time we attempt to get the receipt and find that it's
         // not available.
-        poll(
-            Self::RECEIPT_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                async move {
-                    match provider.get_transaction_receipt(transaction_hash).await {
-                        Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)),
-                        Ok(None) => Ok(ControlFlow::Continue(())),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
-                            }
-                        }
+        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)) => {
+                    tracing::info!(?total_wait_duration, "Found receipt");
+                    break Ok(receipt);
+                }
+                Ok(None) => {}
+                Err(error) => {
+                    let error_string = error.to_string();
+                    if !error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+                        break Err(error.into());
                     }
                 }
-            },
-        )
-        .instrument(tracing::info_span!(
-            "Awaiting transaction receipt",
-            ?transaction_hash
-        ))
-        .await
+            };
+
+            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(level = "info", skip_all, fields(geth_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     async fn trace_transaction(
         &self,
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let provider = Arc::new(self.provider().await?);
-        poll(
-            Self::TRACE_POLLING_DURATION,
-            Default::default(),
-            move || {
-                let provider = provider.clone();
-                let trace_options = trace_options.clone();
-                async move {
-                    match provider
-                        .debug_trace_transaction(transaction.transaction_hash, trace_options)
-                        .await
-                    {
-                        Ok(trace) => Ok(ControlFlow::Break(trace)),
-                        Err(error) => {
-                            let error_string = error.to_string();
-                            match error_string.contains(Self::TRANSACTION_TRACING_ERROR) {
-                                true => Ok(ControlFlow::Continue(())),
-                                false => Err(error.into()),
-                            }
-                        }
-                    }
-                }
-            },
-        )
-        .await
+        let tx_hash = transaction.transaction_hash;
+        Ok(self
+            .provider()
+            .await?
+            .debug_trace_transaction(tx_hash, trace_options)
+            .await?)
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
@@ -374,29 +351,6 @@ impl EthereumNode for GethNode {
             _ => anyhow::bail!("expected a diff mode trace"),
         }
     }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_balance(address)
-            .await
-            .map_err(Into::into)
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn latest_state_proof(
-        &self,
-        address: Address,
-        keys: Vec<StorageKey>,
-    ) -> anyhow::Result<EIP1186AccountProofResponse> {
-        self.provider()
-            .await?
-            .get_proof(address, keys)
-            .latest()
-            .await
-            .map_err(Into::into)
-    }
 }
 
 impl ResolverApi for GethNode {
@@ -409,16 +363,6 @@ impl ResolverApi for GethNode {
             .map_err(Into::into)
     }
 
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_transaction_receipt(*tx_hash)
-            .await?
-            .context("Failed to get the transaction receipt")
-            .map(|receipt| receipt.effective_gas_price)
-    }
-
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
         self.provider()
@@ -446,22 +390,7 @@ impl ResolverApi for GethNode {
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
-    }
-
-    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .and_then(|block| {
-                block
-                    .header
-                    .base_fee_per_gas
-                    .context("Failed to get the base fee per gas")
-            })
+            .map(|block| block.header.difficulty)
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
@@ -580,10 +509,6 @@ impl Node for GethNode {
             Some(targets) => targets.iter().any(|str| str.as_str() == "evm"),
         }
     }
-
-    fn evm_version() -> EVMVersion {
-        EVMVersion::Cancun
-    }
 }
 
 impl Drop for GethNode {

crates/node/src/kitchensink.rs

@@ -16,8 +16,7 @@ use alloy::{
         TransactionBuilderError, UnbuiltTransactionError,
     },
     primitives::{
-        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes,
-        StorageKey, TxHash, U256,
+        Address, B64, B256, BlockHash, BlockNumber, BlockTimestamp, Bloom, Bytes, FixedBytes, U256,
     },
     providers::{
         Provider, ProviderBuilder,
@@ -25,14 +24,12 @@ use alloy::{
         fillers::{CachedNonceManager, ChainIdFiller, FillProvider, NonceFiller, TxFiller},
     },
     rpc::types::{
-        EIP1186AccountProofResponse, TransactionReceipt,
+        TransactionReceipt,
         eth::{Block, Header, Transaction},
         trace::geth::{DiffMode, GethDebugTracingOptions, PreStateConfig, PreStateFrame},
     },
     signers::local::PrivateKeySigner,
 };
-use anyhow::Context;
-use revive_common::EVMVersion;
 use revive_dt_common::fs::clear_directory;
 use revive_dt_format::traits::ResolverApi;
 use serde::{Deserialize, Serialize};
@@ -429,29 +426,6 @@ impl EthereumNode for KitchensinkNode {
             _ => anyhow::bail!("expected a diff mode trace"),
         }
     }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
-        self.provider()
-            .await?
-            .get_balance(address)
-            .await
-            .map_err(Into::into)
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn latest_state_proof(
-        &self,
-        address: Address,
-        keys: Vec<StorageKey>,
-    ) -> anyhow::Result<EIP1186AccountProofResponse> {
-        self.provider()
-            .await?
-            .get_proof(address, keys)
-            .latest()
-            .await
-            .map_err(Into::into)
-    }
 }
 
 impl ResolverApi for KitchensinkNode {
@@ -464,16 +438,6 @@ impl ResolverApi for KitchensinkNode {
             .map_err(Into::into)
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
-        self.provider()
-            .await?
-            .get_transaction_receipt(*tx_hash)
-            .await?
-            .context("Failed to get the transaction receipt")
-            .map(|receipt| receipt.effective_gas_price)
-    }
-
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
         self.provider()
@@ -501,22 +465,7 @@ impl ResolverApi for KitchensinkNode {
             .get_block_by_number(number)
             .await?
             .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
-    }
-
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
-        self.provider()
-            .await?
-            .get_block_by_number(number)
-            .await?
-            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .and_then(|block| {
-                block
-                    .header
-                    .base_fee_per_gas
-                    .context("Failed to get the base fee per gas")
-            })
+            .map(|block| block.header.difficulty)
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
@@ -639,10 +588,6 @@ impl Node for KitchensinkNode {
             Some(targets) => targets.iter().any(|str| str.as_str() == "pvm"),
         }
     }
-
-    fn evm_version() -> EVMVersion {
-        EVMVersion::Cancun
-    }
 }
 
 impl Drop for KitchensinkNode {

crates/node/src/lib.rs

@@ -1,6 +1,5 @@
 //! This crate implements the testing nodes.
 
-use revive_common::EVMVersion;
 use revive_dt_config::Arguments;
 use revive_dt_node_interaction::EthereumNode;
 
@@ -37,7 +36,4 @@ pub trait Node: EthereumNode {
     /// 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;
-
-    /// Returns the EVM version of the node.
-    fn evm_version() -> EVMVersion;
 }

crates/solc-binaries/src/cache.rs

@@ -11,14 +11,14 @@ use std::{
 
 use tokio::sync::Mutex;
 
-use crate::download::SolcDownloader;
+use crate::download::GHDownloader;
 
 pub const SOLC_CACHE_DIRECTORY: &str = "solc";
 pub(crate) static SOLC_CACHER: LazyLock<Mutex<HashSet<PathBuf>>> = LazyLock::new(Default::default);
 
 pub(crate) async fn get_or_download(
     working_directory: &Path,
-    downloader: &SolcDownloader,
+    downloader: &GHDownloader,
 ) -> anyhow::Result<PathBuf> {
     let target_directory = working_directory
         .join(SOLC_CACHE_DIRECTORY)
@@ -38,7 +38,7 @@ pub(crate) async fn get_or_download(
     Ok(target_file)
 }
 
-async fn download_to_file(path: &Path, downloader: &SolcDownloader) -> anyhow::Result<()> {
+async fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()> {
     tracing::info!("caching file: {}", path.display());
 
     let Ok(file) = File::create_new(path) else {

crates/solc-binaries/src/download.rs

@@ -38,21 +38,21 @@ impl List {
     }
 }
 
-/// Download solc binaries from the official SolidityLang site
+/// Download solc binaries from GitHub releases (IPFS links aren't reliable).
 #[derive(Clone, Debug)]
-pub struct SolcDownloader {
+pub struct GHDownloader {
     pub version: Version,
     pub target: &'static str,
     pub list: &'static str,
 }
 
-impl SolcDownloader {
-    pub const BASE_URL: &str = "https://binaries.soliditylang.org";
+impl GHDownloader {
+    pub const BASE_URL: &str = "https://github.com/ethereum/solidity/releases/download";
 
-    pub const LINUX_NAME: &str = "linux-amd64";
-    pub const MACOSX_NAME: &str = "macosx-amd64";
-    pub const WINDOWS_NAME: &str = "windows-amd64";
-    pub const WASM_NAME: &str = "wasm";
+    pub const LINUX_NAME: &str = "solc-static-linux";
+    pub const MACOSX_NAME: &str = "solc-macos";
+    pub const WINDOWS_NAME: &str = "solc-windows.exe";
+    pub const WASM_NAME: &str = "soljson.js";
 
     async fn new(
         version: impl Into<VersionOrRequirement>,
@@ -102,27 +102,26 @@ impl SolcDownloader {
         Self::new(version, Self::WASM_NAME, List::WASM_URL).await
     }
 
+    /// Returns the download link.
+    pub fn url(&self) -> String {
+        format!("{}/v{}/{}", Self::BASE_URL, &self.version, &self.target)
+    }
+
     /// Download the solc binary.
     ///
     /// Errors out if the download fails or the digest of the downloaded file
     /// mismatches the expected digest from the release [List].
     pub async fn download(&self) -> anyhow::Result<Vec<u8>> {
         tracing::info!("downloading solc: {self:?}");
-        let builds = List::download(self.list).await?.builds;
-        let build = builds
+        let expected_digest = List::download(self.list)
+            .await?
+            .builds
             .iter()
             .find(|build| build.version == self.version)
-            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))?;
+            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
+            .map(|b| b.sha256.strip_prefix("0x").unwrap_or(&b.sha256).to_string())?;
 
-        let path = build.path.clone();
-        let expected_digest = build
-            .sha256
-            .strip_prefix("0x")
-            .unwrap_or(&build.sha256)
-            .to_string();
-        let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
-
-        let file = reqwest::get(url).await?.bytes().await?.to_vec();
+        let file = reqwest::get(self.url()).await?.bytes().await?.to_vec();
 
         if hex::encode(Sha256::digest(&file)) != expected_digest {
             anyhow::bail!("sha256 mismatch for solc version {}", self.version);
@@ -134,7 +133,7 @@ impl SolcDownloader {
 
 #[cfg(test)]
 mod tests {
-    use crate::{download::SolcDownloader, list::List};
+    use crate::{download::GHDownloader, list::List};
 
     #[tokio::test]
     async fn try_get_windows() {
@@ -142,7 +141,7 @@ mod tests {
             .await
             .unwrap()
             .latest_release;
-        SolcDownloader::windows(version)
+        GHDownloader::windows(version)
             .await
             .unwrap()
             .download()
@@ -156,7 +155,7 @@ mod tests {
             .await
             .unwrap()
             .latest_release;
-        SolcDownloader::macosx(version)
+        GHDownloader::macosx(version)
             .await
             .unwrap()
             .download()
@@ -170,7 +169,7 @@ mod tests {
             .await
             .unwrap()
             .latest_release;
-        SolcDownloader::linux(version)
+        GHDownloader::linux(version)
             .await
             .unwrap()
             .download()
@@ -181,7 +180,7 @@ mod tests {
     #[tokio::test]
     async fn try_get_wasm() {
         let version = List::download(List::WASM_URL).await.unwrap().latest_release;
-        SolcDownloader::wasm(version)
+        GHDownloader::wasm(version)
             .await
             .unwrap()
             .download()

crates/solc-binaries/src/lib.rs

@@ -6,7 +6,7 @@
 use std::path::{Path, PathBuf};
 
 use cache::get_or_download;
-use download::SolcDownloader;
+use download::GHDownloader;
 
 use revive_dt_common::types::VersionOrRequirement;
 
@@ -25,13 +25,13 @@ pub async fn download_solc(
     wasm: bool,
 ) -> anyhow::Result<PathBuf> {
     let downloader = if wasm {
-        SolcDownloader::wasm(version).await
+        GHDownloader::wasm(version).await
     } else if cfg!(target_os = "linux") {
-        SolcDownloader::linux(version).await
+        GHDownloader::linux(version).await
     } else if cfg!(target_os = "macos") {
-        SolcDownloader::macosx(version).await
+        GHDownloader::macosx(version).await
     } else if cfg!(target_os = "windows") {
-        SolcDownloader::windows(version).await
+        GHDownloader::windows(version).await
     } else {
         unimplemented!()
     }?;