feat: block data (#54)

* feat: add extra data migration

* feat: add extra data to db operations

* feat: block data provider

* fix: constants

* feat: move fcs to engine driver

* feat: revert fcs to node manager

* feat: point to reth

* feat: remove BlockDataProvider

* feat: update error

* feat: bump reth

* fix: answer comments

* fix: lints

* fix: include block data in binary

* empty

Author: greged93

Cargo.lock

@@ -179,6 +179,8 @@ parking_lot = "0.12"
 rand = { version = "0.9" }
 reqwest = "0.12"
 secp256k1 = { version = "0.29", default-features = false }
+serde = { version = "1.0" }
+sea-orm = { version = "1.1.0" }
 thiserror = "2.0"
 tokio = { version = "1.39", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }

Cargo.toml

@@ -48,7 +48,6 @@ scroll-network.workspace = true
 scroll-wire.workspace = true
 
 # rollup-node
-rollup-node-indexer.workspace = true
 rollup-node-manager.workspace = true
 rollup-node-providers.workspace = true
 rollup-node-watcher.workspace = true

bin/rollup/Cargo.toml

@@ -11,10 +11,12 @@ workspace = true
 
 [dependencies]
 # alloy
+alloy-eips.workspace = true
 alloy-primitives.workspace = true
 
 # scroll-alloy
 scroll-alloy-consensus.workspace = true
+scroll-alloy-rpc-types-engine.workspace = true
 
 # scroll
 scroll-migration = { workspace = true, optional = true }
@@ -24,7 +26,7 @@ rollup-node-primitives.workspace = true
 async-trait.workspace = true
 auto_impl.workspace = true
 futures.workspace = true
-sea-orm = { version = "1.1.0", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] }
+sea-orm = { workspace = true, features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["macros", "sync"] }
 tracing.workspace = true

crates/database/db/Cargo.toml

@@ -126,6 +126,16 @@ mod test {
         assert_eq!(l1_message, l1_message_from_db);
     }
 
+    #[tokio::test]
+    async fn test_database_block_data_seed() {
+        // Setup the test database.
+        let db = setup_test_db().await;
+
+        // db should contain the seeded data after migration.
+        let data = db.get_block_data(0.into()).await.unwrap();
+        assert!(data.is_some());
+    }
+
     #[tokio::test]
     async fn test_database_tx() {
         // Setup the test database.

crates/database/db/src/db.rs

@@ -1,3 +1,4 @@
+use alloy_eips::BlockId;
 use alloy_primitives::B256;
 
 /// The error type for database operations.
@@ -9,4 +10,7 @@ pub enum DatabaseError {
     /// A batch was not found in the database.
     #[error("batch with hash [{0}] not found in database")]
     BatchNotFound(B256),
+    /// The block was not found in database.
+    #[error("no block for id {0}")]
+    BlockNotFound(BlockId),
 }

crates/database/db/src/error.rs

@@ -0,0 +1,30 @@
+use alloy_primitives::U256;
+use scroll_alloy_rpc_types_engine::BlockDataHint;
+use sea_orm::entity::prelude::*;
+
+/// A database model that represents extra data for the block.
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "block_data")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    number: i64,
+    hash: Vec<u8>,
+    extra_data: Vec<u8>,
+    difficulty: Vec<u8>,
+}
+
+/// The relation for the extra data model.
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+/// The active model behavior for the extra data model.
+impl ActiveModelBehavior for ActiveModel {}
+
+impl From<Model> for BlockDataHint {
+    fn from(value: Model) -> Self {
+        Self {
+            extra_data: value.extra_data.into(),
+            difficulty: U256::from_be_slice(value.difficulty.as_ref()),
+        }
+    }
+}

crates/database/db/src/models/block_data.rs

@@ -1,5 +1,8 @@
 /// This module contains the batch commit database model.
 pub mod batch_commit;
 
+/// This module contains the block data database model.
+pub mod block_data;
+
 /// This module contains the L1 message database model.
 pub mod l1_message;

crates/database/db/src/models/mod.rs

@@ -1,9 +1,11 @@
 use super::{models, DatabaseError};
 use crate::DatabaseConnectionProvider;
 
+use alloy_eips::{BlockId, BlockNumberOrTag};
 use alloy_primitives::B256;
 use futures::{Stream, StreamExt};
 use rollup_node_primitives::{BatchCommitData, L1MessageWithBlockNumber};
+use scroll_alloy_rpc_types_engine::BlockDataHint;
 use sea_orm::{ActiveModelTrait, ColumnTrait, DbErr, EntityTrait, QueryFilter, Set};
 
 /// The [`DatabaseOperations`] trait provides methods for interacting with the database.
@@ -125,6 +127,25 @@ pub trait DatabaseOperations: DatabaseConnectionProvider {
             .await?
             .map(|res| res.map(Into::into)))
     }
+
+    /// Get the extra data for the provided [`BlockId`].
+    async fn get_block_data(
+        &self,
+        block_id: BlockId,
+    ) -> Result<Option<BlockDataHint>, DatabaseError> {
+        let filter = match block_id {
+            BlockId::Hash(hash) => models::block_data::Column::Hash.eq(hash.block_hash.to_vec()),
+            BlockId::Number(BlockNumberOrTag::Number(number)) => {
+                models::block_data::Column::Number.eq(number as i64)
+            }
+            x => return Err(DatabaseError::BlockNotFound(x)),
+        };
+        Ok(models::block_data::Entity::find()
+            .filter(filter)
+            .one(self.get_connection())
+            .await
+            .map(|x| x.map(Into::into))?)
+    }
 }
 
 impl<T> DatabaseOperations for T where T: DatabaseConnectionProvider {}

crates/database/db/src/operations.rs

@@ -9,7 +9,11 @@ name = "migration"
 path = "src/lib.rs"
 
 [dependencies]
+alloy-primitives = { workspace = true, features = ["serde"] }
 async-std = { version = "1", features = ["attributes", "tokio1"] }
+csv = "1.3.1"
+sea-orm = { workspace = true, features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] }
+serde = { workspace = true, features = ["derive"] }
 tracing.workspace = true
 
 [dependencies.sea-orm-migration]