From b6aa88c099c16b38f0aebc749f7c95170426f787 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Wed, 18 Mar 2015 14:44:58 +0700
Subject: 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
---
cmd/ethereum/main.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'cmd/ethereum')
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.
--
cgit v1.2.3
From 79f90bf7c1c089ecc57fc5baecda636a0be5c5bb Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 18 Mar 2015 18:39:24 +0100
Subject: added frontier to version
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 38c04ec9d..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 (
--
cgit v1.2.3