feat(primitives): reuse op-alloy-protocol channel and block types (#499)

Cargo.toml

@@ -36,7 +36,7 @@ codegen-units = 1
 lto = "fat"
 
 [patch.crates-io]
-op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "rf/feat/export-frame-consts" }
+op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "rf/fix/use-native-u64" }
 
 [workspace.dependencies]
 # Workspace

crates/derive/src/batch/mod.rs

@@ -2,7 +2,7 @@
 //! [SingleBatch].
 
 use alloy_rlp::{Buf, Decodable};
-use kona_primitives::{block::BlockInfo, L2BlockInfo, RollupConfig};
+use kona_primitives::{BlockInfo, L2BlockInfo, RollupConfig};
 
 use crate::{errors::DecodeError, traits::L2ChainProvider};
 

crates/derive/src/stages/channel_bank.rs

@@ -12,7 +12,7 @@ use anyhow::anyhow;
 use async_trait::async_trait;
 use core::fmt::Debug;
 use hashbrown::HashMap;
-use kona_primitives::{BlockInfo, Channel, ChannelID, Frame, RollupConfig, SystemConfig};
+use kona_primitives::{BlockInfo, Channel, ChannelId, Frame, RollupConfig, SystemConfig};
 use tracing::{trace, warn};
 
 /// Provides frames for the [ChannelBank] stage.
@@ -43,9 +43,9 @@ where
     /// The rollup configuration.
     cfg: Arc<RollupConfig>,
     /// Map of channels by ID.
-    channels: HashMap<ChannelID, Channel>,
+    channels: HashMap<ChannelId, Channel>,
     /// Channels in FIFO order.
-    channel_queue: VecDeque<ChannelID>,
+    channel_queue: VecDeque<ChannelId>,
     /// The previous stage of the derivation pipeline.
     prev: P,
 }
@@ -192,7 +192,7 @@ where
         self.channels.remove(&channel_id);
         self.channel_queue.remove(index);
 
-        frame_data.map_err(StageError::Custom)
+        frame_data.ok_or_else(|| StageError::Custom(anyhow!("Channel data is empty")))
     }
 }
 

crates/primitives/Cargo.toml

@@ -11,7 +11,6 @@ homepage.workspace = true
 [dependencies]
 # General
 anyhow.workspace = true
-hashbrown.workspace = true
 
 # Alloy
 alloy-eips.workspace = true

crates/primitives/src/block.rs

@@ -1,71 +1,14 @@
 //! This module contains the various Block types.
 
-use crate::BlockID;
 use alloc::vec::Vec;
 use alloy_consensus::{Header, TxEnvelope};
 use alloy_eips::eip4895::Withdrawal;
-use alloy_primitives::B256;
 use alloy_rlp::{RlpDecodable, RlpEncodable};
 use op_alloy_consensus::OpTxEnvelope;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-/// Block Header Info
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, Default)]
-pub struct BlockInfo {
-    /// The block hash
-    pub hash: B256,
-    /// The block number
-    pub number: u64,
-    /// The parent block hash
-    pub parent_hash: B256,
-    /// The block timestamp
-    pub timestamp: u64,
-}
-
-impl BlockInfo {
-    /// Instantiates a new [BlockInfo].
-    pub fn new(hash: B256, number: u64, parent_hash: B256, timestamp: u64) -> Self {
-        Self { hash, number, parent_hash, timestamp }
-    }
-
-    /// Returns the block ID.
-    pub fn id(&self) -> BlockID {
-        BlockID { hash: self.hash, number: self.number }
-    }
-}
-
-impl core::fmt::Display for BlockInfo {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        write!(
-            f,
-            "BlockInfo {{ hash: {}, number: {}, parent_hash: {}, timestamp: {} }}",
-            self.hash, self.number, self.parent_hash, self.timestamp
-        )
-    }
-}
-
-/// L2 Block Header Info
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq, Default)]
-pub struct L2BlockInfo {
-    /// The base [BlockInfo]
-    pub block_info: BlockInfo,
-    /// The L1 origin [BlockID]
-    pub l1_origin: BlockID,
-    /// The sequence number of the L2 block
-    pub seq_num: u64,
-}
-
-impl L2BlockInfo {
-    /// Instantiates a new [L2BlockInfo].
-    pub fn new(block_info: BlockInfo, l1_origin: BlockID, seq_num: u64) -> Self {
-        Self { block_info, l1_origin, seq_num }
-    }
-}
-
 /// The Block Kind
 ///
 /// The block kinds are: