|
|
@ -1039,17 +1039,15 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if w.isRunning() { |
|
|
|
|
|
|
|
if interval != nil { |
|
|
|
|
|
|
|
interval() |
|
|
|
|
|
|
|
} |
|
|
|
// If we're post merge, just ignore
|
|
|
|
// If we're post merge, just ignore
|
|
|
|
td, ttd := w.chain.GetTd(block.ParentHash(), block.NumberU64()-1), w.chain.Config().TerminalTotalDifficulty |
|
|
|
td, ttd := w.chain.GetTd(block.ParentHash(), block.NumberU64()-1), w.chain.Config().TerminalTotalDifficulty |
|
|
|
if td != nil && ttd != nil && td.Cmp(ttd) >= 0 { |
|
|
|
if td != nil && ttd != nil && td.Cmp(ttd) >= 0 { |
|
|
|
return nil |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if w.isRunning() { |
|
|
|
|
|
|
|
if interval != nil { |
|
|
|
|
|
|
|
interval() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
select { |
|
|
|
select { |
|
|
|
case w.taskCh <- &task{receipts: receipts, state: s, block: block, createdAt: time.Now()}: |
|
|
|
case w.taskCh <- &task{receipts: receipts, state: s, block: block, createdAt: time.Now()}: |
|
|
|
w.unconfirmed.Shift(block.NumberU64() - 1) |
|
|
|
w.unconfirmed.Shift(block.NumberU64() - 1) |
|
|
|