From 2f96e866a863310ddc6a000760b4124df318c950 Mon Sep 17 00:00:00 2001 From: zhiqiangxu <652732310@qq.com> Date: Sun, 25 Sep 2022 09:55:16 +0800 Subject: [PATCH 1/2] fix queue.deliver --- eth/downloader/queue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 26c41711ded..ab3ae3d77d0 100644 --- 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, From 217c866ec48ac4211e2e46734eeb47d43a1595fe Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 26 Sep 2022 09:37:46 +0200 Subject: [PATCH 2/2] les/downloader: fix queue.deliver --- les/downloader/queue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/les/downloader/queue.go b/les/downloader/queue.go index 98ebff526e8..fe08c810a11 100644 --- 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,