gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Browse Source
This commit is contained in:
obscuren
2015-02-05 12:22:44 -08:00
parent 8be1d134aa 99a1551b20
commit 2f30a27b2b
7 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/mist/flags.go
View File

@ -51,7 +51,7 @@ var (
AddPeer string
MaxPeer int
GenAddr bool
UseSeed bool
SeedNode string
SecretFile string
ExportDir string
NonInteractive bool
@ -116,7 +116,7 @@ func Init() {
flag.BoolVar(&StartRpc, "rpc", true, "start rpc server")
flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
flag.BoolVar(&UseSeed, "seed", true, "seed peers")
flag.StringVar(&SeedNode, "seednode", "poc-8.ethdev.com:30303", "ip:port of seed node to connect to. Set to blank for skip")
flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")