aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/ethereum/main.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-18 15:44:58 +0800
committerzelig <viktor.tron@gmail.com>2015-03-18 15:44:58 +0800
commitb6aa88c099c16b38f0aebc749f7c95170426f787 (patch)
treee6f47c8e858add8e5d42a6452730e4771b336c4c /cmd/ethereum/main.go
parent7dbbe1bedce449edfdc54da1af05d3f50606856a (diff)
downloaddexon-b6aa88c099c16b38f0aebc749f7c95170426f787.tar.gz
dexon-b6aa88c099c16b38f0aebc749f7c95170426f787.tar.zst
dexon-b6aa88c099c16b38f0aebc749f7c95170426f787.zip
private network support
- protocolversion, networkid global int flags to cli and mist - fix bug with protocolversion check using wrong db - log protocolversion & networkid in backend
Diffstat (limited to 'cmd/ethereum/main.go')
-rw-r--r--cmd/ethereum/main.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 3b952dd79..94c62b97a 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -136,8 +136,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:
@@ -327,7 +327,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.