diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-14 16:22:58 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:30:07 +0800 |
| commit | 1b2941cd56d69744e6121b7a590285d0faecbded (patch) | |
| tree | 3c65047a8230fe02333e43b2277f9e69b91b47e3 /cmd/utils | |
| parent | b8c088377097f040dc51f56d3e375d039e0e9ebe (diff) | |
| download | go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.gz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.bz2 go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.lz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.xz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.zst go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.zip | |
[release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork
(cherry picked from commit 2c2e389b778b490fcaf14d9cc45a750647ca5c68)
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 9 |
1 files changed, 5 insertions, 4 deletions
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 { |