chore(rpc): move impl of eth api server out of reth-rpc-eth-api

Cargo.toml

@@ -81,8 +81,10 @@ members = [
     "crates/rpc/rpc-builder/",
     "crates/rpc/rpc-engine-api/",
     "crates/rpc/rpc-eth-api/",
+    "crates/rpc/rpc-eth-types/",
     "crates/rpc/rpc-layer",
     "crates/rpc/rpc-testing-util/",
+    "crates/rpc/rpc-server-types/",
     "crates/rpc/rpc-types-compat/",
     "crates/rpc/rpc-types/",
     "crates/rpc/rpc/",
@@ -342,6 +344,7 @@ reth-rpc-builder = { path = "crates/rpc/rpc-builder" }
 reth-rpc-engine-api = { path = "crates/rpc/rpc-engine-api" }
 reth-rpc-eth-api = { path = "crates/rpc/rpc-eth-api" }
 reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
+reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types" }
 reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
 reth-rpc-types = { path = "crates/rpc/rpc-types" }
 reth-rpc-types-compat = { path = "crates/rpc/rpc-types-compat" }

bin/reth/Cargo.toml

@@ -37,6 +37,8 @@ reth-rpc.workspace = true
 reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-rpc-api = { workspace = true, features = ["client"] }
+reth-rpc-eth-types.workspace = true
+reth-rpc-server-types.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
 reth-net-banlist.workspace = true
@@ -153,6 +155,7 @@ optimism = [
     "reth-blockchain-tree/optimism",
     "dep:reth-node-optimism",
     "reth-node-core/optimism",
+    "reth-rpc-eth-types/optimism",
 ]
 
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices

bin/reth/src/lib.rs

@@ -148,6 +148,15 @@ pub mod rpc {
         pub use reth_rpc_types::*;
     }
 
+    /// Re-exported from `reth_rpc_server_types`.
+    pub mod server_types {
+        pub use reth_rpc_server_types::*;
+        /// Re-exported from `reth_rpc_eth_types`.
+        pub mod eth {
+            pub use reth_rpc_eth_types::*;
+        }
+    }
+
     /// Re-exported from `reth_rpc_api`.
     pub mod api {
         pub use reth_rpc_api::*;
@@ -159,10 +168,10 @@ pub mod rpc {
 
     /// Re-exported from `reth_rpc::rpc`.
     pub mod result {
-        pub use reth_rpc::result::*;
+        pub use reth_rpc_server_types::result::*;
     }
 
-    /// Re-exported from `reth_rpc::eth`.
+    /// Re-exported from `reth_rpc_types_compat`.
     pub mod compat {
         pub use reth_rpc_types_compat::*;
     }

crates/e2e-test-utils/src/rpc.rs

@@ -1,8 +1,13 @@
 use alloy_consensus::TxEnvelope;
 use alloy_network::eip2718::Decodable2718;
-use reth::{api::FullNodeComponents, builder::rpc::RpcRegistry, rpc::api::DebugApiServer};
+use reth::{
+    builder::{rpc::RpcRegistry, FullNodeComponents},
+    rpc::{
+        api::{eth::helpers::EthTransactions, DebugApiServer},
+        server_types::eth::EthResult,
+    },
+};
 use reth_primitives::{Bytes, B256};
-use reth_rpc::eth::{servers::EthTransactions, EthResult};
 
 pub struct RpcTestContext<Node: FullNodeComponents> {
     pub inner: RpcRegistry<Node>,

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

@@ -1,12 +1,14 @@
-use crate::utils::EthNode;
+use std::sync::Arc;
+
 use alloy_genesis::Genesis;
 use alloy_primitives::{b256, hex};
 use futures::StreamExt;
-use reth::rpc::eth::servers::EthTransactions;
+use reth::rpc::api::eth::helpers::EthTransactions;
 use reth_chainspec::ChainSpec;
 use reth_e2e_test_utils::setup;
 use reth_provider::CanonStateSubscriptions;
-use std::sync::Arc;
+
+use crate::utils::EthNode;
 
 #[tokio::test]
 async fn can_run_dev_node() -> eyre::Result<()> {

crates/node-core/Cargo.toml

@@ -21,6 +21,7 @@ reth-storage-errors.workspace = true
 reth-provider.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
+reth-rpc-eth-types.workspace = true
 reth-rpc-server-types.workspace = true
 reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
@@ -103,6 +104,7 @@ optimism = [
     "reth-rpc-types-compat/optimism",
     "reth-beacon-consensus/optimism",
     "reth-rpc-eth-api/optimism",
+    "reth-rpc-eth-types/optimism"
 ]
 
 jemalloc = ["dep:tikv-jemalloc-ctl"]

crates/node-core/src/args/gas_price_oracle.rs

@@ -1,6 +1,6 @@
 use crate::primitives::U256;
 use clap::Args;
-use reth_rpc_eth_api::GasPriceOracleConfig;
+use reth_rpc_eth_types::GasPriceOracleConfig;
 use reth_rpc_server_types::constants::gas_oracle::{
     DEFAULT_GAS_PRICE_BLOCKS, DEFAULT_GAS_PRICE_PERCENTILE, DEFAULT_IGNORE_GAS_PRICE,
     DEFAULT_MAX_GAS_PRICE,

crates/node-core/src/args/rpc_server.rs

@@ -1,22 +1,22 @@
 //! clap [Args](clap::Args) for RPC related arguments.
 
-use crate::args::{
-    types::{MaxU32, ZeroAsNoneU64},
-    GasPriceOracleArgs, RpcStateCacheArgs,
+use std::{
+    ffi::OsStr,
+    net::{IpAddr, Ipv4Addr},
+    path::PathBuf,
 };
+
 use alloy_rpc_types_engine::JwtSecret;
 use clap::{
     builder::{PossibleValue, RangedU64ValueParser, TypedValueParser},
     Arg, Args, Command,
 };
 use rand::Rng;
-use reth_rpc_eth_api::RPC_DEFAULT_GAS_CAP;
-
 use reth_rpc_server_types::{constants, RethRpcModule, RpcModuleSelection};
-use std::{
-    ffi::OsStr,
-    net::{IpAddr, Ipv4Addr},
-    path::PathBuf,
+
+use crate::args::{
+    types::{MaxU32, ZeroAsNoneU64},
+    GasPriceOracleArgs, RpcStateCacheArgs,
 };
 
 /// Default max number of subscriptions per connection.
@@ -152,7 +152,7 @@ pub struct RpcServerArgs {
         alias = "rpc-gascap",
         value_name = "GAS_CAP",
         value_parser = RangedU64ValueParser::<u64>::new().range(1..),
-        default_value_t = RPC_DEFAULT_GAS_CAP.into()
+        default_value_t = constants::gas_oracle::RPC_DEFAULT_GAS_CAP
     )]
     pub rpc_gas_cap: u64,
 
@@ -285,7 +285,7 @@ impl Default for RpcServerArgs {
             rpc_max_tracing_requests: constants::default_max_tracing_requests(),
             rpc_max_blocks_per_filter: constants::DEFAULT_MAX_BLOCKS_PER_FILTER.into(),
             rpc_max_logs_per_response: (constants::DEFAULT_MAX_LOGS_PER_RESPONSE as u64).into(),
-            rpc_gas_cap: RPC_DEFAULT_GAS_CAP.into(),
+            rpc_gas_cap: constants::gas_oracle::RPC_DEFAULT_GAS_CAP,
             gas_price_oracle: GasPriceOracleArgs::default(),
             rpc_state_cache: RpcStateCacheArgs::default(),
         }

crates/node-core/src/lib.rs

@@ -43,7 +43,7 @@ pub mod rpc {
 
     /// Re-exported from `reth_rpc::rpc`.
     pub mod result {
-        pub use reth_rpc_eth_api::result::*;
+        pub use reth_rpc_server_types::result::*;
     }
 
     /// Re-exported from `reth_rpc::eth`.

crates/optimism/node/Cargo.toml

@@ -35,6 +35,8 @@ reth-beacon-consensus.workspace = true
 reth-optimism-consensus.workspace = true
 revm-primitives.workspace = true
 reth-discv5.workspace = true
+reth-rpc-eth-types.workspace = true
+reth-rpc-eth-api.workspace = true
 
 # async
 async-trait.workspace = true
@@ -44,11 +46,14 @@ tracing.workspace = true
 # misc
 clap.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 eyre.workspace = true
 parking_lot.workspace = true
 thiserror.workspace = true
+
+# rpc
 jsonrpsee.workspace = true
+jsonrpsee-types.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
 reth.workspace = true
@@ -71,4 +76,5 @@ optimism = [
     "reth-beacon-consensus/optimism",
     "reth-revm/optimism",
     "reth-auto-seal-consensus/optimism",
+    "reth-rpc-eth-types/optimism"
 ]