fix: eth66 serve signature

Cargo.toml

@@ -134,37 +134,37 @@ alloy-signer-local = { version = "1.0.13", default-features = false }
 alloy-transport = { version = "1.0.13", default-features = false }
 
 # scroll-alloy
-scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+scroll-alloy-consensus = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+scroll-alloy-hardforks = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+scroll-alloy-network = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+scroll-alloy-provider = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+scroll-alloy-rpc-types-engine = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 
 # reth
-reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git" }
-reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-node-core = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-builder = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tasks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-tracing = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-chainspec = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-e2e-test-utils = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature" }
+reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-network = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-network-api = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-node-core = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-primitives = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-provider = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-rpc-builder = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-tasks = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-tracing = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 
 # reth-scroll
-reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-scroll-chainspec = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-scroll-forks = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-scroll-node = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
+reth-scroll-primitives = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 
 # rollup node
 rollup-node = { path = "crates/node" }

crates/database/db/src/db.rs

@@ -10,7 +10,7 @@ use sea_orm::{Database as SeaOrmDatabase, DatabaseConnection, TransactionTrait};
 /// operations defined in [`crate::DatabaseOperations`]. Atomic operations can be performed using
 /// the [`Database::tx`] method which returns a [`DatabaseTransaction`] that also implements the
 /// [`DatabaseConnectionProvider`] trait and also the [`crate::DatabaseOperations`] trait.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Database {
     /// The underlying database connection.
     connection: DatabaseConnection,

crates/database/db/src/error.rs

@@ -16,4 +16,7 @@ pub enum DatabaseError {
     /// The L1 message was not found in database.
     #[error("L1 message at index [{0}] not found in database")]
     L1MessageNotFound(u64),
+    /// A generic error occurred.
+    #[error("parse signature error: {0}")]
+    ParseSignatureError(String),
 }

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

@@ -0,0 +1,47 @@
+use alloy_primitives::{Signature, B256};
+use sea_orm::{entity::prelude::*, ActiveValue};
+
+/// A database model that represents a block signature.
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "block_signature")]
+pub struct Model {
+    /// The block hash as a primary key.
+    #[sea_orm(primary_key)]
+    pub block_hash: Vec<u8>,
+    /// The block signature.
+    pub signature: Vec<u8>,
+}
+
+/// The relation for the block signature model.
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+/// The active model behavior for the block signature model.
+impl ActiveModelBehavior for ActiveModel {}
+
+impl Model {
+    /// Get the block hash as B256
+    pub fn get_block_hash(&self) -> Result<B256, String> {
+        if self.block_hash.len() != 32 {
+            return Err(format!("Invalid block hash length: {}", self.block_hash.len()));
+        }
+        Ok(B256::from_slice(&self.block_hash))
+    }
+
+    /// Get the signature
+    pub fn get_signature(&self) -> Result<Signature, String> {
+        if self.signature.len() != 65 {
+            return Err(format!("Invalid signature length: {}", self.signature.len()));
+        }
+        Signature::from_raw(&self.signature).map_err(|e| format!("Invalid signature: {}", e))
+    }
+}
+
+impl From<(B256, Signature)> for ActiveModel {
+    fn from((block_hash, signature): (B256, Signature)) -> Self {
+        Self {
+            block_hash: ActiveValue::Set(block_hash.to_vec()),
+            signature: ActiveValue::Set(signature.as_bytes().to_vec()),
+        }
+    }
+}

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

@@ -12,3 +12,6 @@ pub mod l1_message;
 
 /// This module contains the metadata model.
 pub mod metadata;
+
+/// This module contains the block signature model.
+pub mod block_signature;

crates/database/db/src/operations.rs

@@ -1,7 +1,7 @@
 use super::{models, DatabaseError};
 use crate::DatabaseConnectionProvider;
 
-use alloy_primitives::B256;
+use alloy_primitives::{Signature, B256};
 use futures::{Stream, StreamExt};
 use rollup_node_primitives::{
     BatchCommitData, BatchInfo, BlockInfo, L1MessageEnvelope, L2BlockInfoWithL1Messages, Metadata,
@@ -510,6 +510,51 @@ pub trait DatabaseOperations: DatabaseConnectionProvider {
         // commit the transaction
         Ok(UnwindResult { l1_block_number, queue_index, l2_head_block_info, l2_safe_block_info })
     }
+
+    /// Store a block signature in the database.
+    async fn insert_signature(
+        &self,
+        block_hash: B256,
+        signature: Signature,
+    ) -> Result<(), DatabaseError> {
+        tracing::trace!(target: "scroll::db", block_hash = ?block_hash, "Storing block signature in database.");
+
+        let block_signature: models::block_signature::ActiveModel = (block_hash, signature).into();
+
+        models::block_signature::Entity::insert(block_signature)
+            .on_conflict(
+                OnConflict::column(models::block_signature::Column::BlockHash)
+                    .update_column(models::block_signature::Column::Signature)
+                    .to_owned(),
+            )
+            .exec(self.get_connection())
+            .await
+            .map(|_| ())?;
+
+        Ok(())
+    }
+
+    /// Get a block signature from the database by block hash.
+    async fn get_block_signature(
+        &self,
+        block_hash: B256,
+    ) -> Result<Option<Signature>, DatabaseError> {
+        tracing::trace!(target: "scroll::db", block_hash = ?block_hash, "Retrieving block signature from database.");
+
+        let block_signature = models::block_signature::Entity::find_by_id(block_hash.to_vec())
+            .one(self.get_connection())
+            .await?;
+
+        match block_signature {
+            Some(model) => {
+                let signature = model.get_signature().map_err(|e| {
+                    DatabaseError::ParseSignatureError(format!("Failed to parse signature: {}", e))
+                })?;
+                Ok(Some(signature))
+            }
+            None => Ok(None),
+        }
+    }
 }
 
 /// The result of [`DatabaseOperations::unwind`].

