refactor: remove reth dependencies and instead use reth_ethereum

crates/ethereum/reth/Cargo.toml

@@ -34,6 +34,7 @@ reth-rpc-builder = { workspace = true, optional = true }
 reth-exex = { workspace = true, optional = true }
 reth-trie = { workspace = true, optional = true }
 reth-node-builder = { workspace = true, optional = true }
+reth-tasks = { workspace = true, optional = true }
 
 # reth-ethereum
 reth-ethereum-primitives.workspace = true
@@ -44,13 +45,14 @@ reth-node-ethereum = { workspace = true, optional = true }
 
 # alloy
 alloy-rpc-types-eth = { workspace = true, optional = true }
+alloy-rpc-types-engine = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
 std = [
     "reth-chainspec/std",
     "reth-ethereum-primitives/std",
-    "reth-ethereum-consensus/std",
+    "reth-ethereum-consensus?/std",
     "reth-primitives-traits/std",
     "reth-consensus?/std",
     "reth-consensus-common?/std",
@@ -59,6 +61,7 @@ std = [
     "reth-evm?/std",
     "reth-evm-ethereum?/std",
     "reth-revm?/std",
+    "alloy-rpc-types-engine?/std",
 ]
 arbitrary = [
     "std",
@@ -69,6 +72,7 @@ arbitrary = [
     "alloy-rpc-types-eth?/arbitrary",
     "reth-transaction-pool?/arbitrary",
     "reth-eth-wire?/arbitrary",
+    "alloy-rpc-types-engine?/arbitrary",
 ]
 
 test-utils = [
@@ -121,14 +125,17 @@ node = [
 ]
 pool = ["dep:reth-transaction-pool"]
 rpc = [
+    "tasks",
     "dep:reth-rpc",
     "dep:reth-rpc-builder",
     "dep:reth-rpc-api",
     "dep:reth-rpc-eth-types",
     "dep:alloy-rpc-types-eth",
+    "dep:alloy-rpc-types-engine",
 ]
+tasks = ["dep:reth-tasks"]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
-network = ["dep:reth-network", "dep:reth-network-api", "dep:reth-eth-wire"]
-provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
+network = ["dep:reth-network", "tasks", "dep:reth-network-api", "dep:reth-eth-wire"]
+provider = ["storage-api", "tasks", "dep:reth-provider", "dep:reth-db"]
 storage-api = ["dep:reth-storage-api"]
 trie = ["dep:reth-trie"]

crates/ethereum/reth/src/lib.rs

@@ -59,6 +59,12 @@ pub mod evm {
 #[cfg(feature = "exex")]
 pub use reth_exex as exex;
 
+/// Re-exported from `tasks`.
+#[cfg(feature = "tasks")]
+pub mod tasks {
+    pub use reth_tasks::*;
+}
+
 /// Re-exported reth network types
 #[cfg(feature = "network")]
 pub mod network {
@@ -119,10 +125,19 @@ pub mod rpc {
     pub use reth_rpc_builder as builder;
 
     /// Re-exported eth types
+    #[allow(ambiguous_glob_reexports)]
     pub mod eth {
         #[doc(inline)]
         pub use alloy_rpc_types_eth as primitives;
         #[doc(inline)]
         pub use reth_rpc_eth_types::*;
+
+        pub use reth_rpc::eth::*;
+    }
+
+    /// Re-exported types
+    pub mod types {
+        #[doc(inline)]
+        pub use alloy_rpc_types_engine as engine;
     }
 }

crates/optimism/reth/Cargo.toml

@@ -33,6 +33,7 @@ reth-rpc-builder = { workspace = true, optional = true }
 reth-transaction-pool = { workspace = true, optional = true }
 reth-trie = { workspace = true, optional = true }
 reth-node-builder = { workspace = true, optional = true }
+reth-tasks = { workspace = true, optional = true }
 
 # reth-op
 reth-optimism-primitives.workspace = true
@@ -105,15 +106,17 @@ node = [
     "trie",
 ]
 rpc = [
+    "tasks",
     "dep:reth-rpc",
     "dep:reth-rpc-builder",
     "dep:reth-rpc-api",
     "dep:reth-rpc-eth-types",
     "dep:reth-optimism-rpc",
 ]
+tasks = ["dep:reth-tasks"]
 js-tracer = ["rpc", "reth-rpc/js-tracer"]
-network = ["dep:reth-network", "dep:reth-network-api", "dep:reth-eth-wire"]
-provider = ["storage-api", "dep:reth-provider", "dep:reth-db"]
+network = ["dep:reth-network", "tasks", "dep:reth-network-api", "dep:reth-eth-wire"]
+provider = ["storage-api", "tasks", "dep:reth-provider", "dep:reth-db"]
 pool = ["dep:reth-transaction-pool"]
 storage-api = ["dep:reth-storage-api"]
 trie = ["dep:reth-trie"]

crates/optimism/reth/src/lib.rs

@@ -63,6 +63,12 @@ pub mod evm {
     pub use reth_revm as revm;
 }
 
+/// Re-exported from `tasks`.
+#[cfg(feature = "tasks")]
+pub mod tasks {
+    pub use reth_tasks::*;
+}
+
 /// Re-exported reth network types
 #[cfg(feature = "network")]
 pub mod network {

crates/rpc/rpc/src/eth/mod.rs

@@ -11,7 +11,7 @@ pub mod sim_bundle;
 /// Implementation of `eth` namespace API.
 pub use builder::EthApiBuilder;
 pub use bundle::EthBundle;
-pub use core::EthApi;
+pub use core::{EthApi, EthApiFor};
 pub use filter::EthFilter;
 pub use pubsub::EthPubSub;
 

examples/beacon-api-sidecar-fetcher/Cargo.toml

@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-reth.workspace = true
 reth-ethereum = { workspace = true, features = ["node", "pool", "cli"] }
 
 alloy-rpc-types-beacon.workspace = true

examples/beacon-api-sidecar-fetcher/src/main.rs

@@ -22,10 +22,9 @@ use alloy_primitives::B256;
 use clap::Parser;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use mined_sidecar::MinedSidecarStream;
-use reth::builder::NodeHandle;
 use reth_ethereum::{
     cli::{chainspec::EthereumChainSpecParser, interface::Cli},
-    node::EthereumNode,
+    node::{builder::NodeHandle, EthereumNode},
     provider::CanonStateSubscriptions,
 };
 
@@ -38,7 +37,7 @@ fn main() {
             let NodeHandle { node, node_exit_future } =
                 builder.node(EthereumNode::default()).launch().await?;
 
-            let notifications: reth::providers::CanonStateNotificationStream =
+            let notifications: reth_ethereum::provider::CanonStateNotificationStream =
                 node.provider.canonical_state_stream();
 
             let pool = node.pool.clone();

examples/beacon-api-sidecar-fetcher/src/mined_sidecar.rs

@@ -98,7 +98,7 @@ where
     St: Stream<Item = CanonStateNotification> + Send + Unpin + 'static,
     P: TransactionPoolExt + Unpin + 'static,
 {
-    fn process_block(&mut self, block: &RecoveredBlock<reth::primitives::Block>) {
+    fn process_block(&mut self, block: &RecoveredBlock<reth_ethereum::Block>) {
         let txs: Vec<_> = block
             .body()
             .transactions()
@@ -230,8 +230,8 @@ where
 async fn fetch_blobs_for_block(
     client: reqwest::Client,
     url: String,
-    block: RecoveredBlock<reth::primitives::Block>,
-    txs: Vec<(reth::primitives::TransactionSigned, usize)>,
+    block: RecoveredBlock<reth_ethereum::Block>,
+    txs: Vec<(reth_ethereum::TransactionSigned, usize)>,
 ) -> Result<Vec<BlobTransactionEvent>, SideCarError> {
     let response = match client.get(url).header("Accept", "application/json").send().await {
         Ok(response) => response,

examples/custom-beacon-withdrawals/Cargo.toml

@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-reth.workspace = true
 reth-ethereum = { workspace = true, features = ["node", "node-api", "evm", "cli"] }
 
 alloy-evm.workspace = true

examples/custom-beacon-withdrawals/src/main.rs

@@ -12,10 +12,6 @@ use alloy_evm::{
 };
 use alloy_sol_macro::sol;
 use alloy_sol_types::SolCall;
-use reth::{
-    builder::{components::ExecutorBuilder, BuilderContext},
-    primitives::SealedBlock,
-};
 use reth_ethereum::{
     chainspec::ChainSpec,
     cli::interface::Cli,
@@ -34,12 +30,13 @@ use reth_ethereum::{
     },
     node::{
         api::{ConfigureEvm, FullNodeTypes, NodeTypes},
+        builder::{components::ExecutorBuilder, BuilderContext},
         node::EthereumAddOns,
         EthereumNode,
     },
-    primitives::{Header, SealedHeader},
+    primitives::{Header, SealedBlock, SealedHeader},
     provider::BlockExecutionResult,
-    EthPrimitives, Receipt, TransactionSigned,
+    Block, EthPrimitives, Receipt, TransactionSigned,
 };
 use std::{fmt::Display, sync::Arc};
 
@@ -147,7 +144,7 @@ impl ConfigureEvm for CustomEvmConfig {
         self.inner.next_evm_env(parent, attributes)
     }
 
-    fn context_for_block<'a>(&self, block: &'a SealedBlock) -> EthBlockExecutionCtx<'a> {
+    fn context_for_block<'a>(&self, block: &'a SealedBlock<Block>) -> EthBlockExecutionCtx<'a> {
         self.inner.context_for_block(block)
     }
 

examples/custom-dev-node/Cargo.toml

@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-reth.workspace = true
 reth-ethereum = { workspace = true, features = ["node", "test-utils"] }
 futures-util.workspace = true
 

examples/custom-dev-node/src/main.rs

@@ -8,18 +8,16 @@ use std::sync::Arc;
 use alloy_genesis::Genesis;
 use alloy_primitives::{b256, hex};
 use futures_util::StreamExt;
-use reth::{
-    builder::{NodeBuilder, NodeHandle},
-    tasks::TaskManager,
-};
 use reth_ethereum::{
     chainspec::ChainSpec,
     node::{
+        builder::{NodeBuilder, NodeHandle},
         core::{args::RpcServerArgs, node_config::NodeConfig},
         EthereumNode,
     },
     provider::CanonStateSubscriptions,
     rpc::api::eth::helpers::EthTransactions,
+    tasks::TaskManager,
 };
 
 #[tokio::main]