forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

miner: only fill the pending block pre-merge

Browse source
This commit is contained in:
Marius van der Wijden 2023-10-31 10:17:11 +01:00
parent 6c6982163b
commit ab0d224c73
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
miner/worker.go
View file

@ -1068,6 +1068,8 @@ func (w *worker) commitWork(interrupt *atomic.Int32, timestamp int64) {
if err != nil { if err != nil {
return return
} }
// Don't fill the pending block post-merge
if !w.chainConfig.TerminalTotalDifficultyPassed {
// Fill pending transactions from the txpool into the block. // Fill pending transactions from the txpool into the block.
err = w.fillTransactions(interrupt, work) err = w.fillTransactions(interrupt, work)
switch { switch {
@ -1097,6 +1099,8 @@ func (w *worker) commitWork(interrupt *atomic.Int32, timestamp int64) {
work.discard() work.discard()
return return
} }
}
// Submit the generated block for consensus sealing. // Submit the generated block for consensus sealing.
w.commit(work.copy(), w.fullTaskHook, true, start) w.commit(work.copy(), w.fullTaskHook, true, start)