From 22411919da72d6f274ad88992ab6bea61cc4336a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 2 Jul 2019 14:14:59 +0300 Subject: [PATCH] cmd, eth, les, param: drop --override.constantinople --- cmd/geth/config.go | 4 ---- cmd/geth/main.go | 1 - cmd/utils/flags.go | 4 ---- core/genesis.go | 7 ------- eth/backend.go | 2 +- eth/config.go | 3 --- eth/gen_config.go | 5 ----- les/backend.go | 2 +- params/config.go | 4 ++-- 9 files changed, 4 insertions(+), 28 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 3b63d6913f..ef26f250ea 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -20,7 +20,6 @@ import ( "bufio" "errors" "fmt" - "math/big" "os" "reflect" "unicode" @@ -153,9 +152,6 @@ func enableWhisper(ctx *cli.Context) bool { func makeFullNode(ctx *cli.Context) *node.Node { stack, cfg := makeConfigNode(ctx) - if ctx.GlobalIsSet(utils.ConstantinopleOverrideFlag.Name) { - cfg.Eth.ConstantinopleOverride = new(big.Int).SetUint64(ctx.GlobalUint64(utils.ConstantinopleOverrideFlag.Name)) - } utils.RegisterEthService(stack, &cfg.Eth) if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 7e94da1f5d..414900b45f 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -138,7 +138,6 @@ var ( utils.GoerliFlag, utils.VMEnableDebugFlag, utils.NetworkIdFlag, - utils.ConstantinopleOverrideFlag, utils.EthStatsURLFlag, utils.FakePoWFlag, utils.NoCompactionFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8d94539ab9..f928edc0f7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -155,10 +155,6 @@ var ( Name: "goerli", Usage: "Görli network: pre-configured proof-of-authority test network", } - ConstantinopleOverrideFlag = cli.Uint64Flag{ - Name: "override.constantinople", - Usage: "Manually specify constantinople fork-block, overriding the bundled setting", - } DeveloperFlag = cli.BoolFlag{ Name: "dev", Usage: "Ephemeral proof-of-authority network with a pre-funded developer account, mining enabled", diff --git a/core/genesis.go b/core/genesis.go index 830fb033b8..57809fe73a 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -151,9 +151,6 @@ func (e *GenesisMismatchError) Error() string { // // The returned chain configuration is never nil. func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig, common.Hash, error) { - return SetupGenesisBlockWithOverride(db, genesis, nil) -} -func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, constantinopleOverride *big.Int) (*params.ChainConfig, common.Hash, error) { if genesis != nil && genesis.Config == nil { return params.AllEthashProtocolChanges, common.Hash{}, errGenesisNoConfig } @@ -196,10 +193,6 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, constant // Get the existing chain configuration. newcfg := genesis.configOrDefault(stored) - if constantinopleOverride != nil { - newcfg.ConstantinopleBlock = constantinopleOverride - newcfg.PetersburgBlock = constantinopleOverride - } storedcfg := rawdb.ReadChainConfig(db, stored) if storedcfg == nil { log.Warn("Found genesis block without chain config") diff --git a/eth/backend.go b/eth/backend.go index 9f6b5a0026..a3275cacab 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -134,7 +134,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { if err != nil { return nil, err } - chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.ConstantinopleOverride) + chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { return nil, genesisErr } diff --git a/eth/config.go b/eth/config.go index eb61f1d5dc..a5913442d8 100644 --- a/eth/config.go +++ b/eth/config.go @@ -144,9 +144,6 @@ type Config struct { // Type of the EVM interpreter ("" for default) EVMInterpreter string - // Constantinople block override (TODO: remove after the fork) - ConstantinopleOverride *big.Int - // RPCGasCap is the global gas cap for eth-call variants. RPCGasCap *big.Int `toml:",omitempty"` diff --git a/eth/gen_config.go b/eth/gen_config.go index 77b28d025b..d76499943d 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -78,7 +78,6 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.DocRoot = c.DocRoot enc.EWASMInterpreter = c.EWASMInterpreter enc.EVMInterpreter = c.EVMInterpreter - enc.ConstantinopleOverride = c.ConstantinopleOverride enc.RPCGasCap = c.RPCGasCap enc.Checkpoint = c.Checkpoint enc.CheckpointOracle = c.CheckpointOracle @@ -115,7 +114,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { DocRoot *string `toml:"-"` EWASMInterpreter *string EVMInterpreter *string - ConstantinopleOverride *big.Int RPCGasCap *big.Int `toml:",omitempty"` Checkpoint *params.TrustedCheckpoint CheckpointOracle *params.CheckpointOracleConfig @@ -205,9 +203,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.EVMInterpreter != nil { c.EVMInterpreter = *dec.EVMInterpreter } - if dec.ConstantinopleOverride != nil { - c.ConstantinopleOverride = dec.ConstantinopleOverride - } if dec.RPCGasCap != nil { c.RPCGasCap = dec.RPCGasCap } diff --git a/les/backend.go b/les/backend.go index 69aa4e6e23..daaa6c71d9 100644 --- a/les/backend.go +++ b/les/backend.go @@ -84,7 +84,7 @@ func New(ctx *node.ServiceContext, config *eth.Config) (*LightEthereum, error) { if err != nil { return nil, err } - chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.ConstantinopleOverride) + chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat { return nil, genesisErr } diff --git a/params/config.go b/params/config.go index e79d4ffc9f..b46e32d057 100644 --- a/params/config.go +++ b/params/config.go @@ -282,7 +282,7 @@ func (c *ChainConfig) String() string { default: engine = "unknown" } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v ConstantinopleFix: %v Engine: %v}", + return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Engine: %v}", c.ChainID, c.HomesteadBlock, c.DAOForkBlock, @@ -410,7 +410,7 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int) *Confi return newCompatError("Constantinople fork block", c.ConstantinopleBlock, newcfg.ConstantinopleBlock) } if isForkIncompatible(c.PetersburgBlock, newcfg.PetersburgBlock, head) { - return newCompatError("ConstantinopleFix fork block", c.PetersburgBlock, newcfg.PetersburgBlock) + return newCompatError("Petersburg fork block", c.PetersburgBlock, newcfg.PetersburgBlock) } if isForkIncompatible(c.EWASMBlock, newcfg.EWASMBlock, head) { return newCompatError("ewasm fork block", c.EWASMBlock, newcfg.EWASMBlock)