chore: make ethereum-node deps leaner (#12963)

Cargo.lock

@@ -8106,12 +8106,13 @@ dependencies = [
  "alloy-primitives",
  "alloy-provider",
  "alloy-rpc-types-beacon",
+ "alloy-rpc-types-engine",
+ "alloy-rpc-types-eth",
  "alloy-signer",
  "alloy-sol-types",
  "eyre",
  "futures",
  "rand 0.8.5",
- "reth",
  "reth-basic-payload-builder",
  "reth-beacon-consensus",
  "reth-chainspec",
@@ -8126,11 +8127,14 @@ dependencies = [
  "reth-network",
  "reth-node-api",
  "reth-node-builder",
+ "reth-node-core",
  "reth-payload-builder",
+ "reth-payload-primitives",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
  "reth-rpc",
+ "reth-rpc-eth-api",
  "reth-tasks",
  "reth-tracing",
  "reth-transaction-pool",

crates/ethereum/node/Cargo.toml

@@ -41,26 +41,32 @@ revm = { workspace = true, features = ["secp256k1", "blst", "c-kzg"] }
 eyre.workspace = true
 
 [dev-dependencies]
-reth.workspace = true
 reth-chainspec.workspace = true
 reth-db.workspace = true
 reth-exex.workspace = true
 reth-node-api.workspace = true
+reth-node-core.workspace = true
+reth-payload-primitives.workspace = true
 reth-e2e-test-utils.workspace = true
+reth-rpc-eth-api.workspace = true
 reth-tasks.workspace = true
-futures.workspace = true
+
 alloy-primitives.workspace = true
-alloy-genesis.workspace = true
-tokio.workspace = true
-serde_json.workspace = true
 alloy-consensus.workspace = true
 alloy-provider.workspace = true
-rand.workspace = true
+alloy-genesis.workspace = true
 alloy-signer.workspace = true
 alloy-eips.workspace = true
 alloy-sol-types.workspace = true
 alloy-contract.workspace = true
 alloy-rpc-types-beacon.workspace = true
+alloy-rpc-types-engine.workspace = true
+alloy-rpc-types-eth.workspace = true
+
+futures.workspace = true
+tokio.workspace = true
+serde_json.workspace = true
+rand.workspace = true
 
 [features]
 default = []

crates/ethereum/node/tests/e2e/blobs.rs

@@ -1,21 +1,17 @@
-use std::sync::Arc;
-
+use crate::utils::eth_payload_attributes;
 use alloy_consensus::constants::MAINNET_GENESIS_HASH;
 use alloy_genesis::Genesis;
-use reth::{
-    args::RpcServerArgs,
-    builder::{NodeBuilder, NodeConfig, NodeHandle},
-    rpc::types::engine::PayloadStatusEnum,
-    tasks::TaskManager,
-};
+use alloy_rpc_types_engine::PayloadStatusEnum;
 use reth_chainspec::{ChainSpecBuilder, MAINNET};
 use reth_e2e_test_utils::{
     node::NodeTestContext, transaction::TransactionTestContext, wallet::Wallet,
 };
+use reth_node_builder::{NodeBuilder, NodeHandle};
+use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig};
 use reth_node_ethereum::EthereumNode;
+use reth_tasks::TaskManager;
 use reth_transaction_pool::TransactionPool;
-
-use crate::utils::eth_payload_attributes;
+use std::sync::Arc;
 
 #[tokio::test]
 async fn can_handle_blobs() -> eyre::Result<()> {

crates/ethereum/node/tests/e2e/dev.rs

@@ -1,18 +1,18 @@
-use std::sync::Arc;
-
 use alloy_eips::eip2718::Encodable2718;
 use alloy_genesis::Genesis;
 use alloy_primitives::{b256, hex};
 use futures::StreamExt;
-use reth::{args::DevArgs, rpc::api::eth::helpers::EthTransactions};
 use reth_chainspec::ChainSpec;
 use reth_node_api::{FullNodeComponents, FullNodePrimitives, NodeTypes};
 use reth_node_builder::{
     rpc::RethRpcAddOns, EngineNodeLauncher, FullNode, NodeBuilder, NodeConfig, NodeHandle,
 };
+use reth_node_core::args::DevArgs;
 use reth_node_ethereum::{node::EthereumAddOns, EthereumNode};
 use reth_provider::{providers::BlockchainProvider2, CanonStateSubscriptions};
+use reth_rpc_eth_api::helpers::EthTransactions;
 use reth_tasks::TaskManager;
+use std::sync::Arc;
 
 #[tokio::test]
 async fn can_run_dev_node() -> eyre::Result<()> {

crates/ethereum/node/tests/e2e/eth.rs

@@ -1,15 +1,13 @@
 use crate::utils::eth_payload_attributes;
 use alloy_genesis::Genesis;
-use reth::{
-    args::RpcServerArgs,
-    builder::{NodeBuilder, NodeConfig, NodeHandle},
-    tasks::TaskManager,
-};
 use reth_chainspec::{ChainSpecBuilder, MAINNET};
 use reth_e2e_test_utils::{
     node::NodeTestContext, setup, transaction::TransactionTestContext, wallet::Wallet,
 };
+use reth_node_builder::{NodeBuilder, NodeHandle};
+use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig};
 use reth_node_ethereum::EthereumNode;
+use reth_tasks::TaskManager;
 use std::sync::Arc;
 
 #[tokio::test]

crates/ethereum/node/tests/e2e/p2p.rs

@@ -7,9 +7,9 @@ use alloy_provider::{
     },
     Provider, ProviderBuilder, SendableTx,
 };
+use alloy_rpc_types_eth::TransactionRequest;
 use alloy_signer::SignerSync;
 use rand::{rngs::StdRng, seq::SliceRandom, Rng, SeedableRng};
-use reth::rpc::types::TransactionRequest;
 use reth_chainspec::{ChainSpecBuilder, MAINNET};
 use reth_e2e_test_utils::{setup, setup_engine, transaction::TransactionTestContext};
 use reth_node_ethereum::EthereumNode;

crates/ethereum/node/tests/e2e/rpc.rs

@@ -6,17 +6,14 @@ use alloy_rpc_types_beacon::relay::{
     BidTrace, BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4,
     SignedBidSubmissionV3, SignedBidSubmissionV4,
 };
+use alloy_rpc_types_engine::BlobsBundleV1;
+use alloy_rpc_types_eth::TransactionRequest;
 use rand::{rngs::StdRng, Rng, SeedableRng};
-use reth::{
-    payload::BuiltPayload,
-    rpc::{
-        compat::engine::payload::block_to_payload_v3,
-        types::{engine::BlobsBundleV1, TransactionRequest},
-    },
-};
 use reth_chainspec::{ChainSpecBuilder, MAINNET};
 use reth_e2e_test_utils::setup_engine;
+use reth_node_core::rpc::compat::engine::payload::block_to_payload_v3;
 use reth_node_ethereum::EthereumNode;
+use reth_payload_primitives::BuiltPayload;
 use std::sync::Arc;
 
 alloy_sol_types::sol! {

crates/ethereum/node/tests/e2e/utils.rs

@@ -1,5 +1,5 @@
 use alloy_primitives::{Address, B256};
-use reth::rpc::types::engine::PayloadAttributes;
+use alloy_rpc_types_engine::PayloadAttributes;
 use reth_payload_builder::EthPayloadBuilderAttributes;
 
 /// Helper function to create a new eth payload attributes