mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-10 05:53:46 +00:00
Merge pull request #201 from maticnetwork/fix-memory-leak
Fix memory leak in txpool
This commit is contained in:
commit
a9c71eff57
1 changed files with 9 additions and 3 deletions
|
|
@ -1173,9 +1173,15 @@ func (pool *TxPool) runReorg(done chan struct{}, reset *txpoolResetRequest, dirt
|
||||||
// because of another transaction (e.g. higher gas price).
|
// because of another transaction (e.g. higher gas price).
|
||||||
if reset != nil {
|
if reset != nil {
|
||||||
pool.demoteUnexecutables()
|
pool.demoteUnexecutables()
|
||||||
if reset.newHead != nil && pool.chainconfig.IsLondon(new(big.Int).Add(reset.newHead.Number, big.NewInt(1))) {
|
if reset.newHead != nil {
|
||||||
pendingBaseFee := misc.CalcBaseFee(pool.chainconfig, reset.newHead)
|
if pool.chainconfig.IsLondon(new(big.Int).Add(reset.newHead.Number, big.NewInt(1))) {
|
||||||
pool.priced.SetBaseFee(pendingBaseFee)
|
// london fork enabled, reset given the base fee
|
||||||
|
pendingBaseFee := misc.CalcBaseFee(pool.chainconfig, reset.newHead)
|
||||||
|
pool.priced.SetBaseFee(pendingBaseFee)
|
||||||
|
} else {
|
||||||
|
// london fork not enabled, reheap to "reset" the priced list
|
||||||
|
pool.priced.Reheap()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Ensure pool.queue and pool.pending sizes stay within the configured limits.
|
// Ensure pool.queue and pool.pending sizes stay within the configured limits.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue