chore(op): type safety in computation of op tx metadata

crates/ethereum-forks/src/hardforks/optimism.rs

@@ -8,11 +8,15 @@ pub trait OptimismHardforks: EthereumHardforks {
         self.fork(OptimismHardfork::Bedrock).active_at_block(block_number)
     }
 
-    /// Convenience method to check if [`Ecotone`](OptimismHardfork::Ecotone) is active at a given
-    /// timestamp.
+    /// Returns `true` if [`Ecotone`](OptimismHardfork::Ecotone) is active at given block timestamp.
     fn is_ecotone_active_at_timestamp(&self, timestamp: u64) -> bool {
         self.fork(OptimismHardfork::Ecotone).active_at_timestamp(timestamp)
     }
+
+    /// Returns `true` if [`Ecotone`](OptimismHardfork::Ecotone) is active at given block timestamp.
+    fn is_fjord_active_at_timestamp(&self, timestamp: u64) -> bool {
+        self.fork(OptimismHardfork::Ecotone).active_at_timestamp(timestamp)
+    }
 }
 
 impl OptimismHardforks for ChainHardforks {}

crates/optimism/rpc/Cargo.toml

@@ -33,6 +33,7 @@ reth-chainspec.workspace = true
 alloy-primitives.workspace = true
 op-alloy-network.workspace = true
 revm.workspace = true
+op-alloy-rpc-types.workspace = true
 
 # async
 parking_lot.workspace = true
@@ -47,6 +48,9 @@ serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 
+[dev-dependencies]
+reth-optimism-chainspec.workspace = true
+
 [features]
 optimism = [
     "reth-evm-optimism/optimism",

crates/optimism/rpc/src/error.rs

@@ -1,5 +1,6 @@
 //! RPC errors specific to OP.
 
+use reth_evm_optimism::OptimismBlockExecutionError;
 use reth_primitives::revm_primitives::{InvalidTransaction, OptimismInvalidTransaction};
 use reth_rpc_eth_api::AsEthApiError;
 use reth_rpc_eth_types::EthApiError;
@@ -12,6 +13,9 @@ pub enum OpEthApiError {
     /// L1 ethereum error.
     #[error(transparent)]
     Eth(#[from] EthApiError),
+    /// EVM error originating from invalid optimism data.
+    #[error(transparent)]
+    Evm(#[from] OptimismBlockExecutionError),
     /// Thrown when calculating L1 gas fee.
     #[error("failed to calculate l1 gas fee")]
     L1BlockFeeError,
@@ -35,11 +39,10 @@ impl AsEthApiError for OpEthApiError {
 impl From<OpEthApiError> for jsonrpsee_types::error::ErrorObject<'static> {
     fn from(err: OpEthApiError) -> Self {
         match err {
-            OpEthApiError::Eth(err) => err.into(),
-            OpEthApiError::L1BlockFeeError | OpEthApiError::L1BlockGasError => {
-                internal_rpc_err(err.to_string())
-            }
-            OpEthApiError::InvalidTransaction(err) => err.into(),
+            OpEthApiError::Eth(_) | OpEthApiError::InvalidTransaction(_) => err.into(),
+            OpEthApiError::Evm(_) |
+            OpEthApiError::L1BlockFeeError |
+            OpEthApiError::L1BlockGasError => internal_rpc_err(err.to_string()),
         }
     }
 }

crates/optimism/rpc/src/eth/block.rs

@@ -1,6 +1,7 @@
-//! Loads and formats OP block RPC response.   
+//! Loads and formats OP block RPC response.
 
-use reth_node_api::FullNodeComponents;
+use reth_chainspec::ChainSpec;
+use reth_node_api::{FullNodeComponents, NodeTypes};
 use reth_primitives::TransactionMeta;
 use reth_provider::{BlockReaderIdExt, HeaderProvider};
 use reth_rpc_eth_api::{
@@ -13,13 +14,12 @@ use reth_rpc_eth_api::{
 use reth_rpc_eth_types::{EthStateCache, ReceiptBuilder};
 use reth_rpc_types::{AnyTransactionReceipt, BlockId};
 
-use crate::{op_receipt_fields, OpEthApi, OpEthApiError};
+use crate::{OpEthApi, OpEthApiError};
 
 impl<N> EthBlocks for OpEthApi<N>
 where
-    Self: LoadBlock + EthApiSpec + LoadTransaction,
-    Self::Error: From<OpEthApiError>,
-    N: FullNodeComponents,
+    Self: EthApiSpec + LoadBlock<Error = OpEthApiError> + LoadTransaction,
+    N: FullNodeComponents<Types: NodeTypes<ChainSpec = ChainSpec>>,
 {
     #[inline]
     fn provider(&self) -> impl HeaderProvider {
@@ -41,14 +41,15 @@ where
             let timestamp = block.timestamp;
             let block = block.unseal();
 
-            let l1_block_info = reth_evm_optimism::extract_l1_info(&block).ok();
+            let l1_block_info =
+                reth_evm_optimism::extract_l1_info(&block).map_err(OpEthApiError::from)?;
 
             let receipts = block
                 .body
                 .into_iter()
                 .zip(receipts.iter())
                 .enumerate()
-                .map(|(idx, (ref tx, receipt))| {
+                .map(|(idx, (ref tx, receipt))| -> Result<_, _> {
                     let meta = TransactionMeta {
                         tx_hash: tx.hash,
                         index: idx as u64,
@@ -59,14 +60,13 @@ where
                         timestamp,
                     };
 
-                    let optimism_tx_meta =
-                        self.build_op_tx_meta(tx, l1_block_info.clone(), timestamp)?;
+                    let op_tx_meta =
+                        self.build_op_receipt_meta(tx, l1_block_info.clone(), receipt)?;
 
-                    ReceiptBuilder::new(tx, meta, receipt, &receipts)
-                        .map(|builder| {
-                            op_receipt_fields(builder, tx, receipt, optimism_tx_meta).build()
-                        })
-                        .map_err(Self::Error::from_eth_err)
+                    Ok(ReceiptBuilder::new(tx, meta, receipt, &receipts)
+                        .map_err(Self::Error::from_eth_err)?
+                        .add_other_fields(op_tx_meta.into())
+                        .build())
                 })
                 .collect::<Result<Vec<_>, Self::Error>>();
             return receipts.map(Some)

crates/optimism/rpc/src/eth/mod.rs

@@ -10,7 +10,6 @@ pub mod rpc;
 
 use std::{fmt, sync::Arc};
 
-use crate::eth::rpc::SequencerClient;
 use alloy_primitives::U256;
 use op_alloy_network::AnyNetwork;
 use reth_chainspec::ChainSpec;
@@ -19,8 +18,8 @@ use reth_network_api::NetworkInfo;
 use reth_node_api::{BuilderProvider, FullNodeComponents, FullNodeTypes, NodeTypes};
 use reth_node_builder::EthApiBuilderCtx;
 use reth_provider::{
-    BlockIdReader, BlockNumReader, BlockReaderIdExt, ChainSpecProvider, HeaderProvider,
-    StageCheckpointReader, StateProviderFactory,
+    BlockIdReader, BlockNumReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider,
+    HeaderProvider, StageCheckpointReader, StateProviderFactory,
 };
 use reth_rpc::eth::{core::EthApiInner, DevSigner};
 use reth_rpc_eth_api::{
@@ -37,7 +36,7 @@ use reth_tasks::{
 };
 use reth_transaction_pool::TransactionPool;
 
-use crate::OpEthApiError;
+use crate::{eth::rpc::SequencerClient, OpEthApiError};
 
 /// Adapter for [`EthApiInner`], which holds all the data required to serve core `eth_` API.
 pub type EthApiNodeBackend<N> = EthApiInner<
@@ -63,7 +62,12 @@ pub struct OpEthApi<N: FullNodeComponents> {
     sequencer_client: Arc<parking_lot::RwLock<Option<SequencerClient>>>,
 }
 
-impl<N: FullNodeComponents> OpEthApi<N> {
+impl<N> OpEthApi<N>
+where
+    N: FullNodeComponents<
+        Provider: BlockReaderIdExt + ChainSpecProvider + CanonStateSubscriptions + Clone + 'static,
+    >,
+{
     /// Creates a new instance for given context.
     #[allow(clippy::type_complexity)]
     pub fn with_spawner(ctx: &EthApiBuilderCtx<N>) -> Self {

crates/optimism/rpc/src/eth/pending_block.rs

@@ -1,4 +1,4 @@
-//! Loads OP pending block for a RPC response.   
+//! Loads OP pending block for a RPC response.
 
 use reth_chainspec::ChainSpec;
 use reth_evm::ConfigureEvm;