Merge branch 'foundry-rs:master' into pate/issue-5529

Cargo.toml

@@ -123,13 +123,15 @@ foundry-evm-traces = { path = "crates/evm/traces" }
 foundry-macros = { path = "crates/macros" }
 foundry-test-utils = { path = "crates/test-utils" }
 
-foundry-block-explorers = { version = "0.1.2", default-features = false }
-foundry-compilers = { version = "0.1.1", default-features = false }
+# solc & compilation utilities
+foundry-block-explorers = { version = "0.2.0", default-features = false }
+foundry-compilers = { version = "0.2.1", default-features = false }
 
 ## revm
 # no default features to avoid c-kzg
 revm = { version = "3", default-features = false }
 revm-primitives = { version = "1", default-features = false }
+revm-inspectors = { version = "0.1", default-features = false }
 
 ## ethers
 ethers = { version = "2.0", default-features = false }
@@ -142,11 +144,22 @@ ethers-middleware = { version = "2.0", default-features = false }
 ethers-solc = { version = "2.0", default-features = false }
 
 ## alloy
-alloy-primitives = "0.5.0"
-alloy-dyn-abi = "0.5.0"
-alloy-json-abi = "0.5.0"
-alloy-sol-types = "0.5.0"
-syn-solidity = "0.5.0"
+alloy-consensus = "0.1.0"
+alloy-json-rpc = "0.1.0"
+alloy-providers = "0.1.0"
+alloy-pubsub = "0.1.0"
+alloy-rpc-client = "0.1.0"
+alloy-rpc-trace-types = "0.1.0"
+alloy-rpc-types = "0.1.0"
+alloy-transport = "0.1.0"
+alloy-transport-http = "0.1.0"
+alloy-transport-ipc = "0.1.0"
+alloy-transport-ws = "0.1.0"
+alloy-primitives = "0.6.0"
+alloy-dyn-abi = "0.6.0"
+alloy-json-abi = "0.6.0"
+alloy-sol-types = "0.6.0"
+syn-solidity = "0.6.0"
 
 alloy-chains = "0.1.5"
 alloy-rlp = "0.3.3"
@@ -197,8 +210,22 @@ ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194
 ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
 ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "f0e5b194f09c533feb10d1a686ddb9e5946ec107" }
 
+# alloy-consensus = { git = "https://github.com/alloy-rs/alloy" }
+alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy" }
+alloy-providers = { git = "https://github.com/alloy-rs/alloy" }
+alloy-pubsub = { git = "https://github.com/alloy-rs/alloy" }
+alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy" }
+alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy" }
+alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy" }
+alloy-signer = { git = "https://github.com/alloy-rs/alloy" }
+alloy-transport = { git = "https://github.com/alloy-rs/alloy" }
+alloy-transport-http = { git = "https://github.com/alloy-rs/alloy" }
+alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy" }
+alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy" }
+
 revm = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
+revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
 revm-interpreter = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
 revm-precompile = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
-revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze" }
 
+revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors" }

crates/anvil/Cargo.toml

@@ -36,6 +36,11 @@ trie-db = "0.23"
 hash-db = "0.15"
 memory-db = "0.29"
 alloy-primitives = { workspace = true, features = ["serde"] }
+alloy-rpc-types.workspace = true
+alloy-rpc-trace-types.workspace = true
+alloy-providers.workspace = true
+alloy-transport.workspace = true
+alloy-chains.workspace = true
 
 # axum related
 axum.workspace = true
@@ -62,6 +67,7 @@ yansi = "0.5"
 tempfile = "3"
 itertools.workspace = true
 rand = "0.8"
+eyre.workspace = true
 
 # cli
 clap = { version = "4", features = ["derive", "env", "wrap_help"], optional = true }

crates/anvil/core/Cargo.toml

@@ -12,9 +12,11 @@ repository.workspace = true
 [dependencies]
 foundry-common.workspace = true
 foundry-evm.workspace = true
+revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }
 
 alloy-primitives = { workspace = true, features = ["serde"] }
-revm = { workspace = true, default-features = false, features = ["std", "serde", "memory_limit"] }
+alloy-rpc-types = { workspace = true }
+alloy-rpc-trace-types.workspace = true
 ethers-core = { workspace = true, features = ["optimism"] }
 # theses are not used by anvil-core, but are required by ethers, because pulled in via foundry-common
 ethers-contract = { workspace = true, features = ["optimism"] }
@@ -23,7 +25,7 @@ ethers-middleware = { workspace = true, features = ["optimism"] }
 
 serde = { workspace = true, optional = true }
 serde_json.workspace = true
-bytes = { version = "1.4" }
+bytes = "1.4"
 open-fastrlp = { version = "0.1.4", optional = true }
 
 # trie
@@ -40,4 +42,4 @@ anvil-core = { path = ".", features = ["serde"] }
 default = ["serde"]
 impersonated-tx = []
 fastrlp = ["dep:open-fastrlp"]
-serde = ["dep:serde"]
+serde = ["dep:serde"]

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

@@ -8,7 +8,7 @@ use ethers_core::{
 };
 
 /// Container type that gathers all block data
-#[derive(Debug, Clone)]
+#[derive(Clone, Debug)]
 pub struct BlockInfo {
     pub block: Block,
     pub transactions: Vec<TransactionInfo>,
@@ -281,7 +281,7 @@ impl open_fastrlp::Decodable for Header {
 }
 
 /// Partial header definition without ommers hash and transactions root
-#[derive(Clone, Debug, PartialEq, Eq, Default)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct PartialHeader {
     pub parent_hash: H256,
     pub beneficiary: Address,