Merge remote-tracking branch 'origin/main' into feature/bump-resolc-compiler-tests

* Bump the version of resolc compiler tests

* Bump the version of resolc compiler tests

* Reduce the timeout for transactions to 2 minutes

crates/core/src/lib.rs

@@ -234,15 +234,9 @@ impl Platform for ReviveDevNodePolkavmResolcPlatform {
             .path
             .as_path();
         let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
-        let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
         let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
 
-        SubstrateNode::node_genesis(
+        SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
-            revive_dev_node_path,
-            export_chainspec_command,
-            &wallet,
-            working_directory,
-        )
     }
 }
 
@@ -308,15 +302,9 @@ impl Platform for ReviveDevNodeRevmSolcPlatform {
             .path
             .as_path();
         let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
-        let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
         let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
 
-        SubstrateNode::node_genesis(
+        SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
-            revive_dev_node_path,
-            export_chainspec_command,
-            &wallet,
-            working_directory,
-        )
     }
 }
 

crates/node/src/node_implementations/substrate.rs

@@ -160,7 +160,6 @@ impl SubstrateNode {
             &self.node_binary,
             &self.export_chainspec_command,
             &self.wallet,
-            self.base_directory.as_path(),
         )
         .context("Failed to prepare the chainspec command")?;
 
@@ -320,7 +319,6 @@ impl SubstrateNode {
         node_path: &Path,
         export_chainspec_command: &str,
         wallet: &EthereumWallet,
-        base_directory: impl AsRef<Path>,
     ) -> anyhow::Result<serde_json::Value> {
         trace!("Exporting the chainspec");
         let output = Command::new(node_path)
@@ -328,7 +326,6 @@ impl SubstrateNode {
             .arg("--chain")
             .arg("dev")
             .env_remove("RUST_LOG")
-            .current_dir(base_directory)
             .output()
             .context("Failed to export the chain-spec")?;
 

crates/node/src/provider_utils/provider.rs

@@ -104,7 +104,7 @@ where
     };
     debug!(%tx_hash, "Submitted Transaction");
 
-    pending_transaction.set_timeout(Some(Duration::from_secs(240)));
+    pending_transaction.set_timeout(Some(Duration::from_secs(120)));
     let tx_hash = pending_transaction.watch().await.context(format!(
         "Transaction inclusion watching timeout for {tx_hash}"
     ))?;

crates/solc-binaries/src/download.rs

@@ -2,12 +2,13 @@
 
 use std::{
     collections::HashMap,
+    str::FromStr,
     sync::{LazyLock, Mutex},
 };
 
 use revive_dt_common::types::VersionOrRequirement;
 
-use semver::Version;
+use semver::{Version, VersionReq};
 use sha2::{Digest, Sha256};
 
 use crate::list::List;
@@ -65,6 +66,9 @@ impl SolcDownloader {
         target: &'static str,
         list: &'static str,
     ) -> anyhow::Result<Self> {
+        static MAXIMUM_COMPILER_VERSION_REQUIREMENT: LazyLock<VersionReq> =
+            LazyLock::new(|| VersionReq::from_str("<=0.8.30").unwrap());
+
         let version_or_requirement = version.into();
         match version_or_requirement {
             VersionOrRequirement::Version(version) => Ok(Self {
@@ -79,7 +83,10 @@ impl SolcDownloader {
                     .builds
                     .into_iter()
                     .map(|build| build.version)
-                    .filter(|version| requirement.matches(version))
+                    .filter(|version| {
+                        MAXIMUM_COMPILER_VERSION_REQUIREMENT.matches(version)
+                            && requirement.matches(version)
+                    })
                     .max()
                 else {
                     anyhow::bail!("Failed to find a version that satisfies {requirement:?}");