eth/downloader, les/downloader: fix subtle flaw in queue delivery (et…

…hereum#25861) * fix queue.deliver * les/downloader: fix queue.deliver Co-authored-by: Martin Holst Swende <martin@swende.se>
blakehhuynh · Oct 3, 2022 · ad29b3d · ad29b3d
1 parent 84f76ca
commit ad29b3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
@@ -857,7 +857,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
 	}
 
 	for _, header := range request.Headers[:i] {
-		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {
+		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {
 			reconstruct(accepted, res)
 		} else {
 			// else: between here and above, some other peer filled this result,

diff --git a/les/downloader/queue.go b/les/downloader/queue.go
@@ -870,7 +870,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
 	}
 
 	for _, header := range request.Headers[:i] {
-		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil {
+		if res, stale, err := q.resultCache.GetDeliverySlot(header.Number.Uint64()); err == nil && !stale {
 			reconstruct(accepted, res)
 		} else {
 			// else: between here and above, some other peer filled this result,