forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-15 04:26:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/downloader, les/downloader: fix subtle flaw in queue delivery (#25861)

Browse source 
* fix queue.deliver

* les/downloader: fix queue.deliver

Co-authored-by: Martin Holst Swende <martin@swende.se>
This commit is contained in:
zhiqiangxu 2022-09-26 18:33:21 +08:00 committed by GitHub
parent e004e7d256
commit b32d20324e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eth/downloader/queue.go
View file

@ -857,7 +857,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
} }
for _, header := range request.Headers[:i] { 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) reconstruct(accepted, res)
} else { } else {
// else: between here and above, some other peer filled this result, // else: between here and above, some other peer filled this result,

2
les/downloader/queue.go
View file

@ -870,7 +870,7 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header,
} }
for _, header := range request.Headers[:i] { 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) reconstruct(accepted, res)
} else { } else {
// else: between here and above, some other peer filled this result, // else: between here and above, some other peer filled this result,