gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork

Browse Source 
(cherry picked from commit 2c2e389b77)
This commit is contained in:
Péter Szilágyi
2016-07-14 11:22:58 +03:00
parent b8c0883770
commit 1b2941cd56
12 changed files with 7520 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/utils/flags.go
View File

@ -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 {