From e34f2a2d5d5ddcc4a224b5e6a88ce7112d4e8614 Mon Sep 17 00:00:00 2001
From: 0xoasis <alanyolo.dev@gmail.com>
Date: Wed, 1 Jul 2026 17:06:30 +0800
Subject: [PATCH] core/txpool/blobpool: fall back on cache version mismatch

---
 core/txpool/blobpool/cache.go      |  4 +---
 core/txpool/blobpool/cache_test.go | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/core/txpool/blobpool/cache.go b/core/txpool/blobpool/cache.go
index 12f9802775..38c117f547 100644
--- a/core/txpool/blobpool/cache.go
+++ b/core/txpool/blobpool/cache.go
@@ -201,9 +201,7 @@ func (c *Cache) GetBlobs(ctx context.Context, vhashes []common.Hash, version byt
 		cached := c.entries[vhash]
 		if cached == nil || cached.version != version {
 			cacheMiss += n
-			if cached == nil {
-				misses = append(misses, vhash)
-			}
+			misses = append(misses, vhash)
 			continue
 		}
 		cacheHits += n
diff --git a/core/txpool/blobpool/cache_test.go b/core/txpool/blobpool/cache_test.go
index da13cda4b2..1f166ca14e 100644
--- a/core/txpool/blobpool/cache_test.go
+++ b/core/txpool/blobpool/cache_test.go
@@ -280,6 +280,29 @@ func TestCacheGetBlobs(t *testing.T) {
 	tc.expectEntries(t, tc.vhashes[1]...)
 }
 
+func TestCacheGetBlobsFallsBackOnVersionMismatch(t *testing.T) {
+	tc := newTestCache(t, []txSpec{
+		{blobs: 1, tip: 100},
+	})
+	vhash := tc.vhashes[0][0]
+	tc.expectEntries(t, vhash)
+
+	tc.mu.Lock()
+	tc.entries[vhash].version = types.BlobSidecarVersion0
+	tc.mu.Unlock()
+
+	blobs, _, proofs, err := tc.GetBlobs(context.Background(), []common.Hash{vhash}, types.BlobSidecarVersion1)
+	if err != nil {
+		t.Fatalf("GetBlobs: %v", err)
+	}
+	if blobs[0] == nil {
+		t.Fatal("blob missing in GetBlobs response")
+	}
+	if len(proofs[0]) == 0 {
+		t.Fatal("proofs missing in GetBlobs response")
+	}
+}
+
 // TestCacheTopKRefresh verifies that when a more profitable tx appears in the
 // pool, the next topK tick replaces the cached entry with the better one.
 func TestCacheTopKRefresh(t *testing.T) {