aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-19 01:37:20 +0800
committerobscuren <geffobscura@gmail.com>2015-03-19 01:37:20 +0800
commitbc5ae943843231b9bab0edcf5ab9d0a19bf37870 (patch)
treeef0d88368725c57566dec9d7f0bac7d4e7e47060 /cmd
parentbaca0c2251a2587c136999a91449d9b6f7a6c60f (diff)
parentca8d18417358906e32a33a7c03c51b6849c46dda (diff)
downloaddexon-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')
-rw-r--r--cmd/ethereum/main.go6
-rw-r--r--cmd/mist/main.go4
-rw-r--r--cmd/utils/flags.go71
3 files changed, 47 insertions, 34 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.
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 1c51233e3..fab651b22 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -28,8 +28,8 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/ui/qt/webengine"
"github.com/obscuren/qml"
@@ -66,6 +66,8 @@ func init() {
utils.RPCListenAddrFlag,
utils.RPCPortFlag,
utils.JSpathFlag,
+ utils.ProtocolVersionFlag,
+ utils.NetworkIdFlag,
}
}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 42256903e..1d8f6382b 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -11,11 +11,11 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethdb"
- "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/p2p/nat"
@@ -70,25 +70,23 @@ func NewApp(version, usage string) *cli.App {
var (
// General settings
- /*
- VMTypeFlag = cli.IntFlag{
- Name: "vm",
- Usage: "Virtual Machine type: 0 is standard VM, 1 is debug VM",
- }
- */
- UnlockedAccountFlag = cli.StringFlag{
- Name: "unlock",
- Usage: "Unlock a given account untill this programs exits (address:password)",
- }
- VMDebugFlag = cli.BoolFlag{
- Name: "vmdebug",
- Usage: "Virtual Machine debug output",
- }
DataDirFlag = cli.StringFlag{
Name: "datadir",
Usage: "Data directory to be used",
Value: common.DefaultDataDir(),
}
+ ProtocolVersionFlag = cli.IntFlag{
+ Name: "protocolversion",
+ Usage: "ETH protocol version",
+ Value: eth.ProtocolVersion,
+ }
+ NetworkIdFlag = cli.IntFlag{
+ Name: "networkid",
+ Usage: "Network Id",
+ Value: eth.NetworkId,
+ }
+
+ // miner settings
MinerThreadsFlag = cli.IntFlag{
Name: "minerthreads",
Usage: "Number of miner threads",
@@ -98,11 +96,18 @@ var (
Name: "mine",
Usage: "Enable mining",
}
+
+ // key settings
UnencryptedKeysFlag = cli.BoolFlag{
Name: "unencrypted-keys",
Usage: "disable private key disk encryption (for testing)",
}
+ UnlockedAccountFlag = cli.StringFlag{
+ Name: "unlock",
+ Usage: "Unlock a given account untill this programs exits (address:password)",
+ }
+ // logging and debug settings
LogFileFlag = cli.StringFlag{
Name: "logfile",
Usage: "Send log output to a file",
@@ -117,6 +122,10 @@ var (
Usage: `"std" or "raw"`,
Value: "std",
}
+ VMDebugFlag = cli.BoolFlag{
+ Name: "vmdebug",
+ Usage: "Virtual Machine debug output",
+ }
// RPC settings
RPCEnabledFlag = cli.BoolFlag{
@@ -198,21 +207,23 @@ func GetNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) {
func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
return &eth.Config{
- Name: common.MakeName(clientID, version),
- DataDir: ctx.GlobalString(DataDirFlag.Name),
- LogFile: ctx.GlobalString(LogFileFlag.Name),
- LogLevel: ctx.GlobalInt(LogLevelFlag.Name),
- LogFormat: ctx.GlobalString(LogFormatFlag.Name),
- MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
- AccountManager: GetAccountManager(ctx),
- VmDebug: ctx.GlobalBool(VMDebugFlag.Name),
- MaxPeers: ctx.GlobalInt(MaxPeersFlag.Name),
- Port: ctx.GlobalString(ListenPortFlag.Name),
- NAT: GetNAT(ctx),
- NodeKey: GetNodeKey(ctx),
- Shh: true,
- Dial: true,
- BootNodes: ctx.GlobalString(BootnodesFlag.Name),
+ Name: common.MakeName(clientID, version),
+ DataDir: ctx.GlobalString(DataDirFlag.Name),
+ ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name),
+ NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
+ LogFile: ctx.GlobalString(LogFileFlag.Name),
+ LogLevel: ctx.GlobalInt(LogLevelFlag.Name),
+ LogFormat: ctx.GlobalString(LogFormatFlag.Name),
+ MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
+ AccountManager: GetAccountManager(ctx),
+ VmDebug: ctx.GlobalBool(VMDebugFlag.Name),
+ MaxPeers: ctx.GlobalInt(MaxPeersFlag.Name),
+ Port: ctx.GlobalString(ListenPortFlag.Name),
+ NAT: GetNAT(ctx),
+ NodeKey: GetNodeKey(ctx),
+ Shh: true,
+ Dial: true,
+ BootNodes: ctx.GlobalString(BootnodesFlag.Name),
}
}