miner: add totalDifficultyOverride flag

cmd/geth/config.go

@@ -158,6 +158,9 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	if ctx.GlobalIsSet(utils.OverrideLondonFlag.Name) {
 		cfg.Eth.OverrideLondon = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideLondonFlag.Name))
 	}
+	if ctx.GlobalIsSet(utils.OverrideTotalTerminalDifficulty.Name) {
+		cfg.Eth.Genesis.Config.TerminalTotalDifficulty = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideTotalTerminalDifficulty.Name))
+	}
 	backend, _ := utils.RegisterEthService(stack, &cfg.Eth, ctx.GlobalBool(utils.CatalystFlag.Name))
 
 	// Configure GraphQL if requested

cmd/geth/main.go

@@ -67,6 +67,7 @@ var (
 		utils.USBFlag,
 		utils.SmartCardDaemonPathFlag,
 		utils.OverrideLondonFlag,
+		utils.OverrideTotalTerminalDifficulty,
 		utils.EthashCacheDirFlag,
 		utils.EthashCachesInMemoryFlag,
 		utils.EthashCachesOnDiskFlag,

cmd/utils/flags.go

@@ -240,6 +240,10 @@ var (
 		Name:  "override.london",
 		Usage: "Manually specify London fork-block, overriding the bundled setting",
 	}
+	OverrideTotalTerminalDifficulty = cli.Uint64Flag{
+		Name:  "override.totalterminaldifficulty",
+		Usage: "Manually specify TotalTerminalDifficulty, overriding the bundled setting",
+	}
 	// Light server and client settings
 	LightServeFlag = cli.IntFlag{
 		Name:  "light.serve",

eth/catalyst/api.go

@@ -489,6 +489,7 @@ func (api *ConsensusAPI) setHead(newHead common.Hash) error {
 	if !merger.LeftPoW() {
 		merger.LeavePoW()
 	}
+	log.Info("Setting head", "head", newHead)
 	if api.light {
 		headHeader := api.les.BlockChain().CurrentHeader()
 		if headHeader.Hash() == newHead {

miner/worker.go

@@ -19,6 +19,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"math/big"
 	"sync"
 	"sync/atomic"
@@ -1024,6 +1025,18 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st
 	if err != nil {
 		return err
 	}
+
+	// TODO (MariusVanDerWijden) remove this after eth2 interop
+	// ---
+	parent := w.chain.GetBlockByHash(block.ParentHash())
+	if parent == nil {
+		return fmt.Errorf("parent unavailable: %v", block.ParentHash())
+	}
+	td := w.chain.GetTdByHash(parent.Hash())
+	if td != nil && td.Cmp(w.chain.Config().TerminalTotalDifficulty) > 0 {
+		log.Warn("Total terminal difficulty reached, keeping on mining to test eth2 clients")
+	}
+	// ---
 	if w.isRunning() && !w.merger.LeftPoW() {
 		if interval != nil {
 			interval()