Merge branch 'master' into cargo-update

Author: zerosnacks

Cargo.lock

@@ -91,7 +91,6 @@ thiserror.workspace = true
 yansi.workspace = true
 tempfile.workspace = true
 itertools.workspace = true
-rand.workspace = true
 rand_08.workspace = true
 eyre.workspace = true
 
@@ -110,6 +109,7 @@ clap_complete_fig = "4"
 [dev-dependencies]
 alloy-provider = { workspace = true, features = ["txpool-api"] }
 alloy-pubsub.workspace = true
+rand.workspace = true
 foundry-test-utils.workspace = true
 tokio = { workspace = true, features = ["full"] }
 

crates/anvil/Cargo.toml

@@ -1680,6 +1680,7 @@ impl Backend {
                         request,
                         Signature::new(Default::default(), Default::default(), false),
                     )?;
+                    let tx_hash = tx.hash();
                     let rpc_tx = transaction_build(
                         None,
                         MaybeImpersonatedTransaction::impersonated(tx, from),
@@ -1713,20 +1714,22 @@ impl Backend {
                                 removed: false,
 
                                 block_hash: None,
-                                transaction_hash: None,
+                                transaction_hash: Some(tx_hash),
                             })
                             .collect(),
                     };
+
                     let receipt = Receipt {
                         status: result.is_success().into(),
                         cumulative_gas_used: result.gas_used(),
-                        logs:sim_res.logs.clone()
+                        logs: sim_res.logs.clone()
                     };
                     receipts.push(receipt.with_bloom());
                     logs.extend(sim_res.logs.clone().iter().map(|log| log.inner.clone()));
                     log_index += sim_res.logs.len();
                     call_res.push(sim_res);
                 }
+
                 let transactions_envelopes: Vec<AnyTxEnvelope> = transactions
                 .iter()
                 .map(|tx| AnyTxEnvelope::from(tx.clone()))
@@ -1736,7 +1739,6 @@ impl Backend {
                     transactions_root: calculate_transaction_root(&transactions_envelopes),
                     receipts_root: calculate_receipt_root(&transactions_envelopes),
                     parent_hash: Default::default(),
-                    ommers_hash: Default::default(),
                     beneficiary: block_env.beneficiary,
                     state_root: Default::default(),
                     difficulty: Default::default(),
@@ -1753,6 +1755,7 @@ impl Backend {
                     excess_blob_gas: None,
                     parent_beacon_block_root: None,
                     requests_hash: None,
+                    ..Default::default()
                 };
                 let mut block = alloy_rpc_types::Block {
                     header: AnyRpcHeader {
@@ -1770,6 +1773,12 @@ impl Backend {
                     block.transactions.convert_to_hashes();
                 }
 
+                for res in &mut call_res {
+                    res.logs.iter_mut().for_each(|log| {
+                        log.block_hash = Some(block.header.hash);
+                    });
+                }
+
                 let simulated_block = SimulatedBlock {
                     inner: AnyRpcBlock::new(WithOtherFields::new(block)),
                     calls: call_res,

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

@@ -1,6 +1,7 @@
 //! Anvil is a fast local Ethereum development node.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 use crate::{
     eth::{

crates/anvil/src/lib.rs

@@ -53,7 +53,6 @@ alloy-signer.workspace = true
 alloy-sol-types.workspace = true
 alloy-transport.workspace = true
 alloy-ens = { workspace = true, features = ["provider"] }
-alloy-hardforks.workspace = true
 
 op-alloy-flz.workspace = true
 op-alloy-consensus = { workspace = true, features = ["alloy-compat"] }
@@ -68,12 +67,6 @@ rayon.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 
-# aws-kms
-aws-sdk-kms = { workspace = true, default-features = false, optional = true }
-
-# gcp-kms
-gcloud-sdk = { version = "0.27", default-features = false, optional = true }
-
 # bin
 foundry-cli.workspace = true
 
@@ -95,13 +88,14 @@ evmole.workspace = true
 [dev-dependencies]
 anvil.workspace = true
 foundry-test-utils.workspace = true
+alloy-hardforks.workspace = true
 
 [features]
 default = ["jemalloc"]
 asm-keccak = ["alloy-primitives/asm-keccak"]
 jemalloc = ["foundry-cli/jemalloc"]
 mimalloc = ["foundry-cli/mimalloc"]
 tracy-allocator = ["foundry-cli/tracy-allocator"]
-aws-kms = ["foundry-wallets/aws-kms", "dep:aws-sdk-kms"]
-gcp-kms = ["foundry-wallets/gcp-kms", "dep:gcloud-sdk"]
-isolate-by-default = ["foundry-config/isolate-by-default"]
+aws-kms = ["foundry-wallets/aws-kms"]
+gcp-kms = ["foundry-wallets/gcp-kms"]
+isolate-by-default = ["foundry-config/isolate-by-default"]

crates/cast/Cargo.toml

@@ -1,6 +1,7 @@
 //! Cast is a Swiss Army knife for interacting with Ethereum applications from the command line.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 use alloy_consensus::TxEnvelope;
 use alloy_dyn_abi::{DynSolType, DynSolValue, FunctionExt};

crates/cast/src/lib.rs

@@ -1,6 +1,7 @@
 //! Chisel is a fast, utilitarian, and verbose Solidity REPL.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 #[macro_use]
 extern crate foundry_common;

crates/chisel/src/lib.rs

@@ -1,5 +1,7 @@
 //! Helpers for formatting Ethereum types.
 
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
 mod console;
 pub use console::{console_format, ConsoleFmt, FormatSpec};
 

crates/common/fmt/src/lib.rs

@@ -30,9 +30,7 @@ foundry-compilers = { workspace = true, features = ["full"] }
 foundry-config.workspace = true
 foundry-evm.workspace = true
 foundry-evm-core.workspace = true
-foundry-wallets.workspace = true
 foundry-linking.workspace = true
-forge-script-sequence.workspace = true
 
 comfy-table.workspace = true
 eyre.workspace = true
@@ -63,31 +61,26 @@ alloy-rpc-types.workspace = true
 alloy-serde.workspace = true
 alloy-signer.workspace = true
 alloy-transport.workspace = true
-alloy-hardforks.workspace = true
 
 revm.workspace = true
 
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
 clap_complete = "4"
 clap_complete_fig = "4"
 dunce.workspace = true
-futures.workspace = true
 indicatif.workspace = true
 inferno = { version = "0.12", default-features = false }
 itertools.workspace = true
 parking_lot.workspace = true
 regex = { workspace = true, default-features = false }
-reqwest = { workspace = true, features = ["json"] }
 semver.workspace = true
 serde_json.workspace = true
 similar = { version = "2", features = ["inline"] }
 solang-parser.workspace = true
 solar-parse.workspace = true
-solar-interface.workspace = true
 strum = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["time"] }
-toml = { workspace = true, features = ["preserve_order"] }
 toml_edit = "0.22"
 watchexec = "8.0"
 watchexec-events = "6.0"
@@ -105,8 +98,13 @@ soldeer-commands.workspace = true
 quick-junit = "0.5.0"
 
 [dev-dependencies]
+alloy-hardforks.workspace = true
 anvil.workspace = true
+forge-script-sequence.workspace = true
 foundry-test-utils.workspace = true
+foundry-wallets.workspace = true
+futures.workspace = true
+reqwest = { workspace = true, features = ["json"] }
 
 mockall = "0.13"
 globset = "0.4"

crates/forge/Cargo.toml

@@ -1,5 +1,6 @@
 //! Forge is a fast and flexible Ethereum testing framework.
 
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 #[macro_use]