forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 1eca9501e0 into 8ea3c88e44

Browse source
This commit is contained in:
andrew.shvv 2016-05-18 10:40:07 +00:00
commit bf68a46f9a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/utils/flags.go
View file

@ -746,10 +746,10 @@ func MakeSystemNode(name, version string, relconf release.Config, extra []byte,
if !ctx.GlobalIsSet(ListenPortFlag.Name) { if !ctx.GlobalIsSet(ListenPortFlag.Name) {
stackConf.ListenAddr = ":0" stackConf.ListenAddr = ":0"
} }
// Override the Ethereum protocol configs //// Override the Ethereum protocol configs
if !ctx.GlobalIsSet(GenesisFileFlag.Name) { //if !ctx.GlobalIsSet(GenesisFileFlag.Name) {
ethConf.Genesis = core.OlympicGenesisBlock() // ethConf.Genesis = core.OlympicGenesisBlock()
} //}
if !ctx.GlobalIsSet(GasPriceFlag.Name) { if !ctx.GlobalIsSet(GasPriceFlag.Name) {
ethConf.GasPrice = new(big.Int) ethConf.GasPrice = new(big.Int)
} }