rework to not depend on changes in ethers-rs

Cargo.toml

@@ -119,33 +119,33 @@ foundry-test-utils = { path = "crates/test-utils" }
 foundry-utils = { path = "crates/utils" }
 ui = { path = "crates/ui" }
 
-#ethers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-contract = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-providers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-signers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
-#ethers-solc = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-contract = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-providers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-signers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
+ethers-solc = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
 
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
 hex = { package = "const-hex", version = "1.6", features = ["hex"] }
 itertools = "0.11"
 solang-parser = "=0.3.1"
 
 #[patch."https://github.com/gakonst/ethers-rs"]
-ethers = { path = "../ethers-rs/ethers" }
-ethers-addressbook = { path = "../ethers-rs/ethers-addressbook" }
-ethers-contract = { path = "../ethers-rs/ethers-contract" }
-ethers-contract-abigen = { path = "../ethers-rs/ethers-contract/ethers-contract-abigen" }
-ethers-core = { path = "../ethers-rs/ethers-core" }
-ethers-etherscan = { path = "../ethers-rs/ethers-etherscan" }
-ethers-middleware = { path = "../ethers-rs/ethers-middleware" }
-ethers-providers = { path = "../ethers-rs/ethers-providers", features = ["ws", "ipc"] }
-ethers-signers = { path = "../ethers-rs/ethers-signers" }
-ethers-solc = { path = "../ethers-rs/ethers-solc" }
+#ethers = { path = "../ethers-rs/ethers" }
+#ethers-addressbook = { path = "../ethers-rs/ethers-addressbook" }
+#ethers-contract = { path = "../ethers-rs/ethers-contract" }
+#ethers-contract-abigen = { path = "../ethers-rs/ethers-contract/ethers-contract-abigen" }
+#ethers-core = { path = "../ethers-rs/ethers-core" }
+#ethers-etherscan = { path = "../ethers-rs/ethers-etherscan" }
+#ethers-middleware = { path = "../ethers-rs/ethers-middleware" }
+#ethers-providers = { path = "../ethers-rs/ethers-providers", features = ["ws", "ipc"] }
+#ethers-signers = { path = "../ethers-rs/ethers-signers" }
+#ethers-solc = { path = "../ethers-rs/ethers-solc" }
 
 [patch.crates-io]
 revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }

crates/cast/bin/cmd/call.rs

@@ -9,12 +9,12 @@ use foundry_cli::{
     opts::{EthereumOpts, TransactionOpts},
     utils::{self, handle_traces, parse_ether_value, TraceResult},
 };
-use foundry_common::runtime_provider::RuntimeProvider;
+use foundry_common::runtime_client::RuntimeClient;
 use foundry_config::{find_project_root_path, Config};
 use foundry_evm::{executor::opts::EvmOpts, trace::TracingExecutor};
 use std::str::FromStr;
 
-type Provider = ethers::providers::Provider<RuntimeProvider>;
+type Provider = ethers::providers::Provider<RuntimeClient>;
 
 /// CLI arguments for `cast call`.
 #[derive(Debug, Parser)]

crates/common/src/lib.rs

@@ -14,7 +14,7 @@ pub mod fmt;
 pub mod fs;
 pub mod glob;
 pub mod provider;
-pub mod runtime_provider;
+pub mod runtime_client;
 pub mod selectors;
 pub mod shell;
 pub mod term;

crates/common/src/provider.rs

@@ -1,6 +1,6 @@
 //! Commonly used helpers to construct `Provider`s
 
-use crate::{runtime_provider::RuntimeProvider, ALCHEMY_FREE_TIER_CUPS, REQUEST_TIMEOUT};
+use crate::{runtime_client::RuntimeClient, ALCHEMY_FREE_TIER_CUPS, REQUEST_TIMEOUT};
 use ethers_core::types::{Chain, U256};
 use ethers_middleware::gas_oracle::{GasCategory, GasOracle, Polygon};
 use ethers_providers::{is_local_endpoint, Middleware, Provider, DEFAULT_LOCAL_POLL_INTERVAL};
@@ -10,7 +10,7 @@ use std::{borrow::Cow, time::Duration};
 use url::ParseError;
 
 /// Helper type alias for a retry provider
-pub type RetryProvider = Provider<RuntimeProvider>;
+pub type RetryProvider = Provider<RuntimeClient>;
 
 /// Helper type alias for a rpc url
 pub type RpcUrl = String;
@@ -171,7 +171,7 @@ impl ProviderBuilder {
         } = self;
         let url = url?;
 
-        let mut provider = Provider::new(RuntimeProvider::new(
+        let mut provider = Provider::new(RuntimeClient::new(
             url.clone(),
             max_retry,
             timeout_retry,