use cache window

Author: julienrbrt

block/internal/cache/generic_cache.go

@@ -8,6 +8,8 @@ import (
 	"sync"
 )
 
+const cacheWindow = 1000000
+
 // Cache is a generic cache that maintains items that are seen and hard confirmed
 type Cache[T any] struct {
 	// itemsByHeight stores items keyed by uint64 height
@@ -99,7 +101,7 @@ func (c *Cache[T]) removeDAIncluded(hash string) {
 }
 
 // pruneOldEntries removes entries below the current height.
-// It keeps entries at heights >= currentHeight.
+// It keeps entries at heights >= currentHeight-cacheWindow.
 // This prevents unbounded memory growth as the chain progresses.
 func (c *Cache[T]) pruneOldEntries(currentHeight uint64) {
 	if currentHeight == 0 {
@@ -114,7 +116,7 @@ func (c *Cache[T]) pruneOldEntries(currentHeight uint64) {
 		if !ok {
 			return true
 		}
-		if height < currentHeight {
+		if height < currentHeight-cacheWindow {
 			itemsToDelete = append(itemsToDelete, height)
 		}
 		return true
@@ -129,7 +131,7 @@ func (c *Cache[T]) pruneOldEntries(currentHeight uint64) {
 		if !ok {
 			return true
 		}
-		if height < currentHeight {
+		if height < currentHeight-cacheWindow {
 			hashesToDelete = append(hashesToDelete, hash)
 		}
 		return true

block/internal/cache/manager.go

@@ -67,6 +67,7 @@ type Manager interface {
 	SaveToDisk() error
 	LoadFromDisk() error
 	ClearFromDisk() error
+	ClearDAIncluded(height uint64)
 }
 
 var _ Manager = (*implementation)(nil)
@@ -164,6 +165,11 @@ func (m *implementation) SetDataDAIncluded(hash string, daHeight uint64, blockHe
 	m.dataCache.setDAIncluded(hash, daHeight, blockHeight)
 }
 
+func (m *implementation) ClearDAIncluded(height uint64) {
+	m.dataCache.pruneOldEntries(height)
+	m.headerCache.pruneOldEntries(height)
+}
+
 // Pending operations
 func (m *implementation) GetPendingHeaders(ctx context.Context) ([]*types.SignedHeader, error) {
 	return m.pendingHeaders.GetPendingHeaders(ctx)

block/internal/submitting/submitter.go

@@ -234,6 +234,9 @@ func (s *Submitter) processDAInclusionLoop() {
 				if err := s.store.SetMetadata(s.ctx, store.DAIncludedHeightKey, bz); err != nil {
 					s.logger.Error().Err(err).Uint64("height", nextHeight).Msg("failed to persist DA included height")
 				}
+
+				// Clear DA included height cache
+				s.cache.ClearDAIncluded(nextHeight)
 			}
 		}
 	}