From 78b70d79ecdf9cde1b38855101840b19e365935c Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 1 Apr 2016 21:54:51 +0200 Subject: cmd/utils: fix geth startup with empty database --- cmd/utils/flags.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'cmd') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3f54b40ca..5c0c3c614 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -772,23 +772,22 @@ func MustMakeChainConfig(ctx *cli.Context) *core.ChainConfig { ) defer db.Close() - chainConfig, err := core.GetChainConfig(db, genesis.Hash()) - if err != nil { - if err != core.ChainConfigNotFoundErr { + if genesis != nil { + // Exsting genesis block, use stored config if available. + storedConfig, err := core.GetChainConfig(db, genesis.Hash()) + if err == nil { + return storedConfig + } else if err != core.ChainConfigNotFoundErr { Fatalf("Could not make chain configuration: %v", err) } - var homesteadBlockNo *big.Int - if ctx.GlobalBool(TestNetFlag.Name) { - homesteadBlockNo = params.TestNetHomesteadBlock - } else { - homesteadBlockNo = params.MainNetHomesteadBlock - } - - chainConfig = &core.ChainConfig{ - HomesteadBlock: homesteadBlockNo, - } } - return chainConfig + var homesteadBlockNo *big.Int + if ctx.GlobalBool(TestNetFlag.Name) { + homesteadBlockNo = params.TestNetHomesteadBlock + } else { + homesteadBlockNo = params.MainNetHomesteadBlock + } + return &core.ChainConfig{HomesteadBlock: homesteadBlockNo} } // MakeChainDatabase open an LevelDB using the flags passed to the client and will hard crash if it fails. -- cgit v1.2.3 From cf842b3fe5ad497ef8dfd24c9179bc2fadbc707f Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 1 Apr 2016 21:55:30 +0200 Subject: cmd/geth, eth: move --genesis deprecation warning to cmd/geth This prevents display of the warning for --dev and --olympic. --- cmd/geth/main.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmd') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 5d5ab4559..3a6366f4d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -359,6 +359,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso go metrics.CollectProcessMetrics(3 * time.Second) utils.SetupNetwork(ctx) + + // Deprecation warning. + if ctx.GlobalIsSet(utils.GenesisFileFlag.Name) { + common.PrintDepricationWarning("--genesis is deprecated. Switch to use 'geth init /path/to/file'") + } + return nil } -- cgit v1.2.3