Unverified Commit 335914a6 authored by Martin Holst Swende's avatar Martin Holst Swende Committed by GitHub

les: fix serverHandler crash after setHead (#24200)

parent 3ccd6b6d
...@@ -421,7 +421,10 @@ func (h *serverHandler) broadcastLoop() { ...@@ -421,7 +421,10 @@ func (h *serverHandler) broadcastLoop() {
} }
var reorg uint64 var reorg uint64
if lastHead != nil { if lastHead != nil {
reorg = lastHead.Number.Uint64() - rawdb.FindCommonAncestor(h.chainDb, header, lastHead).Number.Uint64() // If a setHead has been performed, the common ancestor can be nil.
if ancestor := rawdb.FindCommonAncestor(h.chainDb, header, lastHead); ancestor != nil {
reorg = lastHead.Number.Uint64() - ancestor.Number.Uint64()
}
} }
lastHead, lastTd = header, td lastHead, lastTd = header, td
log.Debug("Announcing block to peers", "number", number, "hash", hash, "td", td, "reorg", reorg) log.Debug("Announcing block to peers", "number", number, "hash", hash, "td", td, "reorg", reorg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment