diff --git a/Cargo.lock b/Cargo.lock
index b1bcf4a81549..3b6c1dc1813c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,12 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
 [[package]]
 name = "aead"
 version = "0.4.3"
@@ -1113,7 +1107,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -1558,9 +1552,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.9"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+checksum = "3054fea8a20d8ff3968d5b22cc27501d2b08dc4decdb31b184323f00c5ef23bb"
 dependencies = [
  "serde",
 ]
@@ -3131,12 +3125,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.32"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3403,9 +3397,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -4082,7 +4076,7 @@ dependencies = [
  "socket2 0.5.7",
  "widestring",
  "windows-sys 0.48.0",
- "winreg",
+ "winreg 0.50.0",
 ]
 
 [[package]]
@@ -4455,9 +4449,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.156"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
 
 [[package]]
 name = "libloading"
@@ -4885,15 +4879,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
-dependencies = [
- "adler2",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -5256,6 +5241,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "op-alloy-network"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3cbfa664a74fe4577a78d1c4bce18fa93be56756730782283df8ff3241c7118"
+dependencies = [
+ "alloy-consensus",
+ "alloy-network",
+ "alloy-primitives",
+ "alloy-rpc-types-eth",
+ "op-alloy-consensus",
+ "op-alloy-rpc-types",
+]
+
 [[package]]
 name = "op-alloy-rpc-types"
 version = "0.1.5"
@@ -6116,9 +6115,9 @@ dependencies = [
 
 [[package]]
 name = "redox_users"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
@@ -6181,9 +6180,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -6221,7 +6220,7 @@ dependencies = [
  "wasm-streams",
  "web-sys",
  "webpki-roots",
- "windows-registry",
+ "winreg 0.52.0",
 ]
 
 [[package]]
@@ -6962,6 +6961,7 @@ dependencies = [
  "eyre",
  "futures-util",
  "jsonrpsee",
+ "jsonrpsee-types",
  "reth",
  "reth-chainspec",
  "reth-db",
@@ -6973,6 +6973,8 @@ dependencies = [
  "reth-provider",
  "reth-rpc",
  "reth-rpc-layer",
+ "reth-rpc-types",
+ "reth-rpc-types-compat",
  "reth-stages-types",
  "reth-tokio-util",
  "reth-tracing",
@@ -7697,6 +7699,7 @@ dependencies = [
  "reth-payload-builder",
  "reth-payload-primitives",
  "reth-provider",
+ "reth-rpc-eth-api",
  "reth-tasks",
  "reth-transaction-pool",
 ]
@@ -7705,6 +7708,7 @@ dependencies = [
 name = "reth-node-builder"
 version = "1.0.5"
 dependencies = [
+ "alloy-network",
  "aquamarine",
  "eyre",
  "fdlimit",
@@ -7927,6 +7931,7 @@ dependencies = [
  "reth-primitives",
  "reth-provider",
  "reth-revm",
+ "reth-rpc",
  "reth-rpc-eth-api",
  "reth-rpc-eth-types",
  "reth-rpc-types",
@@ -8030,11 +8035,13 @@ dependencies = [
  "derive_more 1.0.0",
  "jsonrpsee",
  "jsonrpsee-types",
+ "op-alloy-network",
  "parking_lot 0.12.3",
  "reth-evm",
  "reth-evm-optimism",
  "reth-network-api",
  "reth-node-api",
+ "reth-node-builder",
  "reth-primitives",
  "reth-provider",
  "reth-rpc",
@@ -8278,6 +8285,7 @@ version = "1.0.5"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-genesis",
+ "alloy-network",
  "alloy-primitives",
  "alloy-rlp",
  "async-trait",
@@ -8348,6 +8356,7 @@ version = "1.0.5"
 dependencies = [
  "futures",
  "jsonrpsee",
+ "jsonrpsee-http-client",
  "reth-primitives",
  "reth-rpc-api",
  "reth-rpc-eth-api",
@@ -8441,6 +8450,8 @@ name = "reth-rpc-eth-api"
 version = "1.0.5"
 dependencies = [
  "alloy-dyn-abi",
+ "alloy-json-rpc",
+ "alloy-network",
  "async-trait",
  "auto_impl",
  "dyn-clone",
@@ -9214,9 +9225,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
+checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -10002,9 +10013,6 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-dependencies = [
- "futures-core",
-]
 
 [[package]]
 name = "synstructure"
@@ -10784,9 +10792,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "universal-hash"
@@ -11128,7 +11136,7 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-result 0.1.2",
+ "windows-result",
  "windows-targets 0.52.6",
 ]
 
@@ -11154,17 +11162,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result 0.2.0",
- "windows-strings",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -11174,25 +11171,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -11369,6 +11347,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0278ae35ccc7..9b525ff4e4aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -428,6 +428,7 @@ alloy-transport-ws = { version = "0.2.1", default-features = false }
 
 # op
 op-alloy-rpc-types = "0.1"
+op-alloy-network = "0.1"
 
 # misc
 aquamarine = "0.5"
diff --git a/crates/e2e-test-utils/Cargo.toml b/crates/e2e-test-utils/Cargo.toml
index 7bdbfd885e55..1111d44d7067 100644
--- a/crates/e2e-test-utils/Cargo.toml
+++ b/crates/e2e-test-utils/Cargo.toml
@@ -25,7 +25,11 @@ reth-tokio-util.workspace = true
 reth-stages-types.workspace = true
 reth-network-peers.workspace = true
 reth-node-ethereum.workspace = true
+reth-rpc-types.workspace = true
+reth-rpc-types-compat.workspace = true
 
+# rpc
+jsonrpsee-types.workspace = true
 jsonrpsee.workspace = true
 
 futures-util.workspace = true
diff --git a/crates/e2e-test-utils/src/lib.rs b/crates/e2e-test-utils/src/lib.rs
index 132bc36c1579..c351aa06e476 100644
--- a/crates/e2e-test-utils/src/lib.rs
+++ b/crates/e2e-test-utils/src/lib.rs
@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 
+use alloy_network::Network;
 use node::NodeTestContext;
 use reth::{
     args::{DiscoveryArgs, NetworkArgs, RpcServerArgs},
@@ -51,9 +52,18 @@ pub async fn setup<N>(
 ) -> eyre::Result<(Vec<NodeHelperType<N, N::AddOns>>, TaskManager, Wallet)>
 where
     N: Default + Node<TmpNodeAdapter<N>>,
-    <<N::ComponentsBuilder as NodeComponentsBuilder<TmpNodeAdapter<N>>>::Components as NodeComponents<TmpNodeAdapter<N>>>::Network: PeersHandleProvider,
-    <N::AddOns as NodeAddOns<Adapter<N>>>::EthApi:
-        FullEthApiServer + AddDevSigners + EthApiBuilderProvider<Adapter<N>>,
+
+    N::ComponentsBuilder: NodeComponentsBuilder<
+        TmpNodeAdapter<N>,
+        Components: NodeComponents<TmpNodeAdapter<N>, Network: PeersHandleProvider>,
+    >,
+    N::AddOns: NodeAddOns<
+        Adapter<N>,
+        EthApi: FullEthApiServer<
+            NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
+        > + AddDevSigners
+                    + EthApiBuilderProvider<Adapter<N>>,
+    >,
 {
     let tasks = TaskManager::current();
     let exec = tasks.executor();
diff --git a/crates/e2e-test-utils/src/node.rs b/crates/e2e-test-utils/src/node.rs
index 19f387c7b8b6..681a3bbd176a 100644
--- a/crates/e2e-test-utils/src/node.rs
+++ b/crates/e2e-test-utils/src/node.rs
@@ -1,5 +1,6 @@
 use std::{marker::PhantomData, pin::Pin};
 
+use alloy_network::Network;
 use alloy_rpc_types::BlockNumberOrTag;
 use eyre::Ok;
 use futures_util::Future;
@@ -14,7 +15,7 @@ use reth::{
         types::engine::PayloadStatusEnum,
     },
 };
-use reth_node_builder::{NodeAddOns, NodeTypes};
+use reth_node_builder::{EthApiTypes, NodeAddOns, NodeTypes};
 use reth_primitives::{BlockHash, BlockNumber, Bytes, B256};
 use reth_stages_types::StageId;
 use tokio_stream::StreamExt;
@@ -92,6 +93,8 @@ where
         <Node::Engine as EngineTypes>::ExecutionPayloadV3:
             From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
         AddOns::EthApi: EthApiSpec + EthTransactions + TraceExt,
+        <AddOns::EthApi as EthApiTypes>::NetworkTypes:
+            Network<TransactionResponse = alloy_rpc_types::Transaction>,
     {
         let mut chain = Vec::with_capacity(length as usize);
         for i in 0..length {
diff --git a/crates/e2e-test-utils/src/rpc.rs b/crates/e2e-test-utils/src/rpc.rs
index b301889507a9..085e46c00640 100644
--- a/crates/e2e-test-utils/src/rpc.rs
+++ b/crates/e2e-test-utils/src/rpc.rs
@@ -1,5 +1,5 @@
 use alloy_consensus::TxEnvelope;
-use alloy_network::eip2718::Decodable2718;
+use alloy_network::{eip2718::Decodable2718, Network};
 use reth::{
     builder::{rpc::RpcRegistry, FullNodeComponents},
     rpc::api::{
@@ -7,16 +7,19 @@ use reth::{
         DebugApiServer,
     },
 };
+use reth_node_builder::EthApiTypes;
 use reth_primitives::{Bytes, B256};
 
 #[allow(missing_debug_implementations)]
-pub struct RpcTestContext<Node: FullNodeComponents, EthApi> {
+pub struct RpcTestContext<Node: FullNodeComponents, EthApi: EthApiTypes> {
     pub inner: RpcRegistry<Node, EthApi>,
 }
 
-impl<Node: FullNodeComponents, EthApi> RpcTestContext<Node, EthApi>
+impl<Node, EthApi> RpcTestContext<Node, EthApi>
 where
+    Node: FullNodeComponents,
     EthApi: EthApiSpec + EthTransactions + TraceExt,
+    EthApi::NetworkTypes: Network<TransactionResponse = alloy_rpc_types::Transaction>,
 {
     /// Injects a raw transaction into the node tx pool via RPC server
     pub async fn inject_tx(&self, raw_tx: Bytes) -> Result<B256, EthApi::Error> {
diff --git a/crates/e2e-test-utils/src/transaction.rs b/crates/e2e-test-utils/src/transaction.rs
index e2c6a019b3ac..041ba40d6eb2 100644
--- a/crates/e2e-test-utils/src/transaction.rs
+++ b/crates/e2e-test-utils/src/transaction.rs
@@ -2,13 +2,11 @@ use alloy_consensus::{
     BlobTransactionSidecar, EnvKzgSettings, SidecarBuilder, SimpleCoder, TxEip4844Variant,
     TxEnvelope,
 };
-use alloy_network::{eip2718::Encodable2718, EthereumWallet, TransactionBuilder};
+use alloy_network::{eip2718::Encodable2718, Ethereum, EthereumWallet, TransactionBuilder};
 use alloy_rpc_types::{TransactionInput, TransactionRequest};
 use alloy_signer_local::PrivateKeySigner;
 use eyre::Ok;
-use reth_primitives::{hex, Address, Bytes, U256};
-
-use reth_primitives::B256;
+use reth_primitives::{hex, Address, Bytes, TxKind, B256, U256};
 
 /// Helper for transaction operations
 #[derive(Debug)]
@@ -38,8 +36,11 @@ impl TransactionTestContext {
         builder.ingest(b"dummy blob");
         let sidecar: BlobTransactionSidecar = builder.build()?;
 
-        tx.set_blob_sidecar(sidecar);
-        tx.set_max_fee_per_blob_gas(15e9 as u128);
+        <TransactionRequest as TransactionBuilder<Ethereum>>::set_blob_sidecar(&mut tx, sidecar);
+        <TransactionRequest as TransactionBuilder<Ethereum>>::set_max_fee_per_blob_gas(
+            &mut tx,
+            15e9 as u128,
+        );
 
         let signed = Self::sign_tx(wallet, tx).await;
         Ok(signed)
@@ -48,7 +49,7 @@ impl TransactionTestContext {
     /// Signs an arbitrary [`TransactionRequest`] using the provided wallet
     pub async fn sign_tx(wallet: PrivateKeySigner, tx: TransactionRequest) -> TxEnvelope {
         let signer = EthereumWallet::from(wallet);
-        tx.build(&signer).await.unwrap()
+        <TransactionRequest as TransactionBuilder<Ethereum>>::build(tx, &signer).await.unwrap()
     }
 
     /// Creates a tx with blob sidecar and sign it, returning bytes
@@ -70,7 +71,11 @@ impl TransactionTestContext {
         let l1_block_info = Bytes::from_static(&hex!("7ef9015aa044bae9d41b8380d781187b426c6fe43df5fb2fb57bd4466ef6a701e1f01e015694deaddeaddeaddeaddeaddeaddeaddeaddead000194420000000000000000000000000000000000001580808408f0d18001b90104015d8eb900000000000000000000000000000000000000000000000000000000008057650000000000000000000000000000000000000000000000000000000063d96d10000000000000000000000000000000000000000000000000000000000009f35273d89754a1e0387b89520d989d3be9c37c1f32495a88faf1ea05c61121ab0d1900000000000000000000000000000000000000000000000000000000000000010000000000000000000000002d679b567db6187c0c8323fa982cfb88b74dbcc7000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240"));
         let tx = tx(chain_id, Some(l1_block_info), nonce);
         let signer = EthereumWallet::from(wallet);
-        tx.build(&signer).await.unwrap().encoded_2718().into()
+        <TransactionRequest as TransactionBuilder<Ethereum>>::build(tx, &signer)
+            .await
+            .unwrap()
+            .encoded_2718()
+            .into()
     }
 
     /// Validates the sidecar of a given tx envelope and returns the versioned hashes
@@ -95,7 +100,7 @@ fn tx(chain_id: u64, data: Option<Bytes>, nonce: u64) -> TransactionRequest {
     TransactionRequest {
         nonce: Some(nonce),
         value: Some(U256::from(100)),
-        to: Some(reth_primitives::TxKind::Call(Address::random())),
+        to: Some(TxKind::Call(Address::random())),
         gas: Some(210000),
         max_fee_per_gas: Some(20e9 as u128),
         max_priority_fee_per_gas: Some(20e9 as u128),
diff --git a/crates/node/api/Cargo.toml b/crates/node/api/Cargo.toml
index 46ff6139600f..2b3ce2fa09e3 100644
--- a/crates/node/api/Cargo.toml
+++ b/crates/node/api/Cargo.toml
@@ -20,4 +20,5 @@ reth-transaction-pool.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
 reth-tasks.workspace = true
+reth-rpc-eth-api.workspace = true
 reth-network-api.workspace = true
diff --git a/crates/node/api/src/lib.rs b/crates/node/api/src/lib.rs
index b01a2def0bde..8748fc79d94e 100644
--- a/crates/node/api/src/lib.rs
+++ b/crates/node/api/src/lib.rs
@@ -26,3 +26,5 @@ pub use node::*;
 
 // re-export for convenience
 pub use reth_provider::FullProvider;
+
+pub use reth_rpc_eth_api::EthApiTypes;
diff --git a/crates/node/api/src/node.rs b/crates/node/api/src/node.rs
index 8cd72e91ece0..da6003b120ae 100644
--- a/crates/node/api/src/node.rs
+++ b/crates/node/api/src/node.rs
@@ -10,6 +10,7 @@ use reth_evm::execute::BlockExecutorProvider;
 use reth_network_api::FullNetwork;
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_provider::FullProvider;
+use reth_rpc_eth_api::EthApiTypes;
 use reth_tasks::TaskExecutor;
 use reth_transaction_pool::TransactionPool;
 
@@ -155,7 +156,7 @@ pub trait FullNodeComponents: FullNodeTypes + Clone + 'static {
 pub trait NodeAddOns<N: FullNodeComponents>: Send + Sync + Unpin + Clone + 'static {
     /// The core `eth` namespace API type to install on the RPC server (see
     /// `reth_rpc_eth_api::EthApiServer`).
-    type EthApi: Send + Clone;
+    type EthApi: EthApiTypes + Send + Clone;
 }
 
 impl<N: FullNodeComponents> NodeAddOns<N> for () {
diff --git a/crates/node/builder/Cargo.toml b/crates/node/builder/Cargo.toml
index 106337d17b1a..e5290233b8eb 100644
--- a/crates/node/builder/Cargo.toml
+++ b/crates/node/builder/Cargo.toml
@@ -55,6 +55,9 @@ reth-engine-service.workspace = true
 reth-tokio-util.workspace = true
 reth-engine-tree.workspace = true
 
+## ethereum
+alloy-network.workspace = true
+
 ## async
 futures.workspace = true
 tokio = { workspace = true, features = [
diff --git a/crates/node/builder/src/builder/add_ons.rs b/crates/node/builder/src/builder/add_ons.rs
index 54a776fd69aa..e8eb3b49dc7b 100644
--- a/crates/node/builder/src/builder/add_ons.rs
+++ b/crates/node/builder/src/builder/add_ons.rs
@@ -2,7 +2,7 @@
 
 use std::marker::PhantomData;
 
-use reth_node_api::{FullNodeComponents, NodeAddOns};
+use reth_node_api::{EthApiTypes, FullNodeComponents, NodeAddOns};
 
 use crate::{exex::BoxedLaunchExEx, hooks::NodeHooks, rpc::RpcHooks};
 
@@ -21,7 +21,7 @@ pub struct AddOns<Node: FullNodeComponents, AddOns: NodeAddOns<Node>> {
 /// Captures node specific addons that can be installed on top of the type configured node and are
 /// required for launching the node, such as RPC.
 #[derive(Default)]
-pub struct RpcAddOns<Node: FullNodeComponents, EthApi> {
+pub struct RpcAddOns<Node: FullNodeComponents, EthApi: EthApiTypes> {
     /// Core `eth` API type to install on the RPC server, configured w.r.t. network.
     pub _eth_api: PhantomData<EthApi>,
     /// Additional RPC hooks.
diff --git a/crates/node/builder/src/builder/mod.rs b/crates/node/builder/src/builder/mod.rs
index f63f0c3a6705..09867f9bf84c 100644
--- a/crates/node/builder/src/builder/mod.rs
+++ b/crates/node/builder/src/builder/mod.rs
@@ -328,7 +328,11 @@ where
                             <N::ComponentsBuilder as NodeComponentsBuilder<RethFullAdapter<DB, N>>>::Components,
                         >
                     >
-                        + FullEthApiServer
+                        + FullEthApiServer<
+                            NetworkTypes: alloy_network::Network<
+                                TransactionResponse = reth_rpc_types::Transaction
+                            >,
+                        >
                         + AddDevSigners
         >,
     {
@@ -474,8 +478,9 @@ where
     AO: NodeAddOns<
         NodeAdapter<RethFullAdapter<DB, T>, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<RethFullAdapter<DB, T>, CB::Components>>
-                    + FullEthApiServer
-                    + AddDevSigners,
+                    + FullEthApiServer<
+            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+        > + AddDevSigners,
     >,
 {
     /// Launches the node with the [`DefaultNodeLauncher`] that sets up engine API consensus and rpc
diff --git a/crates/node/builder/src/launch/engine.rs b/crates/node/builder/src/launch/engine.rs
index 4d2ed714c2b5..39b0ee3c318a 100644
--- a/crates/node/builder/src/launch/engine.rs
+++ b/crates/node/builder/src/launch/engine.rs
@@ -34,13 +34,11 @@ use tokio::sync::{mpsc::unbounded_channel, oneshot};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use crate::{
-    components::NodeComponents,
     hooks::NodeHooks,
-    launch::{LaunchContext, LaunchNode},
     rpc::{launch_rpc_servers, EthApiBuilderProvider},
     setup::build_networked_pipeline,
-    AddOns, ExExLauncher, FullNode, NodeAdapter, NodeBuilderWithComponents, NodeComponentsBuilder,
-    NodeHandle, NodeTypesAdapter,
+    AddOns, ExExLauncher, FullNode, LaunchContext, LaunchNode, NodeAdapter,
+    NodeBuilderWithComponents, NodeComponents, NodeComponentsBuilder, NodeHandle, NodeTypesAdapter,
 };
 
 /// The engine node launcher.
@@ -64,8 +62,9 @@ where
     AO: NodeAddOns<
         NodeAdapter<T, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<T, CB::Components>>
-                    + FullEthApiServer
-                    + AddDevSigners,
+                    + FullEthApiServer<
+            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+        > + AddDevSigners,
     >,
 {
     type Node = NodeHandle<NodeAdapter<T, CB::Components>, AO>;
diff --git a/crates/node/builder/src/launch/mod.rs b/crates/node/builder/src/launch/mod.rs
index 60b7dc6d795b..4e201db17d49 100644
--- a/crates/node/builder/src/launch/mod.rs
+++ b/crates/node/builder/src/launch/mod.rs
@@ -106,8 +106,9 @@ where
     AO: NodeAddOns<
         NodeAdapter<T, CB::Components>,
         EthApi: EthApiBuilderProvider<NodeAdapter<T, CB::Components>>
-                    + FullEthApiServer
-                    + AddDevSigners,
+                    + FullEthApiServer<
+            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+        > + AddDevSigners,
     >,
 {
     type Node = NodeHandle<NodeAdapter<T, CB::Components>, AO>;
diff --git a/crates/node/builder/src/rpc.rs b/crates/node/builder/src/rpc.rs
index 920882703a84..123eae88e727 100644
--- a/crates/node/builder/src/rpc.rs
+++ b/crates/node/builder/src/rpc.rs
@@ -9,7 +9,10 @@ use futures::TryFutureExt;
 use reth_node_api::{BuilderProvider, FullNodeComponents};
 use reth_node_core::{
     node_config::NodeConfig,
-    rpc::{api::EngineApiServer, eth::FullEthApiServer},
+    rpc::{
+        api::EngineApiServer,
+        eth::{EthApiTypes, FullEthApiServer},
+    },
 };
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_rpc_builder::{
@@ -42,13 +45,21 @@ pub struct RpcHooks<Node: FullNodeComponents, EthApi> {
     pub extend_rpc_modules: Box<dyn ExtendRpcModules<Node, EthApi>>,
 }
 
-impl<Node: FullNodeComponents, EthApi> Default for RpcHooks<Node, EthApi> {
+impl<Node, EthApi> Default for RpcHooks<Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     fn default() -> Self {
         Self { on_rpc_started: Box::<()>::default(), extend_rpc_modules: Box::<()>::default() }
     }
 }
 
-impl<Node: FullNodeComponents, EthApi> RpcHooks<Node, EthApi> {
+impl<Node, EthApi> RpcHooks<Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     /// Sets the hook that is run once the rpc server is started.
     pub(crate) fn set_on_rpc_started<F>(&mut self, hook: F) -> &mut Self
     where
@@ -88,7 +99,11 @@ impl<Node: FullNodeComponents, EthApi> RpcHooks<Node, EthApi> {
     }
 }
 
-impl<Node: FullNodeComponents, EthApi> fmt::Debug for RpcHooks<Node, EthApi> {
+impl<Node, EthApi> fmt::Debug for RpcHooks<Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RpcHooks")
             .field("on_rpc_started", &"...")
@@ -98,7 +113,7 @@ impl<Node: FullNodeComponents, EthApi> fmt::Debug for RpcHooks<Node, EthApi> {
 }
 
 /// Event hook that is called once the rpc server is started.
-pub trait OnRpcStarted<Node: FullNodeComponents, EthApi>: Send {
+pub trait OnRpcStarted<Node: FullNodeComponents, EthApi: EthApiTypes>: Send {
     /// The hook that is called once the rpc server is started.
     fn on_rpc_started(
         self: Box<Self>,
@@ -111,6 +126,7 @@ impl<Node, EthApi, F> OnRpcStarted<Node, EthApi> for F
 where
     F: FnOnce(RpcContext<'_, Node, EthApi>, RethRpcServerHandles) -> eyre::Result<()> + Send,
     Node: FullNodeComponents,
+    EthApi: EthApiTypes,
 {
     fn on_rpc_started(
         self: Box<Self>,
@@ -121,7 +137,11 @@ where
     }
 }
 
-impl<Node: FullNodeComponents, EthApi> OnRpcStarted<Node, EthApi> for () {
+impl<Node, EthApi> OnRpcStarted<Node, EthApi> for ()
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     fn on_rpc_started(
         self: Box<Self>,
         _: RpcContext<'_, Node, EthApi>,
@@ -132,7 +152,7 @@ impl<Node: FullNodeComponents, EthApi> OnRpcStarted<Node, EthApi> for () {
 }
 
 /// Event hook that is called when the rpc server is started.
-pub trait ExtendRpcModules<Node: FullNodeComponents, EthApi>: Send {
+pub trait ExtendRpcModules<Node: FullNodeComponents, EthApi: EthApiTypes>: Send {
     /// The hook that is called once the rpc server is started.
     fn extend_rpc_modules(self: Box<Self>, ctx: RpcContext<'_, Node, EthApi>) -> eyre::Result<()>;
 }
@@ -141,13 +161,18 @@ impl<Node, EthApi, F> ExtendRpcModules<Node, EthApi> for F
 where
     F: FnOnce(RpcContext<'_, Node, EthApi>) -> eyre::Result<()> + Send,
     Node: FullNodeComponents,
+    EthApi: EthApiTypes,
 {
     fn extend_rpc_modules(self: Box<Self>, ctx: RpcContext<'_, Node, EthApi>) -> eyre::Result<()> {
         (*self)(ctx)
     }
 }
 
-impl<Node: FullNodeComponents, EthApi> ExtendRpcModules<Node, EthApi> for () {
+impl<Node, EthApi> ExtendRpcModules<Node, EthApi> for ()
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     fn extend_rpc_modules(self: Box<Self>, _: RpcContext<'_, Node, EthApi>) -> eyre::Result<()> {
         Ok(())
     }
@@ -156,7 +181,7 @@ impl<Node: FullNodeComponents, EthApi> ExtendRpcModules<Node, EthApi> for () {
 /// Helper wrapper type to encapsulate the [`RpcRegistryInner`] over components trait.
 #[derive(Debug, Clone)]
 #[allow(clippy::type_complexity)]
-pub struct RpcRegistry<Node: FullNodeComponents, EthApi> {
+pub struct RpcRegistry<Node: FullNodeComponents, EthApi: EthApiTypes> {
     pub(crate) registry: RpcRegistryInner<
         Node::Provider,
         Node::Pool,
@@ -167,7 +192,11 @@ pub struct RpcRegistry<Node: FullNodeComponents, EthApi> {
     >,
 }
 
-impl<Node: FullNodeComponents, EthApi> Deref for RpcRegistry<Node, EthApi> {
+impl<Node, EthApi> Deref for RpcRegistry<Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     type Target = RpcRegistryInner<
         Node::Provider,
         Node::Pool,
@@ -182,7 +211,11 @@ impl<Node: FullNodeComponents, EthApi> Deref for RpcRegistry<Node, EthApi> {
     }
 }
 
-impl<Node: FullNodeComponents, EthApi> DerefMut for RpcRegistry<Node, EthApi> {
+impl<Node, EthApi> DerefMut for RpcRegistry<Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.registry
     }
@@ -196,7 +229,7 @@ impl<Node: FullNodeComponents, EthApi> DerefMut for RpcRegistry<Node, EthApi> {
 /// transport modules [`TransportRpcModules`] as well as configured authenticated methods
 /// [`AuthRpcModule`].
 #[allow(missing_debug_implementations)]
-pub struct RpcContext<'a, Node: FullNodeComponents, EthApi> {
+pub struct RpcContext<'a, Node: FullNodeComponents, EthApi: EthApiTypes> {
     /// The node components.
     pub(crate) node: Node,
 
@@ -218,7 +251,11 @@ pub struct RpcContext<'a, Node: FullNodeComponents, EthApi> {
     pub auth_module: &'a mut AuthRpcModule,
 }
 
-impl<'a, Node: FullNodeComponents, EthApi> RpcContext<'a, Node, EthApi> {
+impl<'a, Node, EthApi> RpcContext<'a, Node, EthApi>
+where
+    Node: FullNodeComponents,
+    EthApi: EthApiTypes,
+{
     /// Returns the config of the node.
     pub const fn config(&self) -> &NodeConfig {
         self.config
@@ -259,9 +296,12 @@ pub async fn launch_rpc_servers<Node, Engine, EthApi>(
     add_ons: RpcAddOns<Node, EthApi>,
 ) -> eyre::Result<(RethRpcServerHandles, RpcRegistry<Node, EthApi>)>
 where
-    EthApi: EthApiBuilderProvider<Node> + FullEthApiServer,
     Node: FullNodeComponents + Clone,
     Engine: EngineApiServer<Node::Engine>,
+    EthApi: EthApiBuilderProvider<Node>
+        + FullEthApiServer<
+            NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
+        >,
 {
     let auth_config = config.rpc.auth_server_config(jwt_secret)?;
     let module_config = config.rpc.transport_rpc_module_config();
@@ -333,7 +373,7 @@ where
 }
 
 /// Provides builder for the core `eth` API type.
-pub trait EthApiBuilderProvider<N: FullNodeComponents>: BuilderProvider<N> {
+pub trait EthApiBuilderProvider<N: FullNodeComponents>: BuilderProvider<N> + EthApiTypes {
     /// Returns the eth api builder.
     #[allow(clippy::type_complexity)]
     fn eth_api_builder() -> Box<dyn Fn(&EthApiBuilderCtx<N>) -> Self + Send>;
@@ -342,7 +382,7 @@ pub trait EthApiBuilderProvider<N: FullNodeComponents>: BuilderProvider<N> {
 impl<N, F> EthApiBuilderProvider<N> for F
 where
     N: FullNodeComponents,
-    for<'a> F: BuilderProvider<N, Ctx<'a> = &'a EthApiBuilderCtx<N>>,
+    for<'a> F: BuilderProvider<N, Ctx<'a> = &'a EthApiBuilderCtx<N>> + EthApiTypes,
 {
     fn eth_api_builder() -> Box<dyn Fn(&EthApiBuilderCtx<N>) -> Self + Send> {
         F::builder()
diff --git a/crates/optimism/node/Cargo.toml b/crates/optimism/node/Cargo.toml
index 52b622e22eca..52c436ecb16c 100644
--- a/crates/optimism/node/Cargo.toml
+++ b/crates/optimism/node/Cargo.toml
@@ -36,6 +36,7 @@ reth-discv5.workspace = true
 reth-rpc-eth-types.workspace = true
 reth-rpc-eth-api.workspace = true
 reth-optimism-rpc.workspace = true
+reth-rpc.workspace = true
 
 # async
 async-trait.workspace = true
diff --git a/crates/optimism/primitives/Cargo.toml b/crates/optimism/primitives/Cargo.toml
index 0acd2f1ebdca..262cb5881504 100644
--- a/crates/optimism/primitives/Cargo.toml
+++ b/crates/optimism/primitives/Cargo.toml
@@ -9,4 +9,4 @@ repository.workspace = true
 description = "OP primitive types"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/optimism/rpc/Cargo.toml b/crates/optimism/rpc/Cargo.toml
index e5c2bede42dd..2223bac0b9bb 100644
--- a/crates/optimism/rpc/Cargo.toml
+++ b/crates/optimism/rpc/Cargo.toml
@@ -26,9 +26,11 @@ reth-transaction-pool.workspace = true
 reth-rpc.workspace = true
 reth-node-api.workspace = true
 reth-network-api.workspace = true
+reth-node-builder.workspace = true
 
 # ethereum
 alloy-primitives.workspace = true
+op-alloy-network.workspace = true
 revm.workspace = true
 
 # async
@@ -59,5 +61,5 @@ optimism = [
     "reth-primitives/optimism",
     "reth-provider/optimism",
     "reth-rpc-eth-api/optimism",
-    "revm/optimism"
+    "revm/optimism",
 ]
\ No newline at end of file
diff --git a/crates/optimism/rpc/src/eth/mod.rs b/crates/optimism/rpc/src/eth/mod.rs
index d36f9a3b8cfc..ebe64cd532a3 100644
--- a/crates/optimism/rpc/src/eth/mod.rs
+++ b/crates/optimism/rpc/src/eth/mod.rs
@@ -11,9 +11,11 @@ use std::{fmt, sync::Arc};
 
 use alloy_primitives::U256;
 use derive_more::Deref;
+use op_alloy_network::Optimism;
 use reth_evm::ConfigureEvm;
 use reth_network_api::NetworkInfo;
 use reth_node_api::{BuilderProvider, FullNodeComponents, FullNodeTypes};
+use reth_node_builder::EthApiBuilderCtx;
 use reth_provider::{
     BlockIdReader, BlockNumReader, BlockReaderIdExt, ChainSpecProvider, HeaderProvider,
     StageCheckpointReader, StateProviderFactory,
@@ -21,15 +23,15 @@ use reth_provider::{
 use reth_rpc::eth::{core::EthApiInner, DevSigner};
 use reth_rpc_eth_api::{
     helpers::{
-        AddDevSigners, EthApiSpec, EthFees, EthState, LoadBlock, LoadFee, LoadState, SpawnBlocking,
-        Trace,
+        AddDevSigners, EthApiSpec, EthFees, EthSigner, EthState, LoadBlock, LoadFee, LoadState,
+        SpawnBlocking, Trace,
     },
     EthApiTypes,
 };
 use reth_rpc_eth_types::{EthStateCache, FeeHistoryCache, GasPriceOracle};
 use reth_tasks::{
     pool::{BlockingTaskGuard, BlockingTaskPool},
-    TaskExecutor, TaskSpawner,
+    TaskSpawner,
 };
 use reth_transaction_pool::TransactionPool;
 
@@ -43,16 +45,6 @@ pub type EthApiNodeBackend<N> = EthApiInner<
     <N as FullNodeComponents>::Evm,
 >;
 
-/// Adapter for [`EthApiBuilderCtx`].
-pub type EthApiBuilderCtx<N> = reth_rpc_eth_types::EthApiBuilderCtx<
-    <N as FullNodeTypes>::Provider,
-    <N as FullNodeComponents>::Pool,
-    <N as FullNodeComponents>::Evm,
-    <N as FullNodeComponents>::Network,
-    TaskExecutor,
-    <N as FullNodeTypes>::Provider,
->;
-
 /// OP-Reth `Eth` API implementation.
 ///
 /// This type provides the functionality for handling `eth_` related requests.
@@ -65,6 +57,7 @@ pub type EthApiBuilderCtx<N> = reth_rpc_eth_types::EthApiBuilderCtx<
 /// all the `Eth` helper traits and prerequisite traits.
 #[derive(Clone, Deref)]
 pub struct OpEthApi<N: FullNodeComponents> {
+    #[deref]
     inner: Arc<EthApiNodeBackend<N>>,
 }
 
@@ -101,10 +94,12 @@ where
     N: FullNodeComponents,
 {
     type Error = OpEthApiError;
+    type NetworkTypes = Optimism;
 }
 
 impl<N> EthApiSpec for OpEthApi<N>
 where
+    Self: Send + Sync,
     N: FullNodeComponents,
 {
     #[inline]
@@ -123,7 +118,7 @@ where
     }
 
     #[inline]
-    fn signers(&self) -> &parking_lot::RwLock<Vec<Box<dyn reth_rpc_eth_api::helpers::EthSigner>>> {
+    fn signers(&self) -> &parking_lot::RwLock<Vec<Box<dyn EthSigner>>> {
         self.inner.signers()
     }
 }
@@ -233,6 +228,7 @@ impl<N: FullNodeComponents> AddDevSigners for OpEthApi<N> {
 
 impl<N> BuilderProvider<N> for OpEthApi<N>
 where
+    Self: Send,
     N: FullNodeComponents,
 {
     type Ctx<'a> = &'a EthApiBuilderCtx<N>;
@@ -243,7 +239,7 @@ where
 }
 
 impl<N: FullNodeComponents> fmt::Debug for OpEthApi<N> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("OpEthApi").finish_non_exhaustive()
     }
 }
diff --git a/crates/optimism/rpc/src/eth/pending_block.rs b/crates/optimism/rpc/src/eth/pending_block.rs
index 0a66fb6230fa..6b345e9698cf 100644
--- a/crates/optimism/rpc/src/eth/pending_block.rs
+++ b/crates/optimism/rpc/src/eth/pending_block.rs
@@ -1,6 +1,5 @@
 //! Loads OP pending block for a RPC response.   
 
-use crate::OpEthApi;
 use reth_evm::ConfigureEvm;
 use reth_node_api::FullNodeComponents;
 use reth_primitives::{
@@ -17,6 +16,8 @@ use reth_rpc_eth_api::{
 use reth_rpc_eth_types::{EthApiError, PendingBlock};
 use reth_transaction_pool::TransactionPool;
 
+use crate::OpEthApi;
+
 impl<N> LoadPendingBlock for OpEthApi<N>
 where
     Self: SpawnBlocking,
diff --git a/crates/rpc/rpc-builder/Cargo.toml b/crates/rpc/rpc-builder/Cargo.toml
index d410268a2df2..e1b7c182353f 100644
--- a/crates/rpc/rpc-builder/Cargo.toml
+++ b/crates/rpc/rpc-builder/Cargo.toml
@@ -27,6 +27,7 @@ reth-tasks = { workspace = true, features = ["rayon"] }
 reth-transaction-pool.workspace = true
 reth-evm.workspace = true
 reth-engine-primitives.workspace = true
+reth-rpc-types.workspace = true
 
 # rpc/net
 jsonrpsee = { workspace = true, features = ["server"] }
diff --git a/crates/rpc/rpc-builder/src/lib.rs b/crates/rpc/rpc-builder/src/lib.rs
index d3346bcdc185..a3c9edbc7965 100644
--- a/crates/rpc/rpc-builder/src/lib.rs
+++ b/crates/rpc/rpc-builder/src/lib.rs
@@ -805,7 +805,7 @@ where
     /// If called outside of the tokio runtime. See also [`Self::eth_api`]
     pub fn register_eth(&mut self) -> &mut Self
     where
-        EthApi: EthApiServer,
+        EthApi: EthApiServer<reth_rpc_types::Transaction, reth_rpc_types::RichBlock>,
     {
         let eth_api = self.eth_api().clone();
         self.modules.insert(RethRpcModule::Eth, eth_api.into_rpc().into());
@@ -819,7 +819,7 @@ where
     /// If called outside of the tokio runtime. See also [`Self::eth_api`]
     pub fn register_ots(&mut self) -> &mut Self
     where
-        EthApi: EthApiServer + TraceExt,
+        EthApi: EthApiServer<reth_rpc_types::Transaction, reth_rpc_types::RichBlock> + TraceExt,
     {
         let otterscan_api = self.otterscan_api();
         self.modules.insert(RethRpcModule::Ots, otterscan_api.into_rpc().into());
@@ -919,7 +919,7 @@ where
     /// If called outside of the tokio runtime. See also [`Self::eth_api`]
     pub fn otterscan_api(&self) -> OtterscanApi<EthApi>
     where
-        EthApi: EthApiServer,
+        EthApi: EthApiServer<reth_rpc_types::Transaction, reth_rpc_types::RichBlock>,
     {
         let eth_api = self.eth_api().clone();
         OtterscanApi::new(eth_api)
diff --git a/crates/rpc/rpc-builder/tests/it/http.rs b/crates/rpc/rpc-builder/tests/it/http.rs
index 9a858d5a4751..2b65bc19a8db 100644
--- a/crates/rpc/rpc-builder/tests/it/http.rs
+++ b/crates/rpc/rpc-builder/tests/it/http.rs
@@ -116,20 +116,21 @@ async fn test_filter_calls<C>(client: &C)
 where
     C: ClientT + SubscriptionClientT + Sync,
 {
-    EthFilterApiClient::new_filter(client, Filter::default()).await.unwrap();
-    EthFilterApiClient::new_pending_transaction_filter(client, None).await.unwrap();
-    EthFilterApiClient::new_pending_transaction_filter(
+    EthFilterApiClient::<Transaction>::new_filter(client, Filter::default()).await.unwrap();
+    EthFilterApiClient::<Transaction>::new_pending_transaction_filter(client, None).await.unwrap();
+    EthFilterApiClient::<Transaction>::new_pending_transaction_filter(
         client,
         Some(PendingTransactionFilterKind::Full),
     )
     .await
     .unwrap();
-    let id = EthFilterApiClient::new_block_filter(client).await.unwrap();
-    EthFilterApiClient::filter_changes(client, id.clone()).await.unwrap();
-    EthFilterApiClient::logs(client, Filter::default()).await.unwrap();
-    let id = EthFilterApiClient::new_filter(client, Filter::default()).await.unwrap();
-    EthFilterApiClient::filter_logs(client, id.clone()).await.unwrap();
-    EthFilterApiClient::uninstall_filter(client, id).await.unwrap();
+    let id = EthFilterApiClient::<Transaction>::new_block_filter(client).await.unwrap();
+    EthFilterApiClient::<Transaction>::filter_changes(client, id.clone()).await.unwrap();
+    EthFilterApiClient::<Transaction>::logs(client, Filter::default()).await.unwrap();
+    let id =
+        EthFilterApiClient::<Transaction>::new_filter(client, Filter::default()).await.unwrap();
+    EthFilterApiClient::<Transaction>::filter_logs(client, id.clone()).await.unwrap();
+    EthFilterApiClient::<Transaction>::uninstall_filter(client, id).await.unwrap();
 }
 
 async fn test_basic_admin_calls<C>(client: &C)
@@ -172,60 +173,136 @@ where
     .unwrap();
 
     // Implemented
-    EthApiClient::protocol_version(client).await.unwrap();
-    EthApiClient::chain_id(client).await.unwrap();
-    EthApiClient::accounts(client).await.unwrap();
-    EthApiClient::get_account(client, address, block_number.into()).await.unwrap();
-    EthApiClient::block_number(client).await.unwrap();
-    EthApiClient::get_code(client, address, None).await.unwrap();
-    EthApiClient::send_raw_transaction(client, tx).await.unwrap();
-    EthApiClient::fee_history(client, U64::from(0), block_number, None).await.unwrap();
-    EthApiClient::balance(client, address, None).await.unwrap();
-    EthApiClient::transaction_count(client, address, None).await.unwrap();
-    EthApiClient::storage_at(client, address, U256::default().into(), None).await.unwrap();
-    EthApiClient::block_by_hash(client, hash, false).await.unwrap();
-    EthApiClient::block_by_number(client, block_number, false).await.unwrap();
-    EthApiClient::block_transaction_count_by_number(client, block_number).await.unwrap();
-    EthApiClient::block_transaction_count_by_hash(client, hash).await.unwrap();
-    EthApiClient::block_uncles_count_by_hash(client, hash).await.unwrap();
-    EthApiClient::block_uncles_count_by_number(client, block_number).await.unwrap();
-    EthApiClient::uncle_by_block_hash_and_index(client, hash, index).await.unwrap();
-    EthApiClient::uncle_by_block_number_and_index(client, block_number, index).await.unwrap();
-    EthApiClient::sign(client, address, bytes.clone()).await.unwrap_err();
-    EthApiClient::sign_typed_data(client, address, typed_data).await.unwrap_err();
-    EthApiClient::transaction_by_hash(client, tx_hash).await.unwrap();
-    EthApiClient::transaction_by_block_hash_and_index(client, hash, index).await.unwrap();
-    EthApiClient::transaction_by_block_number_and_index(client, block_number, index).await.unwrap();
-    EthApiClient::create_access_list(client, call_request.clone(), Some(block_number.into()))
+    EthApiClient::<Transaction, RichBlock>::protocol_version(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::chain_id(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::accounts(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::get_account(client, address, block_number.into())
         .await
         .unwrap();
-    EthApiClient::estimate_gas(client, call_request.clone(), Some(block_number.into()), None)
+    EthApiClient::<Transaction, RichBlock>::block_number(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::get_code(client, address, None).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::send_raw_transaction(client, tx).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::fee_history(client, U64::from(0), block_number, None)
         .await
         .unwrap();
-    EthApiClient::call(client, call_request.clone(), Some(block_number.into()), None, None)
+    EthApiClient::<Transaction, RichBlock>::balance(client, address, None).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::transaction_count(client, address, None).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::storage_at(
+        client,
+        address,
+        U256::default().into(),
+        None,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_by_hash(client, hash, false).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_by_number(client, block_number, false)
+        .await
+        .unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_transaction_count_by_number(client, block_number)
+        .await
+        .unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_transaction_count_by_hash(client, hash)
+        .await
+        .unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_uncles_count_by_hash(client, hash).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::block_uncles_count_by_number(client, block_number)
         .await
         .unwrap();
-    EthApiClient::syncing(client).await.unwrap();
-    EthApiClient::send_transaction(client, transaction_request).await.unwrap_err();
-    EthApiClient::hashrate(client).await.unwrap();
-    EthApiClient::submit_hashrate(client, U256::default(), B256::default()).await.unwrap();
-    EthApiClient::gas_price(client).await.unwrap_err();
-    EthApiClient::max_priority_fee_per_gas(client).await.unwrap_err();
-    EthApiClient::get_proof(client, address, vec![], None).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::uncle_by_block_hash_and_index(client, hash, index)
+        .await
+        .unwrap();
+    EthApiClient::<Transaction, RichBlock>::uncle_by_block_number_and_index(
+        client,
+        block_number,
+        index,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::sign(client, address, bytes.clone()).await.unwrap_err();
+    EthApiClient::<Transaction, RichBlock>::sign_typed_data(client, address, typed_data)
+        .await
+        .unwrap_err();
+    EthApiClient::<Transaction, RichBlock>::transaction_by_hash(client, tx_hash).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::transaction_by_block_hash_and_index(
+        client, hash, index,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::transaction_by_block_number_and_index(
+        client,
+        block_number,
+        index,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::create_access_list(
+        client,
+        call_request.clone(),
+        Some(block_number.into()),
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::estimate_gas(
+        client,
+        call_request.clone(),
+        Some(block_number.into()),
+        None,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::call(
+        client,
+        call_request.clone(),
+        Some(block_number.into()),
+        None,
+        None,
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::syncing(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::send_transaction(client, transaction_request)
+        .await
+        .unwrap_err();
+    EthApiClient::<Transaction, RichBlock>::hashrate(client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::submit_hashrate(
+        client,
+        U256::default(),
+        B256::default(),
+    )
+    .await
+    .unwrap();
+    EthApiClient::<Transaction, RichBlock>::gas_price(client).await.unwrap_err();
+    EthApiClient::<Transaction, RichBlock>::max_priority_fee_per_gas(client).await.unwrap_err();
+    EthApiClient::<Transaction, RichBlock>::get_proof(client, address, vec![], None).await.unwrap();
 
     // Unimplemented
-    assert!(is_unimplemented(EthApiClient::author(client).await.err().unwrap()));
-    assert!(is_unimplemented(EthApiClient::is_mining(client).await.err().unwrap()));
-    assert!(is_unimplemented(EthApiClient::get_work(client).await.err().unwrap()));
     assert!(is_unimplemented(
-        EthApiClient::submit_work(client, B64::default(), B256::default(), B256::default())
+        EthApiClient::<Transaction, RichBlock>::author(client).await.err().unwrap()
+    ));
+    assert!(is_unimplemented(
+        EthApiClient::<Transaction, RichBlock>::is_mining(client).await.err().unwrap()
+    ));
+    assert!(is_unimplemented(
+        EthApiClient::<Transaction, RichBlock>::get_work(client).await.err().unwrap()
+    ));
+    assert!(is_unimplemented(
+        EthApiClient::<Transaction, RichBlock>::submit_work(
+            client,
+            B64::default(),
+            B256::default(),
+            B256::default()
+        )
+        .await
+        .err()
+        .unwrap()
+    ));
+    assert!(is_unimplemented(
+        EthApiClient::<Transaction, RichBlock>::sign_transaction(client, call_request.clone())
             .await
             .err()
             .unwrap()
     ));
-    assert!(is_unimplemented(
-        EthApiClient::sign_transaction(client, call_request.clone()).await.err().unwrap()
-    ));
 }
 
 async fn test_basic_debug_calls<C>(client: &C)
diff --git a/crates/rpc/rpc-builder/tests/it/middleware.rs b/crates/rpc/rpc-builder/tests/it/middleware.rs
index 59cc86d4dc86..6641157e9f35 100644
--- a/crates/rpc/rpc-builder/tests/it/middleware.rs
+++ b/crates/rpc/rpc-builder/tests/it/middleware.rs
@@ -8,6 +8,7 @@ use reth_rpc::EthApi;
 use reth_rpc_builder::{RpcServerConfig, TransportRpcModuleConfig};
 use reth_rpc_eth_api::EthApiClient;
 use reth_rpc_server_types::RpcModuleSelection;
+use reth_rpc_types::{RichBlock, Transaction};
 use std::{
     future::Future,
     pin::Pin,
@@ -74,7 +75,7 @@ async fn test_rpc_middleware() {
         .unwrap();
 
     let client = handle.http_client().unwrap();
-    EthApiClient::protocol_version(&client).await.unwrap();
+    EthApiClient::<Transaction, RichBlock>::protocol_version(&client).await.unwrap();
     let count = mylayer.count.load(Ordering::Relaxed);
     assert_eq!(count, 1);
 }
diff --git a/crates/rpc/rpc-eth-api/Cargo.toml b/crates/rpc/rpc-eth-api/Cargo.toml
index 5cd79c27c6fc..bcb6bcf7baac 100644
--- a/crates/rpc/rpc-eth-api/Cargo.toml
+++ b/crates/rpc/rpc-eth-api/Cargo.toml
@@ -33,6 +33,8 @@ reth-network-api.workspace = true
 
 # ethereum
 alloy-dyn-abi = { workspace = true, features = ["eip712"] }
+alloy-network.workspace = true
+alloy-json-rpc.workspace = true
 
 # rpc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
diff --git a/crates/rpc/rpc-eth-api/src/core.rs b/crates/rpc/rpc-eth-api/src/core.rs
index 1a1e914850f7..828756ad391c 100644
--- a/crates/rpc/rpc-eth-api/src/core.rs
+++ b/crates/rpc/rpc-eth-api/src/core.rs
@@ -1,11 +1,8 @@
 //! Implementation of the [`jsonrpsee`] generated [`EthApiServer`] trait. Handles RPC requests for
 //! the `eth_` namespace.
 
-use crate::helpers::{
-    transaction::UpdateRawTxForwarder, EthApiSpec, EthBlocks, EthCall, EthFees, EthState,
-    EthTransactions, FullEthApi,
-};
 use alloy_dyn_abi::TypedData;
+use alloy_json_rpc::RpcObject;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use reth_primitives::{
     transaction::AccessListResult, Address, BlockId, BlockNumberOrTag, Bytes, B256, B64, U256, U64,
@@ -16,21 +13,40 @@ use reth_rpc_types::{
     simulate::{SimBlock, SimulatedBlock},
     state::{EvmOverrides, StateOverride},
     AnyTransactionReceipt, BlockOverrides, Bundle, EIP1186AccountProofResponse, EthCallResponse,
-    FeeHistory, Header, Index, RichBlock, StateContext, SyncStatus, Transaction,
-    TransactionRequest, Work,
+    FeeHistory, Header, Index, StateContext, SyncStatus, TransactionRequest, Work,
 };
 use tracing::trace;
 
+use crate::{
+    helpers::{
+        transaction::UpdateRawTxForwarder, EthApiSpec, EthBlocks, EthCall, EthFees, EthState,
+        EthTransactions, FullEthApi,
+    },
+    Block, Transaction,
+};
+
 /// Helper trait, unifies functionality that must be supported to implement all RPC methods for
 /// server.
-pub trait FullEthApiServer: EthApiServer + FullEthApi + UpdateRawTxForwarder + Clone {}
+pub trait FullEthApiServer:
+    EthApiServer<Transaction<Self::NetworkTypes>, Block<Self::NetworkTypes>>
+    + FullEthApi
+    + UpdateRawTxForwarder
+    + Clone
+{
+}
 
-impl<T> FullEthApiServer for T where T: EthApiServer + FullEthApi + UpdateRawTxForwarder + Clone {}
+impl<T> FullEthApiServer for T where
+    T: EthApiServer<Transaction<T::NetworkTypes>, Block<T::NetworkTypes>>
+        + FullEthApi
+        + UpdateRawTxForwarder
+        + Clone
+{
+}
 
 /// Eth rpc interface: <https://ethereum.github.io/execution-apis/api-documentation/>
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "eth"))]
 #[cfg_attr(feature = "client", rpc(server, client, namespace = "eth"))]
-pub trait EthApi {
+pub trait EthApi<T: RpcObject, B: RpcObject> {
     /// Returns the protocol version encoded as a string.
     #[method(name = "protocolVersion")]
     async fn protocol_version(&self) -> RpcResult<U64>;
@@ -57,15 +73,11 @@ pub trait EthApi {
 
     /// Returns information about a block by hash.
     #[method(name = "getBlockByHash")]
-    async fn block_by_hash(&self, hash: B256, full: bool) -> RpcResult<Option<RichBlock>>;
+    async fn block_by_hash(&self, hash: B256, full: bool) -> RpcResult<Option<B>>;
 
     /// Returns information about a block by number.
     #[method(name = "getBlockByNumber")]
-    async fn block_by_number(
-        &self,
-        number: BlockNumberOrTag,
-        full: bool,
-    ) -> RpcResult<Option<RichBlock>>;
+    async fn block_by_number(&self, number: BlockNumberOrTag, full: bool) -> RpcResult<Option<B>>;
 
     /// Returns the number of transactions in a block from a block matching the given block hash.
     #[method(name = "getBlockTransactionCountByHash")]
@@ -98,11 +110,8 @@ pub trait EthApi {
 
     /// Returns an uncle block of the given block and index.
     #[method(name = "getUncleByBlockHashAndIndex")]
-    async fn uncle_by_block_hash_and_index(
-        &self,
-        hash: B256,
-        index: Index,
-    ) -> RpcResult<Option<RichBlock>>;
+    async fn uncle_by_block_hash_and_index(&self, hash: B256, index: Index)
+        -> RpcResult<Option<B>>;
 
     /// Returns an uncle block of the given block and index.
     #[method(name = "getUncleByBlockNumberAndIndex")]
@@ -110,7 +119,7 @@ pub trait EthApi {
         &self,
         number: BlockNumberOrTag,
         index: Index,
-    ) -> RpcResult<Option<RichBlock>>;
+    ) -> RpcResult<Option<B>>;
 
     /// Returns the EIP-2718 encoded transaction if it exists.
     ///
@@ -120,7 +129,7 @@ pub trait EthApi {
 
     /// Returns the information about a transaction requested by transaction hash.
     #[method(name = "getTransactionByHash")]
-    async fn transaction_by_hash(&self, hash: B256) -> RpcResult<Option<Transaction>>;
+    async fn transaction_by_hash(&self, hash: B256) -> RpcResult<Option<T>>;
 
     /// Returns information about a raw transaction by block hash and transaction index position.
     #[method(name = "getRawTransactionByBlockHashAndIndex")]
@@ -136,7 +145,7 @@ pub trait EthApi {
         &self,
         hash: B256,
         index: Index,
-    ) -> RpcResult<Option<Transaction>>;
+    ) -> RpcResult<Option<T>>;
 
     /// Returns information about a raw transaction by block number and transaction index
     /// position.
@@ -153,7 +162,7 @@ pub trait EthApi {
         &self,
         number: BlockNumberOrTag,
         index: Index,
-    ) -> RpcResult<Option<Transaction>>;
+    ) -> RpcResult<Option<T>>;
 
     /// Returns the receipt of a transaction by transaction hash.
     #[method(name = "getTransactionReceipt")]
@@ -347,7 +356,7 @@ pub trait EthApi {
 }
 
 #[async_trait::async_trait]
-impl<T> EthApiServer for T
+impl<T> EthApiServer<Transaction<T::NetworkTypes>, Block<T::NetworkTypes>> for T
 where
     T: FullEthApi,
     jsonrpsee_types::error::ErrorObject<'static>: From<T::Error>,
@@ -390,7 +399,11 @@ where
     }
 
     /// Handler for: `eth_getBlockByHash`
-    async fn block_by_hash(&self, hash: B256, full: bool) -> RpcResult<Option<RichBlock>> {
+    async fn block_by_hash(
+        &self,
+        hash: B256,
+        full: bool,
+    ) -> RpcResult<Option<Block<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?hash, ?full, "Serving eth_getBlockByHash");
         Ok(EthBlocks::rpc_block(self, hash.into(), full).await?)
     }
@@ -400,7 +413,7 @@ where
         &self,
         number: BlockNumberOrTag,
         full: bool,
-    ) -> RpcResult<Option<RichBlock>> {
+    ) -> RpcResult<Option<Block<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?number, ?full, "Serving eth_getBlockByNumber");
         Ok(EthBlocks::rpc_block(self, number.into(), full).await?)
     }
@@ -449,7 +462,7 @@ where
         &self,
         hash: B256,
         index: Index,
-    ) -> RpcResult<Option<RichBlock>> {
+    ) -> RpcResult<Option<Block<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?hash, ?index, "Serving eth_getUncleByBlockHashAndIndex");
         Ok(EthBlocks::ommer_by_block_and_index(self, hash.into(), index).await?)
     }
@@ -459,7 +472,7 @@ where
         &self,
         number: BlockNumberOrTag,
         index: Index,
-    ) -> RpcResult<Option<RichBlock>> {
+    ) -> RpcResult<Option<Block<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?number, ?index, "Serving eth_getUncleByBlockNumberAndIndex");
         Ok(EthBlocks::ommer_by_block_and_index(self, number.into(), index).await?)
     }
@@ -471,7 +484,10 @@ where
     }
 
     /// Handler for: `eth_getTransactionByHash`
-    async fn transaction_by_hash(&self, hash: B256) -> RpcResult<Option<Transaction>> {
+    async fn transaction_by_hash(
+        &self,
+        hash: B256,
+    ) -> RpcResult<Option<Transaction<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?hash, "Serving eth_getTransactionByHash");
         Ok(EthTransactions::transaction_by_hash(self, hash).await?.map(Into::into))
     }
@@ -492,7 +508,7 @@ where
         &self,
         hash: B256,
         index: Index,
-    ) -> RpcResult<Option<reth_rpc_types::Transaction>> {
+    ) -> RpcResult<Option<Transaction<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?hash, ?index, "Serving eth_getTransactionByBlockHashAndIndex");
         Ok(EthTransactions::transaction_by_block_and_tx_index(self, hash.into(), index.into())
             .await?)
@@ -518,7 +534,7 @@ where
         &self,
         number: BlockNumberOrTag,
         index: Index,
-    ) -> RpcResult<Option<reth_rpc_types::Transaction>> {
+    ) -> RpcResult<Option<Transaction<T::NetworkTypes>>> {
         trace!(target: "rpc::eth", ?number, ?index, "Serving eth_getTransactionByBlockNumberAndIndex");
         Ok(EthTransactions::transaction_by_block_and_tx_index(self, number.into(), index.into())
             .await?)
diff --git a/crates/rpc/rpc-eth-api/src/filter.rs b/crates/rpc/rpc-eth-api/src/filter.rs
index da53b577eec5..26c47226cfc3 100644
--- a/crates/rpc/rpc-eth-api/src/filter.rs
+++ b/crates/rpc/rpc-eth-api/src/filter.rs
@@ -1,12 +1,13 @@
 //! `eth_` RPC API for filtering.
 
+use alloy_json_rpc::RpcObject;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use reth_rpc_types::{Filter, FilterChanges, FilterId, Log, PendingTransactionFilterKind};
 
 /// Rpc Interface for poll-based ethereum filter API.
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "eth"))]
 #[cfg_attr(feature = "client", rpc(server, client, namespace = "eth"))]
-pub trait EthFilterApi {
+pub trait EthFilterApi<T: RpcObject> {
     /// Creates anew filter and returns its id.
     #[method(name = "newFilter")]
     async fn new_filter(&self, filter: Filter) -> RpcResult<FilterId>;
@@ -24,7 +25,7 @@ pub trait EthFilterApi {
 
     /// Returns all filter changes since last poll.
     #[method(name = "getFilterChanges")]
-    async fn filter_changes(&self, id: FilterId) -> RpcResult<FilterChanges>;
+    async fn filter_changes(&self, id: FilterId) -> RpcResult<FilterChanges<T>>;
 
     /// Returns all logs matching given filter (in a range 'from' - 'to').
     #[method(name = "getFilterLogs")]
diff --git a/crates/rpc/rpc-eth-api/src/helpers/block.rs b/crates/rpc/rpc-eth-api/src/helpers/block.rs
index 0058ca021cfc..63eb6e6027ac 100644
--- a/crates/rpc/rpc-eth-api/src/helpers/block.rs
+++ b/crates/rpc/rpc-eth-api/src/helpers/block.rs
@@ -6,10 +6,10 @@ use futures::Future;
 use reth_primitives::{BlockId, Receipt, SealedBlock, SealedBlockWithSenders, TransactionMeta};
 use reth_provider::{BlockIdReader, BlockReader, BlockReaderIdExt, HeaderProvider};
 use reth_rpc_eth_types::{EthApiError, EthStateCache, ReceiptBuilder};
-use reth_rpc_types::{AnyTransactionReceipt, Header, Index, RichBlock};
+use reth_rpc_types::{AnyTransactionReceipt, Header, Index, Rich};
 use reth_rpc_types_compat::block::{from_block, uncle_block_from_header};
 
-use crate::FromEthApiError;
+use crate::{Block, FromEthApiError};
 
 use super::{LoadPendingBlock, LoadReceipt, SpawnBlocking};
 
@@ -25,10 +25,7 @@ pub trait EthBlocks: LoadBlock {
     fn rpc_block_header(
         &self,
         block_id: BlockId,
-    ) -> impl Future<Output = Result<Option<Header>, Self::Error>> + Send
-    where
-        Self: LoadPendingBlock + SpawnBlocking,
-    {
+    ) -> impl Future<Output = Result<Option<Header>, Self::Error>> + Send {
         async move { Ok(self.rpc_block(block_id, false).await?.map(|block| block.inner.header)) }
     }
 
@@ -40,10 +37,7 @@ pub trait EthBlocks: LoadBlock {
         &self,
         block_id: BlockId,
         full: bool,
-    ) -> impl Future<Output = Result<Option<RichBlock>, Self::Error>> + Send
-    where
-        Self: LoadPendingBlock + SpawnBlocking,
-    {
+    ) -> impl Future<Output = Result<Option<Block<Self::NetworkTypes>>, Self::Error>> + Send {
         async move {
             let block = match self.block_with_senders(block_id).await? {
                 Some(block) => block,
@@ -56,7 +50,7 @@ pub trait EthBlocks: LoadBlock {
                 .ok_or(EthApiError::UnknownBlockNumber)?;
             let block = from_block(block.unseal(), total_difficulty, full.into(), Some(block_hash))
                 .map_err(Self::Error::from_eth_err)?;
-            Ok(Some(block.into()))
+            Ok(Some(Rich { inner: block, extra_info: Default::default() }))
         }
     }
 
@@ -187,7 +181,7 @@ pub trait EthBlocks: LoadBlock {
         &self,
         block_id: BlockId,
         index: Index,
-    ) -> impl Future<Output = Result<Option<RichBlock>, Self::Error>> + Send {
+    ) -> impl Future<Output = Result<Option<Block<Self::NetworkTypes>>, Self::Error>> + Send {
         async move {
             let uncles = if block_id.is_pending() {
                 // Pending block can be fetched directly without need for caching
@@ -202,10 +196,11 @@ pub trait EthBlocks: LoadBlock {
             }
             .unwrap_or_default();
 
-            let uncle = uncles
-                .into_iter()
-                .nth(index.into())
-                .map(|header| uncle_block_from_header(header).into());
+            let index = usize::from(index);
+            let uncle = uncles.into_iter().nth(index).map(|header| Rich {
+                inner: uncle_block_from_header(header),
+                extra_info: Default::default(),
+            });
             Ok(uncle)
         }
     }
diff --git a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs
index c4387a25537d..38174732aee0 100644
--- a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs
+++ b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs
@@ -19,12 +19,12 @@ use reth_rpc_types::{
         EIP1559TransactionRequest, EIP2930TransactionRequest, EIP4844TransactionRequest,
         LegacyTransactionRequest,
     },
-    AnyTransactionReceipt, Transaction, TransactionRequest, TypedTransactionRequest,
+    AnyTransactionReceipt, TransactionRequest, TypedTransactionRequest,
 };
 use reth_rpc_types_compat::transaction::from_recovered_with_block_context;
 use reth_transaction_pool::{PoolTransaction, TransactionOrigin, TransactionPool};
 
-use crate::{FromEthApiError, IntoEthApiError};
+use crate::{FromEthApiError, IntoEthApiError, Transaction};
 
 use super::{
     Call, EthApiSpec, EthSigner, LoadBlock, LoadFee, LoadPendingBlock, LoadReceipt, SpawnBlocking,
@@ -195,7 +195,7 @@ pub trait EthTransactions: LoadTransaction {
         &self,
         block_id: BlockId,
         index: usize,
-    ) -> impl Future<Output = Result<Option<Transaction>, Self::Error>> + Send
+    ) -> impl Future<Output = Result<Option<Transaction<Self::NetworkTypes>>, Self::Error>> + Send
     where
         Self: LoadBlock,
     {
diff --git a/crates/rpc/rpc-eth-api/src/helpers/types.rs b/crates/rpc/rpc-eth-api/src/helpers/types.rs
index 088f9d9b69e9..2030ea0cf481 100644
--- a/crates/rpc/rpc-eth-api/src/helpers/types.rs
+++ b/crates/rpc/rpc-eth-api/src/helpers/types.rs
@@ -2,11 +2,15 @@
 
 use std::error::Error;
 
+use alloy_network::{Ethereum, Network};
+use reth_rpc_eth_types::EthApiError;
+use reth_rpc_types::Rich;
+
 use crate::{AsEthApiError, FromEthApiError, FromEvmError};
 
 /// Network specific `eth` API types.
-pub trait EthApiTypes: Send + Sync {
-    /// Extension of [`EthApiError`](reth_rpc_eth_types::EthApiError), with network specific errors.
+pub trait EthApiTypes: Send + Sync + Clone {
+    /// Extension of [`EthApiError`], with network specific errors.
     type Error: Into<jsonrpsee_types::error::ErrorObject<'static>>
         + FromEthApiError
         + AsEthApiError
@@ -14,4 +18,17 @@ pub trait EthApiTypes: Send + Sync {
         + Error
         + Send
         + Sync;
+    /// Blockchain primitive types, specific to network, e.g. block and transaction.
+    type NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>;
+}
+
+impl EthApiTypes for () {
+    type Error = EthApiError;
+    type NetworkTypes = Ethereum;
 }
+
+/// Adapter for network specific transaction type.
+pub type Transaction<T> = <T as Network>::TransactionResponse;
+
+/// Adapter for network specific block type.
+pub type Block<T> = Rich<reth_rpc_types::Block<Transaction<T>>>;
diff --git a/crates/rpc/rpc-eth-api/src/lib.rs b/crates/rpc/rpc-eth-api/src/lib.rs
index c707a94eef4f..39bfb0d629ea 100644
--- a/crates/rpc/rpc-eth-api/src/lib.rs
+++ b/crates/rpc/rpc-eth-api/src/lib.rs
@@ -23,7 +23,7 @@ pub use core::{EthApiServer, FullEthApiServer};
 pub use filter::EthFilterApiServer;
 pub use helpers::{
     error::{AsEthApiError, FromEthApiError, FromEvmError, IntoEthApiError},
-    types::EthApiTypes,
+    types::{Block, EthApiTypes, Transaction},
 };
 pub use pubsub::EthPubSubApiServer;
 
diff --git a/crates/rpc/rpc-eth-api/src/pubsub.rs b/crates/rpc/rpc-eth-api/src/pubsub.rs
index 8de125152823..8282e6b6af64 100644
--- a/crates/rpc/rpc-eth-api/src/pubsub.rs
+++ b/crates/rpc/rpc-eth-api/src/pubsub.rs
@@ -1,11 +1,12 @@
 //! `eth_` RPC API for pubsub subscription.
 
+use alloy_json_rpc::RpcObject;
 use jsonrpsee::proc_macros::rpc;
 use reth_rpc_types::pubsub::{Params, SubscriptionKind};
 
 /// Ethereum pub-sub rpc interface.
 #[rpc(server, namespace = "eth")]
-pub trait EthPubSubApi {
+pub trait EthPubSubApi<T: RpcObject> {
     /// Create an ethereum subscription for the given params
     #[subscription(
         name = "subscribe" => "subscription",
diff --git a/crates/rpc/rpc-testing-util/Cargo.toml b/crates/rpc/rpc-testing-util/Cargo.toml
index 8ab37d1b18d0..19cef0b02de8 100644
--- a/crates/rpc/rpc-testing-util/Cargo.toml
+++ b/crates/rpc/rpc-testing-util/Cargo.toml
@@ -30,3 +30,4 @@ similar-asserts.workspace = true
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "rt"] }
 reth-rpc-eth-api.workspace = true
+jsonrpsee-http-client.workspace = true
diff --git a/crates/rpc/rpc-testing-util/src/debug.rs b/crates/rpc/rpc-testing-util/src/debug.rs
index c0151e2d1be2..532e9555f8ba 100644
--- a/crates/rpc/rpc-testing-util/src/debug.rs
+++ b/crates/rpc/rpc-testing-util/src/debug.rs
@@ -1,5 +1,11 @@
 //! Helpers for testing debug trace calls.
 
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
 use futures::{Stream, StreamExt};
 use jsonrpsee::core::client::Error as RpcError;
 use reth_primitives::{BlockId, TxHash, B256};
@@ -9,12 +15,7 @@ use reth_rpc_types::{
         common::TraceResult,
         geth::{GethDebugTracerType, GethDebugTracingOptions, GethTrace},
     },
-    TransactionRequest,
-};
-use std::{
-    future::Future,
-    pin::Pin,
-    task::{Context, Poll},
+    RichBlock, Transaction, TransactionRequest,
 };
 
 const NOOP_TRACER: &str = include_str!("../assets/noop-tracer.js");
@@ -76,7 +77,7 @@ pub trait DebugApiExt {
 
 impl<T> DebugApiExt for T
 where
-    T: EthApiClient + DebugApiClient + Sync,
+    T: EthApiClient<Transaction, RichBlock> + DebugApiClient + Sync,
 {
     type Provider = T;
 
diff --git a/crates/rpc/rpc-testing-util/tests/it/trace.rs b/crates/rpc/rpc-testing-util/tests/it/trace.rs
index 029e9fbbc8b5..4d1234e1ae26 100644
--- a/crates/rpc/rpc-testing-util/tests/it/trace.rs
+++ b/crates/rpc/rpc-testing-util/tests/it/trace.rs
@@ -1,11 +1,14 @@
+use std::{collections::HashSet, time::Instant};
+
 use futures::StreamExt;
 use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee_http_client::HttpClient;
 use reth_rpc_api_testing_util::{debug::DebugApiExt, trace::TraceApiExt, utils::parse_env_url};
 use reth_rpc_eth_api::EthApiClient;
-use reth_rpc_types::trace::{
-    filter::TraceFilter, parity::TraceType, tracerequest::TraceCallRequest,
+use reth_rpc_types::{
+    trace::{filter::TraceFilter, parity::TraceType, tracerequest::TraceCallRequest},
+    RichBlock, Transaction,
 };
-use std::{collections::HashSet, time::Instant};
 
 /// This is intended to be run locally against a running node.
 ///
@@ -106,7 +109,12 @@ async fn debug_trace_block_entire_chain() {
     let url = url.unwrap();
 
     let client = HttpClientBuilder::default().build(url).unwrap();
-    let current_block: u64 = client.block_number().await.unwrap().try_into().unwrap();
+    let current_block: u64 =
+        <HttpClient as EthApiClient<Transaction, RichBlock>>::block_number(&client)
+            .await
+            .unwrap()
+            .try_into()
+            .unwrap();
     let range = 0..=current_block;
     let mut stream = client.debug_trace_block_buffered_unordered(range, None, 20);
     let now = Instant::now();
diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml
index 5661c1f724f2..5c0b1c68657e 100644
--- a/crates/rpc/rpc/Cargo.toml
+++ b/crates/rpc/rpc/Cargo.toml
@@ -41,6 +41,7 @@ alloy-dyn-abi.workspace = true
 alloy-rlp.workspace = true
 alloy-primitives.workspace = true
 alloy-genesis.workspace = true
+alloy-network.workspace = true
 revm = { workspace = true, features = [
     "optional_block_gas_limit",
     "optional_eip3607",
diff --git a/crates/rpc/rpc/src/engine.rs b/crates/rpc/rpc/src/engine.rs
index 71d4ff94130e..4839f7f83976 100644
--- a/crates/rpc/rpc/src/engine.rs
+++ b/crates/rpc/rpc/src/engine.rs
@@ -1,11 +1,13 @@
+use alloy_network::Network;
 use jsonrpsee::core::RpcResult as Result;
 use reth_primitives::{Address, BlockId, BlockNumberOrTag, Bytes, B256, U256, U64};
 use reth_rpc_api::{EngineEthApiServer, EthApiServer, EthFilterApiServer};
 /// Re-export for convenience
 pub use reth_rpc_engine_api::EngineApi;
+use reth_rpc_eth_api::{Block, EthApiTypes, Transaction};
 use reth_rpc_types::{
     state::StateOverride, BlockOverrides, EIP1186AccountProofResponse, Filter, JsonStorageKey, Log,
-    RichBlock, SyncStatus, TransactionRequest,
+    SyncStatus, TransactionRequest,
 };
 use tracing_futures::Instrument;
 
@@ -33,8 +35,9 @@ impl<Eth, EthFilter> EngineEthApi<Eth, EthFilter> {
 #[async_trait::async_trait]
 impl<Eth, EthFilter> EngineEthApiServer for EngineEthApi<Eth, EthFilter>
 where
-    Eth: EthApiServer,
-    EthFilter: EthFilterApiServer,
+    Eth: EthApiServer<Transaction<Eth::NetworkTypes>, Block<Eth::NetworkTypes>> + EthApiTypes,
+    Eth::NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
+    EthFilter: EthFilterApiServer<reth_rpc_types::Transaction>,
 {
     /// Handler for: `eth_syncing`
     fn syncing(&self) -> Result<SyncStatus> {
@@ -77,7 +80,11 @@ where
     }
 
     /// Handler for: `eth_getBlockByHash`
-    async fn block_by_hash(&self, hash: B256, full: bool) -> Result<Option<RichBlock>> {
+    async fn block_by_hash(
+        &self,
+        hash: B256,
+        full: bool,
+    ) -> Result<Option<Block<Eth::NetworkTypes>>> {
         self.eth.block_by_hash(hash, full).instrument(engine_span!()).await
     }
 
@@ -86,7 +93,7 @@ where
         &self,
         number: BlockNumberOrTag,
         full: bool,
-    ) -> Result<Option<RichBlock>> {
+    ) -> Result<Option<Block<Eth::NetworkTypes>>> {
         self.eth.block_by_number(number, full).instrument(engine_span!()).await
     }
 
diff --git a/crates/rpc/rpc/src/eth/core.rs b/crates/rpc/rpc/src/eth/core.rs
index 231b6a72dbfd..75a6785e76ba 100644
--- a/crates/rpc/rpc/src/eth/core.rs
+++ b/crates/rpc/rpc/src/eth/core.rs
@@ -3,6 +3,7 @@
 
 use std::sync::Arc;
 
+use alloy_network::Ethereum;
 use derive_more::Deref;
 use reth_node_api::{BuilderProvider, FullNodeComponents};
 use reth_primitives::{BlockNumberOrTag, U256};
@@ -36,6 +37,12 @@ pub struct EthApi<Provider, Pool, Network, EvmConfig> {
     pub(super) inner: Arc<EthApiInner<Provider, Pool, Network, EvmConfig>>,
 }
 
+impl<Provider, Pool, Network, EvmConfig> Clone for EthApi<Provider, Pool, Network, EvmConfig> {
+    fn clone(&self) -> Self {
+        Self { inner: self.inner.clone() }
+    }
+}
+
 impl<Provider, Pool, Network, EvmConfig> EthApi<Provider, Pool, Network, EvmConfig>
 where
     Provider: BlockReaderIdExt,
@@ -119,6 +126,7 @@ where
     Self: Send + Sync,
 {
     type Error = EthApiError;
+    type NetworkTypes = Ethereum;
 }
 
 impl<Provider, Pool, Network, EvmConfig> std::fmt::Debug
@@ -129,12 +137,6 @@ impl<Provider, Pool, Network, EvmConfig> std::fmt::Debug
     }
 }
 
-impl<Provider, Pool, Network, EvmConfig> Clone for EthApi<Provider, Pool, Network, EvmConfig> {
-    fn clone(&self) -> Self {
-        Self { inner: Arc::clone(&self.inner) }
-    }
-}
-
 impl<Provider, Pool, Network, EvmConfig> SpawnBlocking
     for EthApi<Provider, Pool, Network, EvmConfig>
 where
@@ -509,7 +511,7 @@ mod tests {
     /// Invalid block range
     #[tokio::test]
     async fn test_fee_history_empty() {
-        let response = <EthApi<_, _, _, _> as EthApiServer>::fee_history(
+        let response = <EthApi<_, _, _, _> as EthApiServer<_, _>>::fee_history(
             &build_test_eth_api(NoopProvider::default()),
             U64::from(1),
             BlockNumberOrTag::Latest,
@@ -531,7 +533,7 @@ mod tests {
         let (eth_api, _, _) =
             prepare_eth_api(newest_block, oldest_block, block_count, MockEthProvider::default());
 
-        let response = <EthApi<_, _, _, _> as EthApiServer>::fee_history(
+        let response = <EthApi<_, _, _, _> as EthApiServer<_, _>>::fee_history(
             &eth_api,
             U64::from(newest_block + 1),
             newest_block.into(),
@@ -554,7 +556,7 @@ mod tests {
         let (eth_api, _, _) =
             prepare_eth_api(newest_block, oldest_block, block_count, MockEthProvider::default());
 
-        let response = <EthApi<_, _, _, _> as EthApiServer>::fee_history(
+        let response = <EthApi<_, _, _, _> as EthApiServer<_, _>>::fee_history(
             &eth_api,
             U64::from(1),
             (newest_block + 1000).into(),
@@ -577,7 +579,7 @@ mod tests {
         let (eth_api, _, _) =
             prepare_eth_api(newest_block, oldest_block, block_count, MockEthProvider::default());
 
-        let response = <EthApi<_, _, _, _> as EthApiServer>::fee_history(
+        let response = <EthApi<_, _, _, _> as EthApiServer<_, _>>::fee_history(
             &eth_api,
             U64::from(0),
             newest_block.into(),
diff --git a/crates/rpc/rpc/src/eth/filter.rs b/crates/rpc/rpc/src/eth/filter.rs
index ef26a5781de5..a809f76aea39 100644
--- a/crates/rpc/rpc/src/eth/filter.rs
+++ b/crates/rpc/rpc/src/eth/filter.rs
@@ -219,7 +219,7 @@ where
 }
 
 #[async_trait]
-impl<Provider, Pool> EthFilterApiServer for EthFilter<Provider, Pool>
+impl<Provider, Pool> EthFilterApiServer<reth_rpc_types::Transaction> for EthFilter<Provider, Pool>
 where
     Provider: BlockReader + BlockIdReader + EvmEnvProvider + 'static,
     Pool: TransactionPool + 'static,
diff --git a/crates/rpc/rpc/src/eth/helpers/block.rs b/crates/rpc/rpc/src/eth/helpers/block.rs
index 2ce6c7ed2e93..92f8d5e0344d 100644
--- a/crates/rpc/rpc/src/eth/helpers/block.rs
+++ b/crates/rpc/rpc/src/eth/helpers/block.rs
@@ -12,7 +12,7 @@ where
     Provider: HeaderProvider,
 {
     #[inline]
-    fn provider(&self) -> impl reth_provider::HeaderProvider {
+    fn provider(&self) -> impl HeaderProvider {
         self.inner.provider()
     }
 }
diff --git a/crates/rpc/rpc/src/eth/pubsub.rs b/crates/rpc/rpc/src/eth/pubsub.rs
index 426923dc4458..5509f3e933a3 100644
--- a/crates/rpc/rpc/src/eth/pubsub.rs
+++ b/crates/rpc/rpc/src/eth/pubsub.rs
@@ -68,7 +68,7 @@ impl<Provider, Pool, Events, Network> EthPubSub<Provider, Pool, Events, Network>
 }
 
 #[async_trait::async_trait]
-impl<Provider, Pool, Events, Network> EthPubSubApiServer
+impl<Provider, Pool, Events, Network> EthPubSubApiServer<reth_rpc_types::Transaction>
     for EthPubSub<Provider, Pool, Events, Network>
 where
     Provider: BlockReader + EvmEnvProvider + Clone + 'static,
diff --git a/crates/rpc/rpc/src/otterscan.rs b/crates/rpc/rpc/src/otterscan.rs
index bf8279719fec..3b13165b091f 100644
--- a/crates/rpc/rpc/src/otterscan.rs
+++ b/crates/rpc/rpc/src/otterscan.rs
@@ -1,9 +1,10 @@
+use alloy_network::Network;
 use alloy_primitives::Bytes;
 use async_trait::async_trait;
 use jsonrpsee::core::RpcResult;
 use reth_primitives::{Address, BlockNumberOrTag, TxHash, B256, U256};
 use reth_rpc_api::{EthApiServer, OtterscanServer};
-use reth_rpc_eth_api::helpers::TraceExt;
+use reth_rpc_eth_api::{helpers::TraceExt, Block, EthApiTypes, Transaction};
 use reth_rpc_eth_types::EthApiError;
 use reth_rpc_server_types::result::internal_rpc_err;
 use reth_rpc_types::{
@@ -59,7 +60,11 @@ impl<Eth> OtterscanApi<Eth> {
 #[async_trait]
 impl<Eth> OtterscanServer for OtterscanApi<Eth>
 where
-    Eth: EthApiServer + TraceExt + 'static,
+    Eth: EthApiServer<Transaction<Eth::NetworkTypes>, Block<Eth::NetworkTypes>>
+        + EthApiTypes
+        + TraceExt
+        + 'static,
+    Eth::NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
 {
     /// Handler for `{ots,erigon}_getHeaderByNumber`
     async fn get_header_by_number(&self, block_number: u64) -> RpcResult<Option<Header>> {