chore: don't use ethers in evm-core (#6787)

foundry-rs · Jan 14, 2024 · c5fd67b · c5fd67b
1 parent c367a78
commit c5fd67b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/evm/core/Cargo.toml b/crates/evm/core/Cargo.toml
@@ -34,9 +34,9 @@ revm = { workspace = true, default-features = false, features = [
 alloy-providers = { workspace = true }
 alloy-transport = { workspace = true }
 alloy-rpc-types = { workspace = true }
-ethers = { workspace = true, features = ["ethers-solc"] }
 
 ethers-core.workspace = true
+ethers-providers.workspace = true
 
 derive_more.workspace = true
 eyre = "0.6"

diff --git a/crates/evm/core/src/backend/mod.rs b/crates/evm/core/src/backend/mod.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 use alloy_primitives::{b256, keccak256, Address, B256, U256, U64};
 use alloy_rpc_types::{Block, BlockNumberOrTag, BlockTransactions, Transaction};
-use ethers::utils::GenesisAccount;
+use ethers_core::utils::GenesisAccount;
 use foundry_common::{is_known_system_sender, types::ToAlloy, SYSTEM_TRANSACTION_TYPE};
 use revm::{
     db::{CacheDB, DatabaseRef},

diff --git a/crates/evm/core/src/fork/multi.rs b/crates/evm/core/src/fork/multi.rs
@@ -6,9 +6,8 @@
 use crate::fork::{BackendHandler, BlockchainDb, BlockchainDbMeta, CreateFork, SharedBackend};
 use alloy_providers::provider::Provider;
 use alloy_transport::BoxTransport;
-use ethers::types::BlockNumber;
+use ethers_core::types::BlockNumber;
 use foundry_common::provider::alloy::ProviderBuilder;
-
 use foundry_config::Config;
 use futures::{
     channel::mpsc::{channel, Receiver, Sender},

diff --git a/crates/evm/core/src/opts.rs b/crates/evm/core/src/opts.rs
@@ -2,7 +2,7 @@ use super::fork::environment;
 use crate::fork::CreateFork;
 use alloy_primitives::{Address, B256, U256};
 use alloy_rpc_types::Block;
-use ethers::providers::{Middleware, Provider};
+use ethers_providers::{Middleware, Provider};
 use eyre::WrapErr;
 use foundry_common::{
     self,

diff --git a/crates/evm/core/src/utils.rs b/crates/evm/core/src/utils.rs
@@ -1,7 +1,7 @@
 use alloy_json_abi::{Function, JsonAbi};
 use alloy_primitives::FixedBytes;
 use alloy_rpc_types::{Block, Transaction};
-use ethers::types::{ActionType, CallType, Chain, H256, U256};
+use ethers_core::types::{ActionType, CallType, Chain, H256, U256};
 use eyre::ContextCompat;
 use foundry_common::types::ToAlloy;
 use revm::{