all: clear up flags for passed hard forks

Author: allformless

cmd/geth/chaincmd.go

@@ -68,9 +68,6 @@ var (
 		Flags: slices.Concat([]cli.Flag{
 			utils.CachePreimagesFlag,
 			utils.OverridePassedForkTime,
-			utils.OverrideLorentz,
-			utils.OverrideMaxwell,
-			utils.OverrideFermi,
 			utils.OverrideOsaka,
 			utils.OverrideMendel,
 			utils.OverrideBPO1,
@@ -337,18 +334,6 @@ func initGenesis(ctx *cli.Context) error {
 		v := ctx.Uint64(utils.OverridePassedForkTime.Name)
 		overrides.OverridePassedForkTime = &v
 	}
-	if ctx.IsSet(utils.OverrideLorentz.Name) {
-		v := ctx.Uint64(utils.OverrideLorentz.Name)
-		overrides.OverrideLorentz = &v
-	}
-	if ctx.IsSet(utils.OverrideMaxwell.Name) {
-		v := ctx.Uint64(utils.OverrideMaxwell.Name)
-		overrides.OverrideMaxwell = &v
-	}
-	if ctx.IsSet(utils.OverrideFermi.Name) {
-		v := ctx.Uint64(utils.OverrideFermi.Name)
-		overrides.OverrideFermi = &v
-	}
 	if ctx.IsSet(utils.OverrideOsaka.Name) {
 		v := ctx.Uint64(utils.OverrideOsaka.Name)
 		overrides.OverrideOsaka = &v

cmd/geth/config.go

@@ -258,18 +258,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverridePassedForkTime.Name)
 		cfg.Eth.OverridePassedForkTime = &v
 	}
-	if ctx.IsSet(utils.OverrideLorentz.Name) {
-		v := ctx.Uint64(utils.OverrideLorentz.Name)
-		cfg.Eth.OverrideLorentz = &v
-	}
-	if ctx.IsSet(utils.OverrideMaxwell.Name) {
-		v := ctx.Uint64(utils.OverrideMaxwell.Name)
-		cfg.Eth.OverrideMaxwell = &v
-	}
-	if ctx.IsSet(utils.OverrideFermi.Name) {
-		v := ctx.Uint64(utils.OverrideFermi.Name)
-		cfg.Eth.OverrideFermi = &v
-	}
 	if ctx.IsSet(utils.OverrideOsaka.Name) {
 		v := ctx.Uint64(utils.OverrideOsaka.Name)
 		cfg.Eth.OverrideOsaka = &v

cmd/geth/main.go

@@ -73,9 +73,6 @@ var (
 		utils.SmartCardDaemonPathFlag,
 		utils.RialtoHash,
 		utils.OverridePassedForkTime,
-		utils.OverrideLorentz,
-		utils.OverrideMaxwell,
-		utils.OverrideFermi,
 		utils.OverrideOsaka,
 		utils.OverrideMendel,
 		utils.OverrideBPO1,

cmd/utils/flags.go

@@ -299,21 +299,6 @@ var (
 		Usage:    "Manually specify the hard fork timestamps which have passed on the mainnet, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
-	OverrideLorentz = &cli.Uint64Flag{
-		Name:     "override.lorentz",
-		Usage:    "Manually specify the Lorentz fork timestamp, overriding the bundled setting",
-		Category: flags.EthCategory,
-	}
-	OverrideMaxwell = &cli.Uint64Flag{
-		Name:     "override.maxwell",
-		Usage:    "Manually specify the Maxwell fork timestamp, overriding the bundled setting",
-		Category: flags.EthCategory,
-	}
-	OverrideFermi = &cli.Uint64Flag{
-		Name:     "override.fermi",
-		Usage:    "Manually specify the Fermi fork timestamp, overriding the bundled setting",
-		Category: flags.EthCategory,
-	}
 	OverrideOsaka = &cli.Uint64Flag{
 		Name:     "override.osaka",
 		Usage:    "Manually specify the Osaka fork timestamp, overriding the bundled setting",

core/genesis.go

@@ -268,9 +268,6 @@ func (e *GenesisMismatchError) Error() string {
 // Typically, these modifications involve hardforks that are not enabled on the BSC mainnet, intended for testing purposes.
 type ChainOverrides struct {
 	OverridePassedForkTime *uint64
-	OverrideLorentz        *uint64
-	OverrideMaxwell        *uint64
-	OverrideFermi          *uint64
 	OverrideOsaka          *uint64
 	OverrideMendel         *uint64
 	OverrideBPO1           *uint64
@@ -294,15 +291,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error {
 		cfg.BohrTime = o.OverridePassedForkTime
 		cfg.PascalTime = o.OverridePassedForkTime
 		cfg.PragueTime = o.OverridePassedForkTime
-	}
-	if o.OverrideLorentz != nil {
-		cfg.LorentzTime = o.OverrideLorentz
-	}
-	if o.OverrideMaxwell != nil {
-		cfg.MaxwellTime = o.OverrideMaxwell
-	}
-	if o.OverrideFermi != nil {
-		cfg.FermiTime = o.OverrideFermi
+		cfg.LorentzTime = o.OverridePassedForkTime
+		cfg.MaxwellTime = o.OverridePassedForkTime
+		cfg.FermiTime = o.OverridePassedForkTime
 	}
 	if o.OverrideOsaka != nil {
 		cfg.OsakaTime = o.OverrideOsaka

eth/backend.go

@@ -239,20 +239,11 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		chainConfig.BohrTime = config.OverridePassedForkTime
 		chainConfig.PascalTime = config.OverridePassedForkTime
 		chainConfig.PragueTime = config.OverridePassedForkTime
+		chainConfig.LorentzTime = config.OverridePassedForkTime
+		chainConfig.MaxwellTime = config.OverridePassedForkTime
+		chainConfig.FermiTime = config.OverridePassedForkTime
 		overrides.OverridePassedForkTime = config.OverridePassedForkTime
 	}
-	if config.OverrideLorentz != nil {
-		chainConfig.LorentzTime = config.OverrideLorentz
-		overrides.OverrideLorentz = config.OverrideLorentz
-	}
-	if config.OverrideMaxwell != nil {
-		chainConfig.MaxwellTime = config.OverrideMaxwell
-		overrides.OverrideMaxwell = config.OverrideMaxwell
-	}
-	if config.OverrideFermi != nil {
-		chainConfig.FermiTime = config.OverrideFermi
-		overrides.OverrideFermi = config.OverrideFermi
-	}
 	if config.OverrideOsaka != nil {
 		chainConfig.OsakaTime = config.OverrideOsaka
 		overrides.OverrideOsaka = config.OverrideOsaka

eth/ethconfig/config.go

@@ -213,15 +213,6 @@ type Config struct {
 	// OverridePassedForkTime
 	OverridePassedForkTime *uint64 `toml:",omitempty"`
 
-	// OverrideLorentz (TODO: remove after the fork)
-	OverrideLorentz *uint64 `toml:",omitempty"`
-
-	// OverrideMaxwell (TODO: remove after the fork)
-	OverrideMaxwell *uint64 `toml:",omitempty"`
-
-	// OverrideFermi (TODO: remove after the fork)
-	OverrideFermi *uint64 `toml:",omitempty"`
-
 	// OverrideOsaka (TODO: remove after the fork)
 	OverrideOsaka *uint64 `toml:",omitempty"`
 

eth/ethconfig/gen_config.go

@@ -350,8 +350,8 @@ var (
 		PragueTime:          newUint64(0),
 		LorentzTime:         newUint64(0),
 		MaxwellTime:         newUint64(0),
+		FermiTime:           newUint64(0),
 		// TODO: set them to `0` when passed on the mainnet
-		FermiTime:  nil,
 		OsakaTime:  nil,
 		MendelTime: nil,