fix some lint errors

bin/reth/Cargo.toml

@@ -100,6 +100,7 @@ eyre.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 backon.workspace = true
 similar-asserts.workspace = true
+test-fuzz.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true

crates/consensus/beacon/Cargo.toml

@@ -25,7 +25,6 @@ reth-tasks.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-builder-primitives.workspace = true
 reth-payload-primitives.workspace = true
-reth-payload-validator.workspace = true
 reth-prune.workspace = true
 reth-static-file.workspace = true
 reth-tokio-util.workspace = true

crates/consensus/beacon/src/engine/handle.rs

@@ -2,7 +2,7 @@
 
 use crate::{BeaconConsensusEngineEvent, BeaconForkChoiceUpdateError};
 use alloy_rpc_types_engine::{
-    ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState, ForkchoiceUpdated, PayloadStatus,
+    ExecutionPayloadSidecar, ForkchoiceState, ForkchoiceUpdated, PayloadStatus,
 };
 use futures::TryFutureExt;
 use reth_engine_primitives::{

crates/consensus/beacon/src/engine/mod.rs

@@ -2,7 +2,7 @@ use alloy_consensus::{BlockHeader, Header};
 use alloy_eips::{merge::EPOCH_SLOTS, BlockNumHash};
 use alloy_primitives::{BlockNumber, B256};
 use alloy_rpc_types_engine::{
-    ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus, PayloadStatusEnum,
+    ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus, PayloadStatusEnum,
     PayloadValidationError,
 };
 use futures::{stream::BoxStream, Future, StreamExt};
@@ -25,7 +25,6 @@ use reth_node_types::{Block, BlockTy, HeaderTy, NodeTypesWithEngine};
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_payload_builder_primitives::PayloadBuilder;
 use reth_payload_primitives::{PayloadAttributes, PayloadBuilderAttributes};
-use reth_payload_validator::ExecutionPayloadValidator;
 use reth_primitives::{EthPrimitives, Head, SealedBlock, SealedHeader};
 use reth_provider::{
     providers::ProviderNodeTypes, BlockIdReader, BlockReader, BlockSource, CanonChainTracker,

crates/consensus/beacon/src/engine/test_utils.rs

@@ -41,6 +41,7 @@ use reth_static_file::StaticFileProducer;
 use reth_tasks::TokioTaskExecutor;
 use std::{collections::VecDeque, sync::Arc};
 use tokio::sync::{oneshot, watch};
+use reth_stages_api::ExecOutput;
 
 type DatabaseEnv = TempDatabase<DE>;
 
@@ -73,7 +74,7 @@ impl<DB> TestEnv<DB> {
         payload: T,
         sidecar: ExecutionPayloadSidecar,
     ) -> Result<PayloadStatus, BeaconOnNewPayloadError> {
-        self.engine_handle.new_payload(payload.into(), sidecar).await
+        self.engine_handle.new_payload(payload, sidecar).await
     }
 
     /// Sends the `ExecutionPayload` message to the consensus engine and retries if the engine

crates/engine/util/Cargo.toml

@@ -14,24 +14,20 @@ workspace = true
 # reth
 reth-primitives.workspace = true
 reth-errors.workspace = true
-reth-consensus-common.workspace = true
 reth-fs-util.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-engine-primitives.workspace = true
-reth-payload-validator.workspace = true
 reth-evm.workspace = true
 reth-revm.workspace = true
 reth-provider.workspace = true
 reth-ethereum-forks.workspace = true
 revm-primitives.workspace = true
-reth-trie.workspace = true
 
 # taiko
 reth-taiko-engine-types.workspace = true
 reth-taiko-payload-validator.workspace = true
 
 # alloy
-alloy-eips.workspace = true
 alloy-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 alloy-consensus.workspace = true

crates/engine/util/src/engine_store.rs

@@ -1,6 +1,6 @@
 //! Stores engine API messages to disk for later inspection and replay.
 
-use alloy_rpc_types_engine::{ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState};
+use alloy_rpc_types_engine::{ExecutionPayloadSidecar, ForkchoiceState};
 use futures::{Stream, StreamExt};
 use reth_engine_primitives::{BeaconEngineMessage, EngineTypes};
 use reth_fs_util as fs;

crates/engine/util/src/lib.rs

@@ -2,8 +2,6 @@
 
 use futures::Stream;
 use reth_engine_primitives::{BeaconEngineMessage, EngineTypes};
-use reth_payload_validator::ExecutionPayloadValidator;
-use reth_taiko_payload_validator::TaikoExecutionPayloadValidator;
 use std::path::PathBuf;
 use tokio_util::either::Either;
 

crates/engine/util/src/reorg.rs

@@ -3,7 +3,7 @@
 use alloy_consensus::{Header, Transaction};
 use alloy_primitives::U256;
 use alloy_rpc_types_engine::{
-    CancunPayloadFields, ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus,
+    CancunPayloadFields, ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus,
 };
 use futures::{stream::FuturesUnordered, Stream, StreamExt, TryFutureExt};
 use itertools::Either;
@@ -17,7 +17,6 @@ use reth_evm::{
     state_change::post_block_withdrawals_balance_increments, system_calls::SystemCaller,
     ConfigureEvm,
 };
-use reth_payload_validator::ExecutionPayloadValidator;
 use reth_primitives::{
     proofs, transaction::SignedTransactionIntoRecoveredExt, Block, BlockBody, BlockExt, Receipt,
     Receipts,

crates/evm/src/execute.rs

@@ -703,8 +703,7 @@ mod tests {
 
         fn execute_transactions(
             &mut self,
-            _block: &BlockWithSenders,
-            _total_difficulty: U256,
+            _input: BlockExecutionInput<'_, BlockWithSenders>,
         ) -> Result<ExecuteOutput<Receipt>, Self::Error> {
             Ok(self.execute_transactions_result.clone())
         }
@@ -750,7 +749,7 @@ mod tests {
         let provider = TestExecutorProvider;
         let db = CacheDB::<EmptyDBTyped<ProviderError>>::default();
         let executor = provider.executor(db);
-        let _ = executor.execute(BlockExecutionInput::new(&mut Default::default(), U256::ZERO));
+        let _ = executor.execute(BlockExecutionInput::new(&Default::default(), U256::ZERO));
     }
 
     #[test]
@@ -776,7 +775,7 @@ mod tests {
         let db = CacheDB::<EmptyDBTyped<ProviderError>>::default();
         let executor = provider.executor(db);
         let result =
-            executor.execute(BlockExecutionInput::new(&mut Default::default(), U256::ZERO));
+            executor.execute(BlockExecutionInput::new(&Default::default(), U256::ZERO));
 
         assert!(result.is_ok());
         let block_execution_output = result.unwrap();
@@ -809,7 +808,7 @@ mod tests {
             tx_env.nonce.take();
         }));
         let result =
-            executor.execute(BlockExecutionInput::new(&mut Default::default(), U256::ZERO));
+            executor.execute(BlockExecutionInput::new(&Default::default(), U256::ZERO));
         assert!(result.is_ok());
     }
 

crates/evm/src/metrics.rs

@@ -177,6 +177,8 @@ mod tests {
                 receipts: vec![],
                 requests: Requests::default(),
                 gas_used: 0,
+                target_list: vec![],
+                skipped_list: vec![],
             })
         }
         fn execute_with_state_closure<F>(
@@ -192,6 +194,8 @@ mod tests {
                 receipts: vec![],
                 requests: Requests::default(),
                 gas_used: 0,
+                target_list: vec![],
+                skipped_list: vec![],
             })
         }
         fn execute_with_state_hook<F>(
@@ -210,6 +214,8 @@ mod tests {
                 receipts: vec![],
                 requests: Requests::default(),
                 gas_used: 0,
+                target_list: vec![],
+                skipped_list: vec![],
             })
         }
     }
