miner: update pending block even after the PoS transition (ethereum#2…

…4075)

miner/worker.go

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