refactor(storage): rename BlockSignatures to BlockProof

bin/ethlambda/src/main.rs

@@ -725,7 +725,7 @@ async fn fetch_initial_state(
     // Initialize the store from state + anchor block body, then persist the
     // signatures so we can serve the anchor on BlocksByRoot. `insert_signed_block`
     // overlaps with what `get_forkchoice_store` already wrote, but it's
-    // idempotent and the only path that also stores `BlockSignatures`.
+    // idempotent and the only path that also stores `BlockProof`.
     let anchor_root = signed_block.message.header().hash_tree_root();
     let mut store = Store::get_forkchoice_store(backend, state, signed_block.message.clone())
         .inspect_err(|err| error!(%err, "Failed to initialize store from anchor state and block"))

crates/net/rpc/src/lib.rs

@@ -532,7 +532,7 @@ mod tests {
         use libssz::SszEncode;
 
         // Genesis-anchored store: `init_store` writes the header + state but no
-        // `BlockSignatures` (proof) row. `get_signed_block` synthesizes an empty
+        // `BlockProof` (proof) row. `get_signed_block` synthesizes an empty
         // proof so peers can still receive the genesis block on BlocksByRoot;
         // the HTTP endpoint stays consistent and returns 200 rather than 404.
         let state = create_test_state();

crates/storage/src/api/tables.rs

@@ -5,14 +5,14 @@ pub enum Table {
     BlockHeaders,
     /// Block body storage: H256 -> BlockBody
     BlockBodies,
-    /// Block signatures storage: (slot || root) -> BlockSignatures
+    /// Block proof storage: (slot || root) -> BlockProof
     ///
-    /// Stored separately from blocks because the genesis block has no signatures.
+    /// Stored separately from blocks because the genesis block has no proof.
     /// Keyed by slot || root so pruning can scan in slot order and stop early.
-    /// Non-genesis blocks have an entry until finalized: signatures below the
-    /// finalized boundary are pruned (`prune_old_block_signatures`), while
+    /// Non-genesis blocks have an entry until finalized: proofs below the
+    /// finalized boundary are pruned (`prune_old_block_proofs`), while
     /// headers and bodies are kept forever.
-    BlockSignatures,
+    BlockProof,
     /// Canonical block index: slot -> block root
     BlockRoots,
     /// State storage: H256 -> State
@@ -40,7 +40,7 @@ pub enum Table {
 pub const ALL_TABLES: [Table; 8] = [
     Table::BlockHeaders,
     Table::BlockBodies,
-    Table::BlockSignatures,
+    Table::BlockProof,
     Table::BlockRoots,
     Table::States,
     Table::StateDiffs,
@@ -54,7 +54,7 @@ impl Table {
         match self {
             Table::BlockHeaders => "block_headers",
             Table::BlockBodies => "block_bodies",
-            Table::BlockSignatures => "block_signatures",
+            Table::BlockProof => "block_proof",
             Table::BlockRoots => "block_roots",
             Table::States => "states",
             Table::StateDiffs => "state_diffs",

crates/storage/src/backend/rocksdb.rs

@@ -10,6 +10,8 @@ use rocksdb::{
 use std::path::Path;
 use std::sync::Arc;
 
+const LEGACY_BLOCK_SIGNATURES_CF: &str = "block_signatures";
+
 /// Returns the column family name for a table.
 ///
 /// Delegates to [`Table::name`] so the CF name and the metrics label share a
@@ -27,6 +29,7 @@ pub struct RocksDBBackend {
 impl RocksDBBackend {
     /// Open a RocksDB database at the given path.
     pub fn open(path: impl AsRef<Path>) -> Result<Self, Error> {
+        let path = path.as_ref();
         let mut opts = Options::default();
         opts.create_if_missing(true);
         opts.create_missing_column_families(true);
@@ -47,7 +50,7 @@ impl RocksDBBackend {
         let mut block_opts = BlockBasedOptions::default();
         block_opts.set_block_cache(&block_cache);
 
-        let cf_descriptors: Vec<_> = ALL_TABLES
+        let mut cf_descriptors: Vec<_> = ALL_TABLES
             .iter()
             .map(|t| {
                 let mut cf_opts = Options::default();
@@ -56,6 +59,18 @@ impl RocksDBBackend {
             })
             .collect();
 
+        if path.exists()
+            && DBWithThreadMode::<MultiThreaded>::list_cf(&opts, path)
+                .is_ok_and(|cfs| cfs.iter().any(|cf| cf == LEGACY_BLOCK_SIGNATURES_CF))
+        {
+            let mut cf_opts = Options::default();
+            cf_opts.set_block_based_table_factory(&block_opts);
+            cf_descriptors.push(ColumnFamilyDescriptor::new(
+                LEGACY_BLOCK_SIGNATURES_CF,
+                cf_opts,
+            ));
+        }
+
         let db =
             DBWithThreadMode::<MultiThreaded>::open_cf_descriptors(&opts, path, cf_descriptors)?;