More lax workaround for rustdocs bug

Author: emhane

Diff for: crates/optimism/rpc/src/eth/block.rs

@@ -4,8 +4,10 @@ use alloy_consensus::{transaction::TransactionMeta, BlockHeader};
 use alloy_rpc_types_eth::{BlockId, Header};
 use op_alloy_rpc_types::OpTransactionReceipt;
 use reth_chainspec::ChainSpecProvider;
+use reth_node_api::NodePrimitives;
 use reth_optimism_chainspec::OpChainSpec;
-use reth_primitives_traits::{HeaderTy, SignedTransaction};
+use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
+use reth_primitives_traits::{BlockBody as _, HeaderTy, SignedTransaction};
 use reth_rpc_eth_api::{
     helpers::{EthBlocks, LoadBlock, LoadPendingBlock, LoadReceipt, SpawnBlocking},
     types::RpcTypes,
@@ -18,7 +20,10 @@ use super::OpNodeCore;
 
 impl<N> EthBlocks for OpEthApi<N>
 where
-    N: OpNodeCore<Provider: ChainSpecProvider<ChainSpec = OpChainSpec>>,
+    N: OpNodeCore<
+        Primitives: NodePrimitives<Receipt = OpReceipt, SignedTx = OpTransactionSigned>,
+        Provider: ChainSpecProvider<ChainSpec = OpChainSpec>,
+    >,
     Self: LoadBlock<
         Error = OpEthApiError,
         Primitives = N::Primitives,
@@ -45,6 +50,7 @@ where
             return block
                 .body()
                 .transactions()
+                .iter()
                 .zip(receipts.iter())
                 .enumerate()
                 .map(|(idx, (tx, receipt))| -> Result<_, _> {

Diff for: crates/optimism/rpc/src/eth/mod.rs

@@ -15,10 +15,10 @@ use reth_chain_state::CanonStateSubscriptions;
 use reth_chainspec::{ChainSpecProvider, EthChainSpec, EthereumHardforks};
 use reth_evm::ConfigureEvm;
 use reth_network_api::NetworkInfo;
-use reth_node_api::{FullNodeComponents, NodeTypes, PrimitivesTy};
+use reth_node_api::{FullNodeComponents, NodePrimitives, NodeTypes, PrimitivesTy};
 use reth_node_builder::rpc::{EthApiBuilder, EthApiCtx};
-use reth_optimism_primitives::{OpBlock, OpPrimitives, OpReceipt, OpTransactionSigned};
-use reth_primitives_traits::{BlockTy, ReceiptTy, TxTy};
+use reth_optimism_primitives::OpPrimitives;
+use reth_primitives_traits::{BlockTy, HeaderTy, ReceiptTy, TxTy};
 use reth_rpc::eth::{core::EthApiInner, DevSigner};
 use reth_rpc_eth_api::{
     helpers::{
@@ -51,24 +51,24 @@ pub type EthApiNodeBackend<N> = EthApiInner<
 /// A helper trait with requirements for [`RpcNodeCore`] to be used in [`OpEthApi`].
 pub trait OpNodeCore:
     RpcNodeCore<
-    Primitives = OpPrimitives,
+    Primitives: NodePrimitives,
     Provider: BlockReader<
-        Block = OpBlock,
-        Header = alloy_consensus::Header,
-        Transaction = OpTransactionSigned,
-        Receipt = OpReceipt,
+        Block = BlockTy<Self::Primitives>,
+        Header = HeaderTy<Self::Primitives>,
+        Transaction = TxTy<Self::Primitives>,
+        Receipt = ReceiptTy<Self::Primitives>,
     >,
 >
 {
 }
 impl<T> OpNodeCore for T where
     T: RpcNodeCore<
-        Primitives = OpPrimitives,
+        Primitives: NodePrimitives,
         Provider: BlockReader<
-            Block = OpBlock,
-            Header = alloy_consensus::Header,
-            Transaction = OpTransactionSigned,
-            Receipt = OpReceipt,
+            Block = BlockTy<Self::Primitives>,
+            Header = HeaderTy<Self::Primitives>,
+            Transaction = TxTy<Self::Primitives>,
+            Receipt = ReceiptTy<Self::Primitives>,
         >,
     >
 {

Diff for: crates/optimism/rpc/src/eth/pending_block.rs

@@ -37,7 +37,7 @@ where
             prev_randao: B256::random(),
             gas_limit: parent.gas_limit(),
             parent_beacon_block_root: parent.parent_beacon_block_root(),
-            extra_data: parent.extra_data.clone(),
+            extra_data: parent.extra_data().clone(),
         })
     }
 

Diff for: crates/optimism/rpc/src/eth/receipt.rs

@@ -6,6 +6,7 @@ use alloy_rpc_types_eth::{Log, TransactionReceipt};
 use op_alloy_consensus::{OpDepositReceipt, OpDepositReceiptWithBloom, OpReceiptEnvelope};
 use op_alloy_rpc_types::{L1BlockInfo, OpTransactionReceipt, OpTransactionReceiptFields};
 use reth_chainspec::ChainSpecProvider;
+use reth_node_api::NodePrimitives;
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_evm::RethL1BlockInfo;
 use reth_optimism_forks::OpHardforks;
@@ -20,7 +21,10 @@ use super::OpNodeCore;
 
 impl<N> LoadReceipt for OpEthApi<N>
 where
-    N: OpNodeCore<Provider: ChainSpecProvider<ChainSpec = OpChainSpec>>,
+    N: OpNodeCore<
+        Primitives: NodePrimitives<Receipt = OpReceipt, SignedTx = OpTransactionSigned>,
+        Provider: ChainSpecProvider<ChainSpec = OpChainSpec>,
+    >,
     Self: RpcNodeCoreExt<Primitives = N::Primitives>,
 {
     async fn build_transaction_receipt(

Diff for: crates/optimism/rpc/src/eth/transaction.rs

@@ -5,6 +5,7 @@ use alloy_primitives::{Bytes, PrimitiveSignature as Signature, Sealable, Sealed,
 use alloy_rpc_types_eth::TransactionInfo;
 use op_alloy_consensus::OpTxEnvelope;
 use op_alloy_rpc_types::{OpTransactionRequest, Transaction};
+use reth_node_api::NodePrimitives;
 use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
 use reth_primitives_traits::TxTy;
 use reth_rpc_eth_api::{
@@ -72,7 +73,7 @@ where
 
 impl<N> TransactionCompat<OpTransactionSigned> for OpEthApi<N>
 where
-    N: OpNodeCore,
+    N: OpNodeCore<Primitives: NodePrimitives<Receipt = OpReceipt>>,
 {
     type Transaction = Transaction;
     type Error = OpEthApiError;