No fetch when in cache

Author: alpe

block/internal/da/async_block_retriever.go

@@ -183,17 +183,17 @@ func (f *asyncBlockRetriever) HandleEvent(ctx context.Context, ev datypes.Subscr
 
 // HandleCatchup fetches a single height via Retrieve and caches it.
 // Also applies the prefetch window for speculative forward fetching.
-func (f *asyncBlockRetriever) HandleCatchup(ctx context.Context, height uint64) error {
-	f.fetchAndCacheBlock(ctx, height)
-
+func (f *asyncBlockRetriever) HandleCatchup(ctx context.Context, daHeight uint64) error {
+	if _, err := f.cache.Get(ctx, newBlockDataKey(daHeight)); err != nil {
+		f.fetchAndCacheBlock(ctx, daHeight)
+	}
 	// Speculatively prefetch ahead.
-	target := height + f.prefetchWindow
-	for h := height + 1; h <= target; h++ {
+	target := daHeight + f.prefetchWindow
+	for h := daHeight + 1; h <= target; h++ {
 		if err := ctx.Err(); err != nil {
 			return err
 		}
-		key := newBlockDataKey(h)
-		if _, err := f.cache.Get(ctx, key); err == nil {
+		if _, err := f.cache.Get(ctx, newBlockDataKey(h)); err == nil {
 			continue // Already cached.
 		}
 		f.fetchAndCacheBlock(ctx, h)
@@ -202,10 +202,6 @@ func (f *asyncBlockRetriever) HandleCatchup(ctx context.Context, height uint64)
 	return nil
 }
 
-// ---------------------------------------------------------------------------
-// Cache helpers
-// ---------------------------------------------------------------------------
-
 // fetchAndCacheBlock fetches a block via Retrieve and caches it.
 func (f *asyncBlockRetriever) fetchAndCacheBlock(ctx context.Context, height uint64) {
 	f.logger.Debug().Uint64("height", height).Msg("prefetching block")

block/internal/da/subscriber.go

@@ -199,7 +199,7 @@ func (s *Subscriber) runSubscription(ctx context.Context) error {
 			local := s.localDAHeight.Load()
 			isInline := ev.Height == local && s.localDAHeight.CompareAndSwap(local, local+1)
 
-			err = s.handler.HandleEvent(ctx, ev, isInline)
+			err = s.handler.HandleEvent(subCtx, ev, isInline)
 			if isInline {
 				if err == nil {
 					s.headReached.Store(true)