chore(rpc): move EthApi trait into own crate

Cargo.toml

@@ -75,6 +75,7 @@ members = [
     "crates/rpc/rpc-api/",
     "crates/rpc/rpc-builder/",
     "crates/rpc/rpc-engine-api/",
+    "crates/rpc/rpc-eth-api/",
     "crates/rpc/rpc-layer",
     "crates/rpc/rpc-testing-util/",
     "crates/rpc/rpc-types-compat/",
@@ -317,6 +318,7 @@ reth-rpc-api = { path = "crates/rpc/rpc-api" }
 reth-rpc-api-testing-util = { path = "crates/rpc/rpc-testing-util" }
 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-server-types = { path = "crates/rpc/rpc-server-types" }
 reth-rpc-types = { path = "crates/rpc/rpc-types" }

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

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

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

@@ -1,6 +1,6 @@
 use crate::utils::EthNode;
 use futures::StreamExt;
-use reth::rpc::eth::api::EthTransactions;
+use reth::rpc::eth::servers::EthTransactions;
 use reth_e2e_test_utils::setup;
 use reth_primitives::{b256, hex, ChainSpec, Genesis};
 use reth_provider::CanonStateSubscriptions;

crates/node-core/Cargo.toml

@@ -20,11 +20,11 @@ reth-storage-errors.workspace = true
 reth-provider.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
-reth-rpc.workspace = true
 reth-rpc-server-types.workspace = true
 reth-rpc-types.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-rpc-api = { workspace = true, features = ["client"] }
+reth-rpc-eth-api = { workspace = true, features = ["client"] }
 reth-transaction-pool.workspace = true
 reth-tracing.workspace = true
 reth-config.workspace = true
@@ -101,10 +101,10 @@ reth-network-peers.workspace = true
 [features]
 optimism = [
     "reth-primitives/optimism",
-    "reth-rpc/optimism",
     "reth-provider/optimism",
     "reth-rpc-types-compat/optimism",
     "reth-beacon-consensus/optimism",
+    "reth-rpc-eth-api/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::gas_oracle::GasPriceOracleConfig;
+use reth_rpc_eth_api::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

@@ -10,7 +10,7 @@ use clap::{
     Arg, Args, Command,
 };
 use rand::Rng;
-use reth_rpc::eth::RPC_DEFAULT_GAS_CAP;
+use reth_rpc_eth_api::RPC_DEFAULT_GAS_CAP;
 
 use reth_rpc_server_types::{constants, RethRpcModule, RpcModuleSelection};
 use std::{

crates/node-core/src/lib.rs

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

crates/node/builder/src/rpc.rs

@@ -189,8 +189,9 @@ impl<Node: FullNodeComponents> Clone for RpcRegistry<Node> {
 /// [`AuthRpcModule`].
 ///
 /// This can be used to access installed modules, or create commonly used handlers like
-/// [`reth_rpc::EthApi`], and ultimately merge additional rpc handler into the configured transport
-/// modules [`TransportRpcModules`] as well as configured authenticated methods [`AuthRpcModule`].
+/// [`reth_rpc::eth::EthApi`], and ultimately merge additional rpc handler into the configured
+/// transport modules [`TransportRpcModules`] as well as configured authenticated methods
+/// [`AuthRpcModule`].
 #[allow(missing_debug_implementations)]
 pub struct RpcContext<'a, Node: FullNodeComponents> {
     /// The node components.

crates/optimism/node/src/rpc.rs

@@ -3,8 +3,8 @@
 use jsonrpsee::types::ErrorObject;
 use reqwest::Client;
 use reth_rpc::eth::{
-    api::RawTransactionForwarder,
     error::{EthApiError, EthResult},
+    servers::RawTransactionForwarder,
 };
 use reth_rpc_types::ToRpcError;
 use std::sync::{atomic::AtomicUsize, Arc};

crates/optimism/rpc/Cargo.toml

@@ -18,7 +18,7 @@ reth-evm-optimism = { workspace = true, features = ["optimism"] }
 revm = { workspace = true, features = ["optimism"] }
 reth-network-api.workspace = true
 reth-rpc = { workspace = true, features = ["optimism"] }
-reth-rpc-api.workspace = true
+reth-rpc-eth-api = { workspace = true, features = ["optimism"] }
 reth-rpc-types.workspace = true
 reth-primitives = { workspace = true, features = ["optimism"] }
 reth-provider = { workspace = true, features = ["optimism"] }

crates/optimism/rpc/src/block.rs

@@ -3,8 +3,9 @@
 use reth_primitives::TransactionMeta;
 use reth_provider::{BlockReaderIdExt, ChainSpecProvider, HeaderProvider};
 use reth_rpc::eth::{
-    api::{EthBlocks, LoadBlock, LoadReceipt, ReceiptBuilder},
     error::EthResult,
+    servers::{EthBlocks, LoadBlock, LoadReceipt},
+    ReceiptBuilder,
 };
 use reth_rpc_types::{AnyTransactionReceipt, BlockId};
 

crates/optimism/rpc/src/lib.rs

@@ -11,9 +11,9 @@
 
 use std::sync::Arc;
 
-use reth_rpc::{
-    call_impl, eth::api::EthApiInner, eth_call_impl, eth_fees_impl, eth_state_impl,
-    eth_transactions_impl, load_block_impl, load_fee_impl, load_state_impl, load_transaction_impl,
+use reth_rpc_eth_api::{
+    call_impl, eth_call_impl, eth_fees_impl, eth_state_impl, eth_transactions_impl,
+    load_block_impl, load_fee_impl, load_state_impl, load_transaction_impl, servers::EthApiInner,
     spawn_blocking_impl, trace_impl,
 };
 
@@ -26,7 +26,7 @@ pub mod transaction;
 /// `Eth` API implementation for OP networks.
 ///
 /// This type provides OP specific extension of default functionality for handling `eth_` related
-/// requests. See [`EthApi`](reth_rpc::EthApi) for the default L1 implementation.
+/// requests. See [`EthApi`](reth_rpc_eth_api::EthApi) for the default L1 implementation.
 #[allow(missing_debug_implementations)]
 #[allow(dead_code)]
 #[derive(Clone)]

crates/optimism/rpc/src/pending_block.rs

@@ -9,7 +9,7 @@ use reth_provider::{
     BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, ExecutionOutcome, StateProviderFactory,
 };
 use reth_rpc::eth::{
-    api::{LoadPendingBlock, SpawnBlocking},
+    servers::{LoadPendingBlock, SpawnBlocking},
     PendingBlock,
 };
 use reth_transaction_pool::TransactionPool;

crates/optimism/rpc/src/receipt.rs

@@ -4,9 +4,10 @@ use crate::{transaction::OptimismTxMeta, OptimismApi};
 use reth_primitives::{Receipt, TransactionMeta, TransactionSigned};
 use reth_provider::{BlockIdReader, ChainSpecProvider};
 use reth_rpc::eth::{
-    api::{LoadReceipt, ReceiptBuilder},
     cache::EthStateCache,
     error::{EthApiError, EthResult},
+    servers::LoadReceipt,
+    ReceiptBuilder,
 };
 use reth_rpc_types::{AnyTransactionReceipt, OptimismTransactionReceiptFields};
 

crates/rpc/rpc-api/Cargo.toml

@@ -15,16 +15,21 @@ workspace = true
 # reth
 reth-primitives.workspace = true
 reth-rpc-types.workspace = true
+reth-rpc-eth-api.workspace = true
 reth-engine-primitives.workspace = true
 reth-network-peers.workspace = true
 
 # misc
-alloy-dyn-abi = { workspace = true, features = ["eip712"] }
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 serde_json.workspace = true
 
 [features]
-client = ["jsonrpsee/client", "jsonrpsee/async-client"]
+client = [
+    "jsonrpsee/client",
+    "jsonrpsee/async-client",
+    "reth-rpc-eth-api/client"
+]
+optimism = ["reth-rpc-eth-api/optimism"]