diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-04 15:54:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-04 15:54:07 +0800 |
| commit | 17b481e3c30c10866fe756833e145717ec29d918 (patch) | |
| tree | eb858a491435a56851db5ea500265940fd0c9752 /cmd/geth | |
| parent | 97cdf848996b9a3aa8b7683b04798452ed8a5cb4 (diff) | |
| parent | dcdb7059cc69ee4e77518b8dd92d5c7037aa3c8d (diff) | |
| download | dexon-17b481e3c30c10866fe756833e145717ec29d918.tar dexon-17b481e3c30c10866fe756833e145717ec29d918.tar.gz dexon-17b481e3c30c10866fe756833e145717ec29d918.tar.bz2 dexon-17b481e3c30c10866fe756833e145717ec29d918.tar.lz dexon-17b481e3c30c10866fe756833e145717ec29d918.tar.xz dexon-17b481e3c30c10866fe756833e145717ec29d918.tar.zst dexon-17b481e3c30c10866fe756833e145717ec29d918.zip | |
Merge pull request #1581 from obscuren/olympic
cmd, core, eth: support for the olympic network
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 68a2c79e2..511e0df9d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -280,6 +280,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.BootnodesFlag, utils.DataDirFlag, utils.BlockchainVersionFlag, + utils.OlympicFlag, utils.CacheFlag, utils.JSpathFlag, utils.ListenPortFlag, @@ -346,6 +347,9 @@ func main() { func run(ctx *cli.Context) { utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name)) + if ctx.GlobalBool(utils.OlympicFlag.Name) { + utils.InitOlympic() + } cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) ethereum, err := eth.New(cfg) |