mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-17 18:30:45 +00:00
parent
71f929d990
commit
d38d746773
1 changed files with 8 additions and 0 deletions
|
|
@ -1376,6 +1376,14 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) {
|
||||||
"old", oldHead.Hash(), "oldnum", oldNum, "new", newHead.Hash(), "newnum", newNum)
|
"old", oldHead.Hash(), "oldnum", oldNum, "new", newHead.Hash(), "newnum", newNum)
|
||||||
// We still need to update the current state s.th. the lost transactions can be readded by the user
|
// We still need to update the current state s.th. the lost transactions can be readded by the user
|
||||||
} else {
|
} else {
|
||||||
|
if add == nil {
|
||||||
|
// if the new head is nil, it means that something happened between
|
||||||
|
// the firing of newhead-event and _now_: most likely a
|
||||||
|
// reorg caused by sync-reversion or explicit sethead back to an
|
||||||
|
// earlier block.
|
||||||
|
log.Warn("Transaction pool reset with missing new head", "number", newHead.Number, "hash", newHead.Hash())
|
||||||
|
return
|
||||||
|
}
|
||||||
for rem.NumberU64() > add.NumberU64() {
|
for rem.NumberU64() > add.NumberU64() {
|
||||||
discarded = append(discarded, rem.Transactions()...)
|
discarded = append(discarded, rem.Transactions()...)
|
||||||
if rem = pool.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {
|
if rem = pool.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue