feat: use foundry-cheatcodes implementations

Cargo.toml

@@ -68,13 +68,13 @@ scrypt.opt-level = 3
 # forking
 axum.opt-level = 3
 
-# Optimized release profile
-[profile.release]
-opt-level = "s"
-lto = "fat"
+# Local "release" mode, more optimized than dev but much faster to compile than release
+[profile.local]
+inherits = "dev"
+opt-level = 1
 strip = true
 panic = "abort"
-codegen-units = 1
+codegen-units = 16
 
 # Like release, but with full debug symbols and with stack unwinds. Useful for e.g. `perf`.
 [profile.debug-fast]
@@ -84,13 +84,16 @@ strip = "none"
 panic = "unwind"
 incremental = false
 
-[profile.release.package]
-# Optimize all non-workspace packages for speed
-"*".opt-level = 3
-
-# Package overrides
-foundry-evm.opt-level = 3
+# Optimized release profile
+[profile.release]
+opt-level = 3
+lto = "fat"
+strip = true
+panic = "abort"
+codegen-units = 1
 
+# Override packages which aren't perf-sensitive for faster compilation speed
+[profile.release.package]
 foundry-abi.opt-level = 1
 mdbook.opt-level = 1
 protobuf.opt-level = 1
@@ -100,47 +103,6 @@ rusoto_kms.opt-level = 1
 toml_edit.opt-level = 1
 trezor-client.opt-level = 1
 
-# Given that the `"*"` above takes precedence over the defaults for build scripts and macros, we
-# have to override all of them to reduce compile times
-syn.opt-level = 0
-prettyplease.opt-level = 0
-lalrpop.opt-level = 0
-
-ethers-contract-abigen.opt-level = 0
-ethers-contract-derive.opt-level = 0
-async-recursion.opt-level = 0
-miette-derive.opt-level = 0
-strum_macros.opt-level = 0
-enumn.opt-level = 0
-clap_derive.opt-level = 0
-serde_derive.opt-level = 0
-pear_codegen.opt-level = 0
-num_enum_derive.opt-level = 0
-scale-info-derive.opt-level = 0
-parity-scale-codec-derive.opt-level = 0
-time-macros.opt-level = 0
-phf_macros.opt-level = 0
-pin-project-internal.opt-level = 0
-auto_impl.opt-level = 0
-derive_more.opt-level = 0
-rlp-derive.opt-level = 0
-impl-trait-for-tuples.opt-level = 0
-async-trait.opt-level = 0
-tokio-macros.opt-level = 0
-tracing-attributes.opt-level = 0
-futures-macro.opt-level = 0
-thiserror-impl.opt-level = 0
-wasm-bindgen-macro-support.opt-level = 0
-wasm-bindgen-backend.opt-level = 0
-
-# Local "release" mode, more optimized than dev but much faster to compile than release
-[profile.local]
-inherits = "dev"
-opt-level = 1
-strip = true
-panic = "abort"
-codegen-units = 16
-
 [workspace.dependencies]
 anvil = { path = "crates/anvil" }
 cast = { path = "crates/cast" }

crates/abi/README.md

@@ -1,5 +1,9 @@
 # foundry-abi
 
+> [!WARNING]
+> This crate is deprecated and will be replaced with `foundry-cheatcodes` in the near future.
+> Please avoid making any changes in this crate.
+
 Contains automatically-generated Rust bindings from Solidity ABI.
 
 Additional bindings can be generated by doing the following:

crates/abi/build.rs

@@ -1,3 +1,7 @@
+//! **WARNING**
+//! This crate is deprecated and will be replaced with `foundry-cheatcodes` in the near future.
+//! Please avoid making any changes in this crate.
+
 use ethers_contract_abigen::MultiAbigen;
 
 /// Includes a JSON ABI as a string literal.

crates/abi/src/lib.rs

@@ -1,6 +1,10 @@
 //! Foundry's Solidity ABI bindings.
 //!
 //! Automatically generated by [abigen](ethers_contract::abigen).
+//!
+//! **WARNING**
+//! This crate is deprecated and will be replaced with `foundry-cheatcodes` in the near future.
+//! Please avoid making any changes in this crate.
 
 #![warn(unused_crate_dependencies)]
 

crates/cheatcodes/Cargo.toml

@@ -13,8 +13,10 @@ exclude.workspace = true
 
 [dependencies]
 foundry-macros.workspace = true
+
 alloy-primitives.workspace = true
 alloy-sol-types.workspace = true
+
 serde.workspace = true
 serde_json.workspace = true
 
@@ -23,38 +25,43 @@ schemars = { version = "0.8.15", optional = true }
 
 # impls
 foundry-common = { workspace = true, optional = true }
