updates

Author: julienrbrt

block/internal/cache/generic_cache.go

@@ -32,19 +32,13 @@ type snapshotEntry struct {
 const snapshotEntrySize = 16 // bytes per snapshotEntry
 
 // Cache tracks seen blocks and DA inclusion status using bounded LRU caches.
-//
-// Persistence: on every DA inclusion mutation a single snapshot key
-// (storeKeyPrefix+"__snap") is rewritten with all current in-flight
-// [blockHeight, daHeight] pairs. RestoreFromStore reads that one key on
-// startup — O(1) regardless of chain length.
-//
-// After a restart, real content hashes are not available until the DA
-// retriever re-fires. In the meantime, placeholder keys indexed by height
-// allow lookups to succeed via getDAIncludedByHeight.
 type Cache[T any] struct {
+	// itemsByHeight stores items keyed by uint64 height.
+	// Mutex needed for atomic get-and-remove in getNextItem.
 	itemsByHeight   *lru.Cache[uint64, *T]
 	itemsByHeightMu sync.Mutex
 
+	// hashes tracks whether a given hash has been seen
 	hashes *lru.Cache[string, bool]
 
 	// daIncluded maps hash → daHeight. Hash may be a real content hash or a
@@ -57,9 +51,11 @@ type Cache[T any] struct {
 	hashByHeight   *lru.Cache[uint64, string]
 	hashByHeightMu sync.Mutex
 
+	// maxDAHeight tracks the maximum DA height seen
 	maxDAHeight *atomic.Uint64
 
-	store          store.Store // nil = ephemeral, no persistence
+	store store.Store // nil = ephemeral, no persistence
+	// storeKeyPrefix is the prefix used for store keys
 	storeKeyPrefix string
 }
 

block/internal/cache/manager.go

@@ -46,7 +46,6 @@ type CacheManager interface {
 	IsDataSeen(hash string) bool
 	SetDataSeen(hash string, blockHeight uint64)
 	GetDataDAIncluded(hash string) (uint64, bool)
-	// GetDataDAIncludedByHeight is the data equivalent of GetHeaderDAIncludedByHeight.
 	GetDataDAIncludedByHeight(blockHeight uint64) (uint64, bool)
 	SetDataDAIncluded(hash string, daHeight uint64, blockHeight uint64)
 	RemoveDataDAIncluded(hash string)
@@ -204,7 +203,9 @@ func (m *implementation) IsTxSeen(hash string) bool {
 }
 
 func (m *implementation) SetTxSeen(hash string) {
+	// Use 0 as height since transactions don't have a block height yet
 	m.txCache.setSeen(hash, 0)
+	// Track timestamp for cleanup purposes
 	m.txTimestamps.Store(hash, time.Now())
 }
 
@@ -383,6 +384,7 @@ func (m *implementation) ClearFromStore() error {
 	m.txCache = NewCache[struct{}](nil, "")
 	m.pendingEventsCache = NewCache[common.DAHeightEvent](nil, "")
 
+	// Initialize DA height from store metadata to ensure DaHeight() is never 0.
 	m.initDAHeightFromStore(ctx)
 
 	return nil

block/internal/cache/manager_test.go

@@ -114,14 +114,12 @@ func TestManager_SaveAndRestoreFromStore(t *testing.T) {
 	// Simulate the submitter: write per-height DA mappings (normally done by
 	// setNodeHeightToDAHeight) and mark height 1 as finalized.
 	// Heights 1 and 2 are both submitted to DA; height 1 is finalized, height 2 is in-flight.
-	writeHeightDAMeta := func(height, daH uint64, headerKey, dataKey string) {
+	writeHeightDAMeta := func(height, daH uint64, _, _ string) {
 		b := make([]byte, 8)
 		binary.LittleEndian.PutUint64(b, daH)
 		require.NoError(t, st.SetMetadata(ctx, pkgstore.GetHeightToDAHeightHeaderKey(height), b))
 		binary.LittleEndian.PutUint64(b, daH)
 		require.NoError(t, st.SetMetadata(ctx, pkgstore.GetHeightToDAHeightDataKey(height), b))
-		_ = headerKey
-		_ = dataKey
 	}
 	writeHeightDAMeta(1, 100, "", "")
 	writeHeightDAMeta(2, 101, "", "")