diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:39:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:39:56 +0800 |
| commit | c12046d6bfb197adb0004d629a783dd92f0cfc0f (patch) | |
| tree | 2904bb92564979b234e134e2d06638e82e912828 /cmd/ethereum/main.go | |
| parent | baca0c2251a2587c136999a91449d9b6f7a6c60f (diff) | |
| parent | 79f90bf7c1c089ecc57fc5baecda636a0be5c5bb (diff) | |
| download | dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.gz dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.bz2 dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.lz dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.xz dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.zst dexon-c12046d6bfb197adb0004d629a783dd92f0cfc0f.zip | |
Merge branch 'ethersphere-frontier/cli-private-network' into develop
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 35b636c6e..7524af4b2 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -42,7 +42,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.9.1" + Version = "Frontier - 0.9.1" ) var ( @@ -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. |