all: remove TerminalTotalDifficultyPassed.

Co-authored-by: stevemilk <wangpeculiar@gmail.com>

cmd/utils/flags.go

@@ -1867,9 +1867,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 				if err != nil {
 					Fatalf("Could not read genesis from database: %v", err)
 				}
-				if !genesis.Config.TerminalTotalDifficultyPassed {
-					Fatalf("Bad developer-mode genesis configuration: terminalTotalDifficultyPassed must be true")
-				}
 				if genesis.Config.TerminalTotalDifficulty == nil {
 					Fatalf("Bad developer-mode genesis configuration: terminalTotalDifficulty must be specified")
 				} else if genesis.Config.TerminalTotalDifficulty.Cmp(big.NewInt(0)) != 0 {

core/blockchain_test.go

@@ -4092,7 +4092,6 @@ func TestEIP3651(t *testing.T) {
 	gspec.Config.BerlinBlock = common.Big0
 	gspec.Config.LondonBlock = common.Big0
 	gspec.Config.TerminalTotalDifficulty = common.Big0
-	gspec.Config.TerminalTotalDifficultyPassed = true
 	gspec.Config.ShanghaiTime = u64(0)
 	signer := types.LatestSigner(gspec.Config)
 

core/chain_makers_test.go

@@ -57,7 +57,6 @@ func TestGeneratePOSChain(t *testing.T) {
 		db    = rawdb.NewMemoryDatabase()
 	)
 
-	config.TerminalTotalDifficultyPassed = true
 	config.TerminalTotalDifficulty = common.Big0
 	config.ShanghaiTime = u64(0)
 	config.CancunTime = u64(0)

core/forkid/forkid_test.go

@@ -393,7 +393,6 @@ func TestTimeBasedForkInGenesis(t *testing.T) {
 				BerlinBlock:             big.NewInt(0),
 				LondonBlock:             big.NewInt(0),
 				TerminalTotalDifficulty: big.NewInt(0),
-				TerminalTotalDifficultyPassed: true,
 				MergeNetsplitBlock:      big.NewInt(0),
 				ShanghaiTime:            &shanghai,
 				CancunTime:              &cancun,

core/genesis_test.go

@@ -279,7 +279,6 @@ func TestVerkleGenesisCommit(t *testing.T) {
 		PragueTime:              &verkleTime,
 		VerkleTime:              &verkleTime,
 		TerminalTotalDifficulty: big.NewInt(0),
-		TerminalTotalDifficultyPassed: true,
 		Ethash:                  nil,
 		Clique:                  nil,
 	}

core/state_processor_test.go

@@ -65,7 +65,6 @@ func TestStateProcessorErrors(t *testing.T) {
 			LondonBlock:             big.NewInt(0),
 			Ethash:                  new(params.EthashConfig),
 			TerminalTotalDifficulty: big.NewInt(0),
-			TerminalTotalDifficultyPassed: true,
 			ShanghaiTime:            new(uint64),
 			CancunTime:              new(uint64),
 		}
@@ -257,7 +256,7 @@ func TestStateProcessorErrors(t *testing.T) {
 				want: "could not apply tx 0 [0x6c11015985ce82db691d7b2d017acda296db88b811c3c60dc71449c76256c716]: max fee per gas less than block base fee: address 0x71562b71999873DB5b286dF957af199Ec94617F7, maxFeePerGas: 1, baseFee: 875000000",
 			},
 		} {
-			block := GenerateBadBlock(gspec.ToBlock(), beacon.New(ethash.NewFaker()), tt.txs, gspec.Config)
+			block := GenerateBadBlock(gspec.ToBlock(), beacon.New(ethash.NewFaker()), tt.txs, gspec.Config, false)
 			_, err := blockchain.InsertChain(types.Blocks{block})
 			if err == nil {
 				t.Fatal("block imported without errors")
@@ -306,7 +305,7 @@ func TestStateProcessorErrors(t *testing.T) {
 				want: "could not apply tx 0 [0x88626ac0d53cb65308f2416103c62bb1f18b805573d4f96a3640bbbfff13c14f]: transaction type not supported",
 			},
 		} {
-			block := GenerateBadBlock(gspec.ToBlock(), ethash.NewFaker(), tt.txs, gspec.Config)
+			block := GenerateBadBlock(gspec.ToBlock(), ethash.NewFaker(), tt.txs, gspec.Config, true)
 			_, err := blockchain.InsertChain(types.Blocks{block})
 			if err == nil {
 				t.Fatal("block imported without errors")
@@ -345,7 +344,7 @@ func TestStateProcessorErrors(t *testing.T) {
 				want: "could not apply tx 0 [0x88626ac0d53cb65308f2416103c62bb1f18b805573d4f96a3640bbbfff13c14f]: sender not an eoa: address 0x71562b71999873DB5b286dF957af199Ec94617F7, codehash: 0x9280914443471259d4570a8661015ae4a5b80186dbc619658fb494bebc3da3d1",
 			},
 		} {
-			block := GenerateBadBlock(gspec.ToBlock(), beacon.New(ethash.NewFaker()), tt.txs, gspec.Config)
+			block := GenerateBadBlock(gspec.ToBlock(), beacon.New(ethash.NewFaker()), tt.txs, gspec.Config, false)
 			_, err := blockchain.InsertChain(types.Blocks{block})
 			if err == nil {
 				t.Fatal("block imported without errors")
@@ -361,9 +360,9 @@ func TestStateProcessorErrors(t *testing.T) {
 // valid, and no proper post-state can be made. But from the perspective of the blockchain, the block is sufficiently
 // valid to be considered for import:
 // - valid pow (fake), ancestry, difficulty, gaslimit etc
-func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Transactions, config *params.ChainConfig) *types.Block {
+func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Transactions, config *params.ChainConfig, powMode bool) *types.Block {
 	difficulty := big.NewInt(0)
-	if !config.TerminalTotalDifficultyPassed {
+	if powMode {
 		fakeChainReader := newChainMaker(nil, config, engine)
 		difficulty = engine.CalcDifficulty(fakeChainReader, parent.Time()+10, &types.Header{
 			Number:     parent.Number(),
@@ -457,7 +456,6 @@ func TestProcessVerkle(t *testing.T) {
 			ShanghaiTime:            u64(0),
 			VerkleTime:              u64(0),
 			TerminalTotalDifficulty: common.Big0,
-			TerminalTotalDifficultyPassed: true,
 			// TODO uncomment when proof generation is merged
 			// ProofInBlocks:                 true,
 		}

eth/catalyst/api_test.go

@@ -66,7 +66,6 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) {
 	engine := consensus.Engine(beaconConsensus.New(ethash.NewFaker()))
 	if merged {
 		config.TerminalTotalDifficulty = common.Big0
-		config.TerminalTotalDifficultyPassed = true
 		engine = beaconConsensus.NewFaker()
 	}
 	genesis := &core.Genesis{

eth/ethconfig/config.go

@@ -18,7 +18,6 @@
 package ethconfig
 
 import (
-	"errors"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -162,11 +161,6 @@ type Config struct {
 // Clique is allowed for now to live standalone, but ethash is forbidden and can
 // only exist on already merged networks.
 func CreateConsensusEngine(config *params.ChainConfig, db ethdb.Database) (consensus.Engine, error) {
-	// Geth v1.14.0 dropped support for non-merged networks in any consensus
-	// mode. If such a network is requested, reject startup.
-	if !config.TerminalTotalDifficultyPassed {
-		return nil, errors.New("only PoS networks are supported, please transition old ones with Geth v1.13.x")
-	}
 	// Wrap previously supported consensus engines into their post-merge counterpart
 	if config.Clique != nil {
 		return beacon.New(clique.New(config.Clique, db)), nil

eth/protocols/eth/handler_test.go

@@ -94,7 +94,6 @@ func newTestBackendWithGenerator(blocks int, shanghai bool, generator func(int,
 			MergeNetsplitBlock:      big.NewInt(0),
 			ShanghaiTime:            u64(0),
 			TerminalTotalDifficulty: big.NewInt(0),
-			TerminalTotalDifficultyPassed: true,
 			Ethash:                  new(params.EthashConfig),
 		}
 		engine = beacon.NewFaker()

graphql/graphql_test.go

@@ -460,7 +460,6 @@ func newGQLService(t *testing.T, stack *node.Node, shanghai bool, gspec *core.Ge
 	if shanghai {
 		engine = beacon.NewFaker()
 		chainCfg := gspec.Config
-		chainCfg.TerminalTotalDifficultyPassed = true
 		chainCfg.TerminalTotalDifficulty = common.Big0
 		// GenerateChain will increment timestamps by 10.
 		// Shanghai upgrade at block 1.

params/config.go

@@ -55,7 +55,6 @@ var (
 		ArrowGlacierBlock:       big.NewInt(13_773_000),
 		GrayGlacierBlock:        big.NewInt(15_050_000),
 		TerminalTotalDifficulty: MainnetTerminalTotalDifficulty, // 58_750_000_000_000_000_000_000
-		TerminalTotalDifficultyPassed: true,
 		ShanghaiTime:            newUint64(1681338455),
 		CancunTime:              newUint64(1710338135),
 		DepositContractAddress:  common.HexToAddress("0x00000000219ab540356cbb839cbe05303d7705fa"),
@@ -80,7 +79,6 @@ var (
 		ArrowGlacierBlock:       nil,
 		GrayGlacierBlock:        nil,
 		TerminalTotalDifficulty: big.NewInt(0),
-		TerminalTotalDifficultyPassed: true,
 		MergeNetsplitBlock:      nil,
 		ShanghaiTime:            newUint64(1696000704),
 		CancunTime:              newUint64(1707305664),
@@ -105,7 +103,6 @@ var (
 		ArrowGlacierBlock:       nil,
 		GrayGlacierBlock:        nil,
 		TerminalTotalDifficulty: big.NewInt(17_000_000_000_000_000),
-		TerminalTotalDifficultyPassed: true,
 		MergeNetsplitBlock:      big.NewInt(1735371),
 		ShanghaiTime:            newUint64(1677557088),
 		CancunTime:              newUint64(1706655072),
@@ -136,7 +133,6 @@ var (
 		PragueTime:              nil,
 		VerkleTime:              nil,
 		TerminalTotalDifficulty: nil,
-		TerminalTotalDifficultyPassed: true,
 		Ethash:                  new(EthashConfig),
 		Clique:                  nil,
 	}
@@ -158,9 +154,7 @@ var (
 		GrayGlacierBlock:        big.NewInt(0),
 		ShanghaiTime:            newUint64(0),
 		CancunTime:              newUint64(0),
-		PragueTime:                    newUint64(0),
 		TerminalTotalDifficulty: big.NewInt(0),
-		TerminalTotalDifficultyPassed: true,
 	}
 
 	// AllCliqueProtocolChanges contains every protocol change (EIPs) introduced
@@ -188,7 +182,6 @@ var (
 		PragueTime:              nil,
 		VerkleTime:              nil,
 		TerminalTotalDifficulty: nil,
-		TerminalTotalDifficultyPassed: false,
 		Ethash:                  nil,
 		Clique:                  &CliqueConfig{Period: 0, Epoch: 30000},
 	}
@@ -218,7 +211,6 @@ var (
 		PragueTime:              nil,
 		VerkleTime:              nil,
 		TerminalTotalDifficulty: nil,
-		TerminalTotalDifficultyPassed: false,
 		Ethash:                  new(EthashConfig),
 		Clique:                  nil,
 	}
@@ -248,7 +240,6 @@ var (
 		PragueTime:              newUint64(0),
 		VerkleTime:              nil,
 		TerminalTotalDifficulty: big.NewInt(0),
-		TerminalTotalDifficultyPassed: true,
 		Ethash:                  new(EthashConfig),
 		Clique:                  nil,
 	}
@@ -278,7 +269,6 @@ var (
 		PragueTime:              nil,
 		VerkleTime:              nil,
 		TerminalTotalDifficulty: nil,
-		TerminalTotalDifficultyPassed: false,
 		Ethash:                  new(EthashConfig),
 		Clique:                  nil,
 	}
@@ -332,13 +322,6 @@ type ChainConfig struct {
 	// the network that triggers the consensus upgrade.
 	TerminalTotalDifficulty *big.Int `json:"terminalTotalDifficulty,omitempty"`
 
-	// TerminalTotalDifficultyPassed is a flag specifying that the network already
-	// passed the terminal total difficulty. Its purpose is to disable legacy sync
-	// even without having seen the TTD locally (safer long term).
-	//
-	// TODO(karalabe): Drop this field eventually (always assuming PoS mode)
-	TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed,omitempty"`
-
 	DepositContractAddress common.Address `json:"depositContractAddress,omitempty"`
 
 	// Various consensus engines
@@ -379,16 +362,12 @@ func (c *ChainConfig) Description() string {
 	case c.Ethash != nil:
 		if c.TerminalTotalDifficulty == nil {
 			banner += "Consensus: Ethash (proof-of-work)\n"
-		} else if !c.TerminalTotalDifficultyPassed {
-			banner += "Consensus: Beacon (proof-of-stake), merging from Ethash (proof-of-work)\n"
 		} else {
 			banner += "Consensus: Beacon (proof-of-stake), merged from Ethash (proof-of-work)\n"
 		}
 	case c.Clique != nil:
 		if c.TerminalTotalDifficulty == nil {
 			banner += "Consensus: Clique (proof-of-authority)\n"
-		} else if !c.TerminalTotalDifficultyPassed {
-			banner += "Consensus: Beacon (proof-of-stake), merging from Clique (proof-of-authority)\n"
 		} else {
 			banner += "Consensus: Beacon (proof-of-stake), merged from Clique (proof-of-authority)\n"
 		}
@@ -432,7 +411,7 @@ func (c *ChainConfig) Description() string {
 	} else {
 		banner += "Merge configured:\n"
 		banner += " - Hard-fork specification:    https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md\n"
-		banner += fmt.Sprintf(" - Network known to be merged: %v\n", c.TerminalTotalDifficultyPassed)
+		banner += " - Network known to be merged\n"
 		banner += fmt.Sprintf(" - Total terminal difficulty:  %v\n", c.TerminalTotalDifficulty)
 		if c.MergeNetsplitBlock != nil {
 			banner += fmt.Sprintf(" - Merge netsplit block:       #%-8v\n", c.MergeNetsplitBlock)

tests/difficulty_test.go

@@ -51,7 +51,6 @@ var (
 		BerlinBlock:             big.NewInt(9_812_189),
 		LondonBlock:             big.NewInt(10_499_401),
 		TerminalTotalDifficulty: new(big.Int).SetUint64(50_000_000_000_000_000),
-		TerminalTotalDifficultyPassed: true,
 	}
 )