crates/database/migration/src/lib.rs

@@ -6,6 +6,7 @@ mod m20250408_132123_add_header_metadata;
 mod m20250408_150338_load_header_metadata;
 mod m20250411_072004_add_l2_block;
 mod m20250616_223947_add_metadata;
+mod m20250820_141702_block_signature;
 mod migration_info;
 pub use migration_info::{MigrationInfo, ScrollMainnetMigrationInfo, ScrollSepoliaMigrationInfo};
 
@@ -21,6 +22,7 @@ impl<MI: MigrationInfo + Send + Sync + 'static> MigratorTrait for Migrator<MI> {
             Box::new(m20250408_150338_load_header_metadata::Migration::<MI>(Default::default())),
             Box::new(m20250411_072004_add_l2_block::Migration),
             Box::new(m20250616_223947_add_metadata::Migration),
+            Box::new(m20250820_141702_block_signature::Migration),
         ]
     }
 }

crates/database/migration/src/m20250820_141702_block_signature.rs

@@ -0,0 +1,31 @@
+use sea_orm_migration::{prelude::*, schema::*};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(BlockSignature::Table)
+                    .if_not_exists()
+                    .col(binary_len(BlockSignature::BlockHash, 32).primary_key())
+                    .col(binary_len(BlockSignature::Signature, 65))
+                    .to_owned(),
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager.drop_table(Table::drop().table(BlockSignature::Table).to_owned()).await
+    }
+}
+
+#[derive(DeriveIden)]
+pub enum BlockSignature {
+    Table,
+    BlockHash,
+    Signature,
+}

crates/engine/Cargo.toml

@@ -32,7 +32,7 @@ reth-primitives-traits.workspace = true
 # reth-scroll
 reth-scroll-chainspec.workspace = true
 reth-scroll-primitives.workspace = true
-reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 
 # rollup-node
 rollup-node-primitives.workspace = true
@@ -55,7 +55,7 @@ tracing.workspace = true
 alloy-consensus.workspace = true
 arbitrary.workspace = true
 async-trait.workspace = true
-reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-testing-utils = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 rollup-node-providers = { workspace = true, features = ["test-utils"] }
 scroll-alloy-consensus.workspace = true
 scroll-alloy-rpc-types-engine = { workspace = true, features = ["arbitrary"] }

crates/manager/src/manager/mod.rs

@@ -39,7 +39,7 @@ use tokio_stream::wrappers::ReceiverStream;
 use tracing::{error, trace, warn};
 
 use rollup_node_providers::{L1MessageProvider, L1Provider};
-use scroll_db::Database;
+use scroll_db::{Database, DatabaseOperations};
 use scroll_derivation_pipeline::DerivationPipeline;
 
 mod budget;
@@ -107,6 +107,8 @@ pub struct RollupNodeManager<
     signer: Option<SignerHandle>,
     /// The trigger for the block building process.
     block_building_trigger: Option<Interval>,
+    /// A connection to the database.
+    database: Arc<Database>,
 }
 
 /// The current status of the rollup manager.
@@ -171,7 +173,7 @@ where
     ) -> (Self, RollupManagerHandle<N>) {
         let (handle_tx, handle_rx) = mpsc::channel(EVENT_CHANNEL_SIZE);
         let indexer = Indexer::spawn(database.clone(), chain_spec.clone());
-        let derivation_pipeline = DerivationPipeline::new(l1_provider, database);
+        let derivation_pipeline = DerivationPipeline::new(l1_provider, database.clone());
         let rnm = Self {
             handle_rx,
             chain_spec,
@@ -186,6 +188,7 @@ where
             sequencer,
             signer,
             block_building_trigger: block_time.map(delayed_interval),
+            database,
         };
         (rnm, RollupManagerHandle::new(handle_tx))
     }
@@ -225,7 +228,17 @@ where
                 result: Err(err.into()),
             });
         } else {
-            self.engine.handle_block_import(block_with_peer);
+            self.engine.handle_block_import(block_with_peer.clone());
+
+            // TODO: remove this once we deprecate l2geth.
+            // Store the block signature in the database
+            tokio::task::block_in_place(|| {
+                tokio::runtime::Handle::current().block_on(async move {
+                    if let Err(err) = self.database.insert_signature(block_with_peer.block.hash_slow(), block_with_peer.signature).await {
+                        error!(target: "scroll::node::manager", ?err, "Failed to store block signature");
+                    }
+                })
+            });
         }
     }
 
@@ -526,6 +539,18 @@ where
                         ));
                     }
 
+                    // TODO: remove this once we deprecate l2geth.
+                    // Store the block signature in the database
+                    let database = this.database.clone();
+                    let block_hash = block.hash_slow();
+                    tokio::task::block_in_place(|| {
+                        tokio::runtime::Handle::current().block_on(async move {
+                            if let Err(err) = database.insert_signature(block_hash, signature).await {
+                                error!(target: "scroll::node::manager", ?err, "Failed to store block signature");
+                            }
+                        })
+                    });
+
                     this.network.handle().announce_block(block, signature);
                 }
             }

crates/network/Cargo.toml

@@ -14,10 +14,10 @@ alloy-primitives = { workspace = true, features = ["map-foldhash"] }
 reth-eth-wire-types.workspace = true
 reth-network.workspace = true
 reth-network-api.workspace = true
-reth-network-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-network-types = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 reth-network-peers.workspace = true
 reth-primitives-traits.workspace = true
-reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", branch = "morty/fix-eth66-serve-signature", default-features = false }
 
 # scroll
 reth-scroll-chainspec.workspace = true