Changes to enable validation api extension (#4783)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>

bin/reth/Cargo.toml

@@ -36,6 +36,7 @@ reth-rpc-engine-api = { path = "../../crates/rpc/rpc-engine-api" }
 reth-rpc-builder = { path = "../../crates/rpc/rpc-builder" }
 reth-rpc = { path = "../../crates/rpc/rpc" }
 reth-rpc-types = { path = "../../crates/rpc/rpc-types" }
+reth-rpc-types-compat = { path = "../../crates/rpc/rpc-types-compat" }
 reth-rpc-api = { path = "../../crates/rpc/rpc-api" }
 reth-network = { path = "../../crates/net/network", features = ["serde"] }
 reth-network-api.workspace = true

bin/reth/src/args/rpc_server_args.rs

@@ -11,8 +11,8 @@ use clap::{
 use futures::TryFutureExt;
 use reth_network_api::{NetworkInfo, Peers};
 use reth_provider::{
-    BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader, EvmEnvProvider,
-    HeaderProvider, StateProviderFactory,
+    AccountReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader,
+    EvmEnvProvider, HeaderProvider, StateProviderFactory,
 };
 use reth_rpc::{
     eth::{
@@ -188,6 +188,7 @@ impl RpcServerArgs {
     ) -> eyre::Result<(RpcServerHandle, AuthServerHandle)>
     where
         Provider: BlockReaderIdExt
+            + AccountReader
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider
@@ -254,6 +255,7 @@ impl RpcServerArgs {
     ) -> Result<RpcServerHandle, RpcError>
     where
         Provider: BlockReaderIdExt
+            + AccountReader
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider

bin/reth/src/cli/ext.rs

@@ -7,8 +7,8 @@ use reth_network_api::{NetworkInfo, Peers};
 use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService};
 use reth_primitives::ChainSpec;
 use reth_provider::{
-    BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader, EvmEnvProvider,
-    StateProviderFactory,
+    AccountReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader,
+    EvmEnvProvider, StateProviderFactory,
 };
 use reth_rpc_builder::{RethModuleRegistry, TransportRpcModules};
 use reth_tasks::TaskSpawner;
@@ -49,6 +49,7 @@ pub trait RethNodeCommandConfig: fmt::Debug {
     where
         Conf: RethRpcConfig,
         Provider: BlockReaderIdExt
+            + AccountReader
             + StateProviderFactory
             + EvmEnvProvider
             + ChainSpecProvider
@@ -173,6 +174,7 @@ impl<T: RethNodeCommandConfig> RethNodeCommandConfig for NoArgs<T> {
     where
         Conf: RethRpcConfig,
         Provider: BlockReaderIdExt
+            + AccountReader
             + StateProviderFactory
             + EvmEnvProvider
             + ChainSpecProvider

bin/reth/src/lib.rs

@@ -62,6 +62,11 @@ pub mod blockchain_tree {
     pub use reth_blockchain_tree::*;
 }
 
+/// Re-exported from `reth_consensus_common`.
+pub mod consensus_common {
+    pub use reth_consensus_common::*;
+}
+
 /// Re-exported from `reth_revm`.
 pub mod revm {
     pub use reth_revm::*;
@@ -104,6 +109,16 @@ pub mod rpc {
     pub mod eth {
         pub use reth_rpc::eth::*;
     }
+
+    /// Re-exported from `reth_rpc::rpc`.
+    pub mod result {
+        pub use reth_rpc::result::*;
+    }
+
+    /// Re-exported from `reth_rpc::eth`.
+    pub mod compat {
+        pub use reth_rpc_types_compat::*;
+    }
 }
 
 #[cfg(all(feature = "jemalloc", unix))]