refactor: remove foundry-utils

Cargo.toml

@@ -23,7 +23,6 @@ members = [
  "crates/forge/",
  "crates/macros/",
  "crates/test-utils/",
- "crates/utils/",
 ]
 resolver = "2"
 
@@ -125,7 +124,6 @@ foundry-evm-fuzz = { path = "crates/evm/fuzz" }
 foundry-evm-traces = { path = "crates/evm/traces" }
 foundry-macros = { path = "crates/macros" }
 foundry-test-utils = { path = "crates/test-utils" }
-foundry-utils = { path = "crates/utils" }
 
 # block explorer & verification bindings
 foundry-block-explorers = { version = "0.1", default-features = false }

crates/anvil/Cargo.toml

@@ -26,7 +26,6 @@ anvil-server = { path = "server" }
 foundry-common.workspace = true
 foundry-config.workspace = true
 foundry-evm.workspace = true
-foundry-utils.workspace = true
 
 # evm support
 bytes = "1.4.0"

crates/anvil/core/Cargo.toml

@@ -10,9 +10,9 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-# foundry internal
+foundry-common.workspace = true
 foundry-evm.workspace = true
-foundry-utils.workspace = true
+
 revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }
 
 alloy-primitives = { workspace = true, features = ["serde"] }

crates/anvil/core/src/eth/proof.rs

@@ -5,8 +5,9 @@ use ethers_core::{
  types::{H256, U256},
  utils::rlp,
 };
-use foundry_utils::types::ToEthers;
+use foundry_common::types::ToEthers;
 use revm::primitives::KECCAK_EMPTY;
+
 // reexport for convenience
 pub use ethers_core::types::{EIP1186ProofResponse as AccountProof, StorageProof};
 

crates/anvil/core/src/eth/receipt.rs

@@ -6,7 +6,7 @@ use ethers_core::{
  rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream},
  },
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
+use foundry_common::types::{ToAlloy, ToEthers};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "fastrlp", derive(open_fastrlp::RlpEncodable, open_fastrlp::RlpDecodable))]

crates/anvil/core/src/eth/transaction/mod.rs

@@ -14,8 +14,8 @@ use ethers_core::{
  rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream},
  },
 };
+use foundry_common::types::ToAlloy;
 use foundry_evm::traces::CallTraceArena;
-use foundry_utils::types::ToAlloy;
 use revm::{
  interpreter::InstructionResult,
  primitives::{CreateScheme, TransactTo, TxEnv},

crates/anvil/core/src/eth/utils.rs

@@ -6,7 +6,7 @@ use ethers_core::{
  rlp::{Encodable, RlpStream},
  },
 };
