Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/evm/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/core/src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
3 changes: 1 addition & 2 deletions crates/evm/core/src/fork/multi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/core/src/opts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/core/src/utils.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
Loading