aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-07-16 17:14:20 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-07-16 17:38:37 +0800
commit993b41216092fa6dc20d3755afe322cd1376b398 (patch)
tree328c438483cb7c87333190605ec1ef79cfa162a6 /cmd
parent2c2e389b778b490fcaf14d9cc45a750647ca5c68 (diff)
downloaddexon-993b41216092fa6dc20d3755afe322cd1376b398.tar
dexon-993b41216092fa6dc20d3755afe322cd1376b398.tar.gz
dexon-993b41216092fa6dc20d3755afe322cd1376b398.tar.bz2
dexon-993b41216092fa6dc20d3755afe322cd1376b398.tar.lz
dexon-993b41216092fa6dc20d3755afe322cd1376b398.tar.xz
dexon-993b41216092fa6dc20d3755afe322cd1376b398.tar.zst
dexon-993b41216092fa6dc20d3755afe322cd1376b398.zip
cmd/utils, eth: display the user's current fork, minor text tweak
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go20
1 files changed, 19 insertions, 1 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 7b5915a05..de379f84f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -800,7 +800,8 @@ func MustMakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainC
// If the chain is already initialized, use any existing chain configs
config := new(core.ChainConfig)
- if genesis := core.GetBlock(db, core.GetCanonicalHash(db, 0), 0); genesis != nil {
+ genesis := core.GetBlock(db, core.GetCanonicalHash(db, 0), 0)
+ if genesis != nil {
storedConfig, err := core.GetChainConfig(db, genesis.Hash())
switch err {
case nil:
@@ -834,6 +835,23 @@ func MustMakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainC
case ctx.GlobalBool(OpposeDAOFork.Name):
config.DAOForkSupport = false
}
+ // Temporarilly display a proper message so the user knows which fork its on
+ if !ctx.GlobalBool(TestNetFlag.Name) && (genesis == nil || genesis.Hash() == common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")) {
+ choice := "SUPPORT"
+ if !config.DAOForkSupport {
+ choice = "OPPOSE"
+ }
+ current := fmt.Sprintf("Geth is currently configured to %s the DAO hard-fork!", choice)
+ howtoswap := fmt.Sprintf("You can change your choice prior to block #%v with --support-dao-fork or --oppose-dao-fork.", config.DAOForkBlock)
+ howtosync := fmt.Sprintf("After the hard-fork block #%v passed, changing chains requires a resync from scratch!", config.DAOForkBlock)
+ separator := strings.Repeat("-", len(howtoswap))
+
+ glog.V(logger.Warn).Info(separator)
+ glog.V(logger.Warn).Info(current)
+ glog.V(logger.Warn).Info(howtoswap)
+ glog.V(logger.Warn).Info(howtosync)
+ glog.V(logger.Warn).Info(separator)
+ }
return config
}