-use foundry_utils::types::ToAlloy;
+use foundry_common::types::ToAlloy;
 
 pub fn enveloped<T: Encodable>(id: u8, v: &T, s: &mut RlpStream) {
  let encoded = rlp::encode(v);

crates/anvil/src/config.rs

@@ -28,6 +28,7 @@ use ethers::{
  utils::{format_ether, hex, to_checksum, WEI_IN_ETHER},
 };
 use foundry_common::{
+ types::{ToAlloy, ToEthers},
  ProviderBuilder, ALCHEMY_FREE_TIER_CUPS, NON_ARCHIVE_NODE_WARNING, REQUEST_TIMEOUT,
 };
 use foundry_config::Config;
@@ -38,7 +39,6 @@ use foundry_evm::{
  revm::primitives::{BlockEnv, CfgEnv, SpecId, TxEnv, U256 as rU256},
  utils::apply_chain_and_block_specific_env_changes,
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 use parking_lot::RwLock;
 use serde_json::{json, to_writer, Value};
 use std::{

crates/anvil/src/eth/api.rs

@@ -61,7 +61,7 @@ use ethers::{
  },
  utils::rlp,
 };
-use foundry_common::ProviderBuilder;
+use foundry_common::{types::ToEthers, ProviderBuilder};
 use foundry_evm::{
  backend::DatabaseError,
  revm::{
@@ -70,7 +70,6 @@ use foundry_evm::{
  primitives::BlockEnv,
  },
 };
-use foundry_utils::types::ToEthers;
 use futures::channel::{mpsc::Receiver, oneshot};
 use parking_lot::RwLock;
 use std::{collections::HashSet, future::Future, sync::Arc, time::Duration};

crates/anvil/src/eth/backend/db.rs

@@ -8,7 +8,7 @@ use ethers::{
  types::{BlockId, H256},
  utils::keccak256,
 };
-use foundry_common::errors::FsPathError;
+use foundry_common::{errors::FsPathError, types::ToAlloy};
 use foundry_evm::{
  backend::{DatabaseError, DatabaseResult, MemDb, StateSnapshot},
  fork::BlockchainDb,
@@ -19,7 +19,6 @@ use foundry_evm::{
  Database, DatabaseCommit,
  },
 };
-use foundry_utils::types::ToAlloy;
 use hash_db::HashDB;
 use serde::{Deserialize, Serialize};
 use std::{collections::BTreeMap, fmt, path::Path};

crates/anvil/src/eth/backend/executor.rs

@@ -17,6 +17,7 @@ use ethers::{
  types::{Bloom, H256, U256},
  utils::rlp,
 };
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::DatabaseError,
  revm,
@@ -27,7 +28,6 @@ use foundry_evm::{
  traces::{CallTraceArena, CallTraceNode},
  utils::{eval_to_instruction_result, halt_to_instruction_result},
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 use std::sync::Arc;
 
 /// Represents an executed transaction (transacted on the DB)

crates/anvil/src/eth/backend/genesis.rs

@@ -9,14 +9,14 @@ use ethers::{
  abi::ethereum_types::BigEndianHash,
  types::{Address, H256},
 };
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::{DatabaseError, DatabaseResult, StateSnapshot},
  revm::{
  db::DatabaseRef,
  primitives::{AccountInfo, Bytecode, KECCAK_EMPTY},
  },
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 use parking_lot::Mutex;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLockWriteGuard;

crates/anvil/src/eth/backend/mem/fork_db.rs

@@ -7,12 +7,12 @@ use crate::{
  Address, U256,
 };
 use ethers::{prelude::H256, types::BlockId};
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::{DatabaseResult, StateSnapshot},
  fork::{database::ForkDbSnapshot, BlockchainDb},
  revm::Database,
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 
 pub use foundry_evm::fork::database::ForkedDatabase;
 

crates/anvil/src/eth/backend/mem/in_memory_db.rs

@@ -10,11 +10,11 @@ use crate::{
  Address, U256,
 };
 use ethers::{prelude::H256, types::BlockId};
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::{DatabaseResult, StateSnapshot},
  fork::BlockchainDb,
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 
 // reexport for convenience
 pub use foundry_evm::{backend::MemDb, revm::db::DatabaseRef};
@@ -141,11 +141,11 @@ mod tests {
  };
  use alloy_primitives::{Bytes, U256 as rU256};
  use ethers::types::U256;
+ use foundry_common::types::ToAlloy;
  use foundry_evm::{
  backend::MemDb,
  revm::primitives::{Bytecode, KECCAK_EMPTY},
  };
- use foundry_utils::types::ToAlloy;
  use std::{collections::BTreeMap, str::FromStr};
 
  // verifies that all substantial aspects of a loaded account remain the state after an account

crates/anvil/src/eth/backend/mem/mod.rs

@@ -56,6 +56,7 @@ use ethers::{
  utils::{keccak256, rlp},
 };
 use flate2::{read::GzDecoder, write::GzEncoder, Compression};
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::{DatabaseError, DatabaseResult},
  constants::DEFAULT_CREATE2_DEPLOYER_RUNTIME_CODE,
@@ -72,7 +73,6 @@ use foundry_evm::{
  },
  utils::{eval_to_instruction_result, halt_to_instruction_result, u256_to_h256_be},
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 use futures::channel::mpsc::{unbounded, UnboundedSender};
 use hash_db::HashDB;
 use parking_lot::{Mutex, RwLock};

crates/anvil/src/eth/backend/mem/state.rs

@@ -7,6 +7,7 @@ use ethers::{
  types::H256,
  utils::{rlp, rlp::RlpStream},
 };
+use foundry_common::types::{ToAlloy, ToEthers};
 use foundry_evm::{
  backend::DatabaseError,
  hashbrown::HashMap as Map,
@@ -15,7 +16,6 @@ use foundry_evm::{
  primitives::{AccountInfo, Bytecode, Log},
  },
 };
-use foundry_utils::types::{ToAlloy, ToEthers};
 use memory_db::HashKey;
 use trie_db::TrieMut;