From 1b2941cd56d69744e6121b7a590285d0faecbded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 14 Jul 2016 11:22:58 +0300 Subject: [release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork (cherry picked from commit 2c2e389b778b490fcaf14d9cc45a750647ca5c68) --- cmd/utils/flags.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cmd/utils') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index a94237e0f..df1dd1367 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -807,17 +807,18 @@ func MustMakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainC // Set any missing fields due to them being unset or system upgrade if config.HomesteadBlock == nil { if ctx.GlobalBool(TestNetFlag.Name) { - config.HomesteadBlock = new(big.Int).Set(params.TestNetHomesteadBlock) + config.HomesteadBlock = params.TestNetHomesteadBlock } else { - config.HomesteadBlock = new(big.Int).Set(params.MainNetHomesteadBlock) + config.HomesteadBlock = params.MainNetHomesteadBlock } } if config.DAOForkBlock == nil { if ctx.GlobalBool(TestNetFlag.Name) { - config.DAOForkBlock = new(big.Int).Set(params.TestNetDAOForkBlock) + config.DAOForkBlock = params.TestNetDAOForkBlock } else { - config.DAOForkBlock = new(big.Int).Set(params.MainNetDAOForkBlock) + config.DAOForkBlock = params.MainNetDAOForkBlock } + config.DAOForkSupport = true } // Force override any existing configs if explicitly requested switch { -- cgit v1.2.3