From 90e67970ae69e8161c97166dcbf2512e1c07d94c Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 9 Jul 2024 14:30:19 +0800 Subject: [PATCH] core: clearup testflag for Cancun and Haber (#2572) --- cmd/geth/chaincmd.go | 10 ---------- cmd/geth/config.go | 8 -------- cmd/geth/main.go | 2 -- cmd/utils/flags.go | 10 ---------- core/genesis.go | 8 -------- eth/backend.go | 8 -------- eth/ethconfig/config.go | 6 ------ eth/ethconfig/gen_config.go | 12 ------------ 8 files changed, 64 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 6ffc150de1..27bc72e4d3 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -62,8 +62,6 @@ var ( ArgsUsage: "", Flags: flags.Merge([]cli.Flag{ utils.CachePreimagesFlag, - utils.OverrideCancun, - utils.OverrideHaber, utils.OverrideBohr, utils.OverrideVerkle, }, utils.DatabaseFlags), @@ -254,14 +252,6 @@ func initGenesis(ctx *cli.Context) error { defer stack.Close() var overrides core.ChainOverrides - if ctx.IsSet(utils.OverrideCancun.Name) { - v := ctx.Uint64(utils.OverrideCancun.Name) - overrides.OverrideCancun = &v - } - if ctx.IsSet(utils.OverrideHaber.Name) { - v := ctx.Uint64(utils.OverrideHaber.Name) - overrides.OverrideHaber = &v - } if ctx.IsSet(utils.OverrideBohr.Name) { v := ctx.Uint64(utils.OverrideBohr.Name) overrides.OverrideBohr = &v diff --git a/cmd/geth/config.go b/cmd/geth/config.go index e535dc8155..79049ef685 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -185,14 +185,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { params.RialtoGenesisHash = common.HexToHash(v) } - if ctx.IsSet(utils.OverrideCancun.Name) { - v := ctx.Uint64(utils.OverrideCancun.Name) - cfg.Eth.OverrideCancun = &v - } - if ctx.IsSet(utils.OverrideHaber.Name) { - v := ctx.Uint64(utils.OverrideHaber.Name) - cfg.Eth.OverrideHaber = &v - } if ctx.IsSet(utils.OverrideBohr.Name) { v := ctx.Uint64(utils.OverrideBohr.Name) cfg.Eth.OverrideBohr = &v diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 9763794f7e..c27abc865b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -72,8 +72,6 @@ var ( utils.USBFlag, utils.SmartCardDaemonPathFlag, utils.RialtoHash, - utils.OverrideCancun, - utils.OverrideHaber, utils.OverrideBohr, utils.OverrideVerkle, utils.OverrideFullImmutabilityThreshold, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8707840692..74c0d552a8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -305,16 +305,6 @@ var ( Usage: "Manually specify the Rialto Genesis Hash, to trigger builtin network logic", Category: flags.EthCategory, } - OverrideCancun = &cli.Uint64Flag{ - Name: "override.cancun", - Usage: "Manually specify the Cancun fork timestamp, overriding the bundled setting", - Category: flags.EthCategory, - } - OverrideHaber = &cli.Uint64Flag{ - Name: "override.haber", - Usage: "Manually specify the Haber fork timestamp, overriding the bundled setting", - Category: flags.EthCategory, - } OverrideBohr = &cli.Uint64Flag{ Name: "override.bohr", Usage: "Manually specify the Bohr fork timestamp, overriding the bundled setting", diff --git a/core/genesis.go b/core/genesis.go index d6aae918fa..71787ce2bf 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -216,8 +216,6 @@ func (e *GenesisMismatchError) Error() string { // ChainOverrides contains the changes to chain config // Typically, these modifications involve hardforks that are not enabled on the BSC mainnet, intended for testing purposes. type ChainOverrides struct { - OverrideCancun *uint64 - OverrideHaber *uint64 OverrideBohr *uint64 OverrideVerkle *uint64 } @@ -245,12 +243,6 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g } applyOverrides := func(config *params.ChainConfig) { if config != nil { - if overrides != nil && overrides.OverrideCancun != nil { - config.CancunTime = overrides.OverrideCancun - } - if overrides != nil && overrides.OverrideHaber != nil { - config.HaberTime = overrides.OverrideHaber - } if overrides != nil && overrides.OverrideBohr != nil { config.BohrTime = overrides.OverrideBohr } diff --git a/eth/backend.go b/eth/backend.go index 27f8fbbad2..aa0b90e49c 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -185,14 +185,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { } // Override the chain config with provided settings. var overrides core.ChainOverrides - if config.OverrideCancun != nil { - chainConfig.CancunTime = config.OverrideCancun - overrides.OverrideCancun = config.OverrideCancun - } - if config.OverrideHaber != nil { - chainConfig.HaberTime = config.OverrideHaber - overrides.OverrideHaber = config.OverrideHaber - } if config.OverrideBohr != nil { chainConfig.BohrTime = config.OverrideBohr overrides.OverrideBohr = config.OverrideBohr diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index a389a52fde..b9c8fce918 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -188,12 +188,6 @@ type Config struct { // send-transaction variants. The unit is ether. RPCTxFeeCap float64 - // OverrideCancun (TODO: remove after the fork) - OverrideCancun *uint64 `toml:",omitempty"` - - // OverrideHaber (TODO: remove after the fork) - OverrideHaber *uint64 `toml:",omitempty"` - // OverrideBohr (TODO: remove after the fork) OverrideBohr *uint64 `toml:",omitempty"` diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 26c4587fe4..44066e423f 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -70,8 +70,6 @@ func (c Config) MarshalTOML() (interface{}, error) { RPCGasCap uint64 RPCEVMTimeout time.Duration RPCTxFeeCap float64 - OverrideCancun *uint64 `toml:",omitempty"` - OverrideHaber *uint64 `toml:",omitempty"` OverrideBohr *uint64 `toml:",omitempty"` OverrideVerkle *uint64 `toml:",omitempty"` BlobExtraReserve uint64 @@ -130,8 +128,6 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.RPCGasCap = c.RPCGasCap enc.RPCEVMTimeout = c.RPCEVMTimeout enc.RPCTxFeeCap = c.RPCTxFeeCap - enc.OverrideCancun = c.OverrideCancun - enc.OverrideHaber = c.OverrideHaber enc.OverrideBohr = c.OverrideBohr enc.OverrideVerkle = c.OverrideVerkle enc.BlobExtraReserve = c.BlobExtraReserve @@ -194,8 +190,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RPCGasCap *uint64 RPCEVMTimeout *time.Duration RPCTxFeeCap *float64 - OverrideCancun *uint64 `toml:",omitempty"` - OverrideHaber *uint64 `toml:",omitempty"` OverrideBohr *uint64 `toml:",omitempty"` OverrideVerkle *uint64 `toml:",omitempty"` BlobExtraReserve *uint64 @@ -363,12 +357,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.RPCTxFeeCap != nil { c.RPCTxFeeCap = *dec.RPCTxFeeCap } - if dec.OverrideCancun != nil { - c.OverrideCancun = dec.OverrideCancun - } - if dec.OverrideHaber != nil { - c.OverrideHaber = dec.OverrideHaber - } if dec.OverrideBohr != nil { c.OverrideBohr = dec.OverrideBohr }