miner: stop miner on ttd reached

MariusVanDerWijden · MariusVanDerWijden · commit 932939feb673 · 2021-11-24T12:14:43.000+01:00
diff --git a/miner/worker.go b/miner/worker.go
@@ -1040,7 +1040,12 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st
 		return err
 	}
 
-	if w.isRunning() && !w.merger.TDDReached() {
+	// If we're post merge, just ignore
+	if td := w.chain.GetTd(block.ParentHash(), block.NumberU64()-1); td.Cmp(w.chain.Config().TerminalTotalDifficulty) >= 0 {
+		return nil
+	}
+
+	if w.isRunning() {
 		if interval != nil {
 			interval()
 		}

Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,12 @@ func (w worker) commit(uncles []types.Header, interval func(), update bool, st`
`1040`	`1040`	`return err`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`		`- if w.isRunning() && !w.merger.TDDReached() {`
	`1043`	`+ // If we're post merge, just ignore`
	`1044`	`+ if td := w.chain.GetTd(block.ParentHash(), block.NumberU64()-1); td.Cmp(w.chain.Config().TerminalTotalDifficulty) >= 0 {`
	`1045`	`+ return nil`
	`1046`	`+ }`
	`1047`	`+`
	`1048`	`+ if w.isRunning() {`
`1044`	`1049`	`if interval != nil {`
`1045`	`1050`	`interval()`
`1046`	`1051`	`}`