@@ -240,6 +246,11 @@ mod tests {
         let input = BlockExecutionInput {
             block: &BlockWithSenders::default(),
             total_difficulty: Default::default(),
+            enable_anchor: false,
+            enable_skip: false,
+            enable_build: false,
+            max_bytes_per_tx_list: 0,
+            max_transactions_lists: 0,
         };
 
         let (tx, _rx) = mpsc::channel();
@@ -293,6 +304,11 @@ mod tests {
         let input = BlockExecutionInput {
             block: &BlockWithSenders::default(),
             total_difficulty: Default::default(),
+            enable_anchor: false,
+            enable_skip: false,
+            enable_build: false,
+            max_bytes_per_tx_list: 0,
+            max_transactions_lists: 0,
         };
 
         let (tx, rx) = mpsc::channel();

crates/optimism/evm/src/execute.rs

@@ -26,6 +26,7 @@ use reth_primitives::{BlockWithSenders, Receipt, TransactionSigned, TxType};
 use reth_revm::{Database, State};
 use revm_primitives::{db::DatabaseCommit, EnvWithHandlerCfg, ResultAndState, U256};
 use tracing::trace;
+use reth_execution_types::BlockExecutionInput;
 
 /// Factory for [`OpExecutionStrategy`].
 #[derive(Debug, Clone)]
@@ -161,9 +162,9 @@ where
 
     fn execute_transactions(
         &mut self,
-        block: &BlockWithSenders,
-        total_difficulty: U256,
+        input: BlockExecutionInput<'_, BlockWithSenders>,
     ) -> Result<ExecuteOutput<Receipt>, Self::Error> {
+        let BlockExecutionInput { block, total_difficulty, .. } = input;
         let env = self.evm_env_for_block(&block.header, total_difficulty);
         let mut evm = self.evm_config.evm_with_env(&mut self.state, env);
 

crates/taiko/chainspec/Cargo.toml

@@ -15,7 +15,6 @@ workspace = true
 # reth
 reth-chainspec.workspace = true
 reth-ethereum-forks.workspace = true
-reth-primitives-traits.workspace = true
 reth-network-peers.workspace = true
 
 # taiko-reth
@@ -26,32 +25,25 @@ alloy-chains.workspace = true
 alloy-genesis.workspace = true
 alloy-primitives.workspace = true
 alloy-consensus.workspace = true
-alloy-eips.workspace = true
 alloy-serde.workspace = true
 
-
 # io
 serde.workspace = true
 serde_json.workspace = true
 
 # misc
 derive_more.workspace = true
-once_cell.workspace = true
-
 
 [features]
 default = ["std"]
 std = [
     "alloy-chains/std",
     "alloy-genesis/std",
     "alloy-primitives/std",
-    "alloy-eips/std",
     "reth-chainspec/std",
     "reth-ethereum-forks/std",
-    "reth-primitives-traits/std",
     "reth-taiko-forks/std",
     "alloy-consensus/std",
-    "once_cell/std",
     "derive_more/std",
     "reth-network-peers/std",
 ]