diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
| commit | f0bb13609939ebbee22e9c9f39c6742341b0d20b (patch) | |
| tree | f92e9d256edd93cb384a2c1f9bddc0084347ee38 /cmd/ethereum | |
| parent | f9a6038f5b82cad6956c9cbb7f1220d97570632b (diff) | |
| parent | c12046d6bfb197adb0004d629a783dd92f0cfc0f (diff) | |
| download | go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.gz go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.bz2 go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.lz go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.xz go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.zst go-tangerine-f0bb13609939ebbee22e9c9f39c6742341b0d20b.zip | |
Merge branch 'develop' into conversion
Diffstat (limited to 'cmd/ethereum')
| -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 9ebbd9880..181d6d60d 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. |