+foundry-compilers = { workspace = true, optional = true }
 foundry-config = { workspace = true, optional = true }
+foundry-evm-core = { workspace = true, optional = true }
 foundry-utils = { workspace = true, optional = true }
+
 alloy-dyn-abi = { workspace = true, optional = true }
 alloy-json-abi = { workspace = true, optional = true }
-ethers = { workspace = true, optional = true, features = ["ethers-solc"] }
-foundry-compilers = { workspace = true, optional = true, default-features = false }
+ethers-core = { workspace = true, optional = true }
+ethers-signers = { workspace = true, optional = true }
+ethers-providers = { workspace = true, optional = true }
+
 eyre = { workspace = true, optional = true }
-futures = { version = "0.3", optional = true }
 hex = { workspace = true, optional = true }
 itertools = { workspace = true, optional = true }
 jsonpath_lib = { workspace = true, optional = true }
 revm = { workspace = true, optional = true }
-thiserror = { version = "1", optional = true }
 tracing = { workspace = true, optional = true }
 walkdir = { version = "2", optional = true }
 
 [features]
 schema = ["dep:schemars"]
 impls = [
     "dep:foundry-common",
+    "dep:foundry-compilers",
     "dep:foundry-config",
+    "dep:foundry-evm-core",
     "dep:foundry-utils",
     "dep:alloy-dyn-abi",
     "dep:alloy-json-abi",
-    "dep:ethers",
+    "dep:ethers-core",
+    "dep:ethers-providers",
+    "dep:ethers-signers",
     "dep:eyre",
-    "dep:futures",
     "dep:hex",
     "dep:itertools",
     "dep:jsonpath_lib",
     "dep:revm",
-    "dep:thiserror",
     "dep:tracing",
     "dep:walkdir",
 ]

crates/cheatcodes/src/defs/vm.rs

@@ -54,6 +54,28 @@ interface Vm {
         string url;
     }
 
+    /// An RPC log object. Returned by `eth_getLogs`.
+    struct EthGetLogs {
+        /// The address of the log's emitter.
+        address emitter;
+        /// The topics of the log, including the signature, if any.
+        bytes32[] topics;
+        /// The raw data of the log.
+        bytes data;
+        /// The block hash.
+        bytes32 blockHash;
+        /// The block number.
+        uint64 blockNumber;
+        /// The transaction hash.
+        bytes32 transactionHash;
+        /// The transaction index in the block.
+        uint64 transactionIndex;
+        /// The log index.
+        uint256 logIndex;
+        /// Whether the log was removed.
+        bool removed;
+    }
+
     /// A single entry in a directory listing. Returned by `readDir`.
     struct DirEntry {
         /// The error message, if any.
@@ -352,6 +374,16 @@ interface Vm {
     #[cheatcode(group = Evm, safety = Unsafe)]
     function transact(uint256 forkId, bytes32 txHash) external;
 
+    /// Performs an Ethereum JSON-RPC request to the current fork URL.
+    #[cheatcode(group = Evm, safety = Unsafe)]
+    function rpc(string calldata method, string calldata params) external returns (bytes memory data);
+
+    /// Gets all the logs according to specified filter.
+    #[cheatcode(group = Evm, safety = Unsafe)]
+    function eth_getLogs(uint256 fromBlock, uint256 toBlock, address addr, bytes32[] memory topics)
+        external
+        returns (EthGetLogs[] memory logs);
+
     // --- Behavior ---
 
     /// In forking mode, explicitly grant the given address cheatcode access.

crates/cheatcodes/src/impls/config.rs

@@ -6,31 +6,9 @@ use foundry_config::{
     cache::StorageCachingConfig, fs_permissions::FsAccessKind, Config, FsPermissions,
     ResolvedRpcEndpoints,
 };
+use foundry_evm_core::opts::EvmOpts;
 use std::path::{Path, PathBuf};
 
-// TODO
-#[derive(Clone, Debug, Default)]
-pub struct EvmOpts {
-    pub ffi: bool,
-    pub fork_block_number: Option<u64>,
-}
-
-impl EvmOpts {
-    pub fn get_compute_units_per_second(&self) -> u64 {
-        unimplemented!()
-    }
-
-    pub async fn fork_evm_env(
-        &self,
-        _x: &str,
-    ) -> Result<
-        (revm::primitives::Env, ethers::types::Block<ethers::types::H256>),
-        core::convert::Infallible,
-    > {
-        unimplemented!()
-    }
-}
-
 /// Additional, configurable context the `Cheatcodes` inspector has access to
 ///
 /// This is essentially a subset of various `Config` settings `Cheatcodes` needs to know.