From e6bdfc806dcd3fb83ff57c09a69bff5007076946 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Sun, 23 Mar 2025 13:58:00 +0100
Subject: [PATCH] core/rawdb: put back reporting of bloombits data in
 InspectDatabase

---
 core/rawdb/accessors_indexes.go |  2 +-
 core/rawdb/database.go          | 12 +++++++++++-
 core/rawdb/schema.go            |  5 ++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go
index 7bb96b1fa1..297e339c83 100644
--- a/core/rawdb/accessors_indexes.go
+++ b/core/rawdb/accessors_indexes.go
@@ -502,5 +502,5 @@ func DeleteBloomBitsDb(db ethdb.KeyValueRangeDeleter) error {
 	if err := deletePrefixRange(db, bloomBitsPrefix); err != nil {
 		return err
 	}
-	return deletePrefixRange(db, bloomBitsIndexPrefix)
+	return deletePrefixRange(db, bloomBitsMetaPrefix)
 }
diff --git a/core/rawdb/database.go b/core/rawdb/database.go
index ce143905a2..aeb2f93a28 100644
--- a/core/rawdb/database.go
+++ b/core/rawdb/database.go
@@ -377,6 +377,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 		preimages          stat
 		beaconHeaders      stat
 		cliqueSnaps        stat
+		bloomBits          stat
 		filterMapRows      stat
 		filterMapLastBlock stat
 		filterMapBlockLV   stat
@@ -442,6 +443,8 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 			beaconHeaders.Add(size)
 		case bytes.HasPrefix(key, CliqueSnapshotPrefix) && len(key) == 7+common.HashLength:
 			cliqueSnaps.Add(size)
+
+		// new log index
 		case bytes.HasPrefix(key, filterMapRowPrefix) && len(key) == len(filterMapRowPrefix)+8:
 			filterMapRows.Add(size)
 		case bytes.HasPrefix(key, filterMapLastBlockPrefix) && len(key) == len(filterMapLastBlockPrefix)+4:
@@ -449,7 +452,13 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 		case bytes.HasPrefix(key, filterMapBlockLVPrefix) && len(key) == len(filterMapBlockLVPrefix)+8:
 			filterMapBlockLV.Add(size)
 
-		// LES indexes
+		// old log index (deprecated)
+		case bytes.HasPrefix(key, bloomBitsPrefix) && len(key) == (len(bloomBitsPrefix)+10+common.HashLength):
+			bloomBits.Add(size)
+		case bytes.HasPrefix(key, bloomBitsMetaPrefix) && len(key) < len(bloomBitsMetaPrefix)+8:
+			bloomBits.Add(size)
+
+		// LES indexes (deprecated)
 		case bytes.HasPrefix(key, chtTablePrefix) ||
 			bytes.HasPrefix(key, chtIndexTablePrefix) ||
 			bytes.HasPrefix(key, chtPrefix): // Canonical hash trie
@@ -514,6 +523,7 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 		{"Key-Value store", "Log index filter-map rows", filterMapRows.Size(), filterMapRows.Count()},
 		{"Key-Value store", "Log index last-block-of-map", filterMapLastBlock.Size(), filterMapLastBlock.Count()},
 		{"Key-Value store", "Log index block-lv", filterMapBlockLV.Size(), filterMapBlockLV.Count()},
+		{"Key-Value store", "Log index bloombits (deprecated)", bloomBits.Size(), bloomBits.Count()},
 		{"Key-Value store", "Contract codes", codes.Size(), codes.Count()},
 		{"Key-Value store", "Hash trie nodes", legacyTries.Size(), legacyTries.Count()},
 		{"Key-Value store", "Path trie state lookups", stateLookups.Size(), stateLookups.Count()},
diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go
index 3603721c9d..31e80da079 100644
--- a/core/rawdb/schema.go
+++ b/core/rawdb/schema.go
@@ -134,14 +134,17 @@ var (
 	FixedCommitteeRootKey = []byte("fixedRoot-") // bigEndian64(syncPeriod) -> committee root hash
 	SyncCommitteeKey      = []byte("committee-") // bigEndian64(syncPeriod) -> serialized committee
 
+	// new log index
 	filterMapsPrefix         = "fm-"
 	filterMapsRangeKey       = []byte(filterMapsPrefix + "R")
 	filterMapRowPrefix       = []byte(filterMapsPrefix + "r") // filterMapRowPrefix + mapRowIndex (uint64 big endian) -> filter row
 	filterMapLastBlockPrefix = []byte(filterMapsPrefix + "b") // filterMapLastBlockPrefix + mapIndex (uint32 big endian) -> block number (uint64 big endian)
 	filterMapBlockLVPrefix   = []byte(filterMapsPrefix + "p") // filterMapBlockLVPrefix + num (uint64 big endian) -> log value pointer (uint64 big endian)
 
+	// old log index
+	bloomBitsMetaPrefix = []byte("iB")
+
 	// LES indexes
-	bloomBitsIndexPrefix = []byte("iB")
 	chtPrefix            = []byte("chtRootV2-") // ChtPrefix + chtNum (uint64 big endian) -> trie root hash
 	chtTablePrefix       = []byte("cht-")
 	chtIndexTablePrefix  = []byte("chtIndexV2-")