diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:37:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:37:20 +0800 |
| commit | bc5ae943843231b9bab0edcf5ab9d0a19bf37870 (patch) | |
| tree | ef0d88368725c57566dec9d7f0bac7d4e7e47060 /cmd/ethereum/main.go | |
| parent | baca0c2251a2587c136999a91449d9b6f7a6c60f (diff) | |
| parent | ca8d18417358906e32a33a7c03c51b6849c46dda (diff) | |
| download | dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.gz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.bz2 dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.lz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.xz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.zst dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.zip | |
Merge branch 'frontier/cli-private-network' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/cli-private-network
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 35b636c6e..38c04ec9d 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -148,8 +148,8 @@ The Ethereum JavaScript VM exposes a node admin interface as well as the DAPP Ja utils.RPCPortFlag, utils.UnencryptedKeysFlag, utils.VMDebugFlag, - - //utils.VMTypeFlag, + utils.ProtocolVersionFlag, + utils.NetworkIdFlag, } // missing: @@ -348,7 +348,7 @@ GO: %s OS: %s GOPATH=%s GOROOT=%s -`, ClientIdentifier, Version, eth.ProtocolVersion, eth.NetworkId, runtime.Version(), runtime.GOOS, os.Getenv("GOPATH"), runtime.GOROOT()) +`, ClientIdentifier, Version, c.GlobalInt(utils.ProtocolVersionFlag.Name), c.GlobalInt(utils.NetworkIdFlag.Name), runtime.Version(), runtime.GOOS, os.Getenv("GOPATH"), runtime.GOROOT()) } // hashish returns true for strings that look like hashes. |