diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 04:22:44 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 04:22:44 +0800 |
| commit | 2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6 (patch) | |
| tree | d770ff203eec3c730d838e88b7609934b550a56f /cmd/mist | |
| parent | 8be1d134aae80390c1b45b86f06c4842fabbcd17 (diff) | |
| parent | 99a1551b20ebb2d8e0a40287e840c56cd55942b1 (diff) | |
| download | go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.gz go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.zst go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/flags.go | 4 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 9f91582f6..f042b39b0 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -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)") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index a66288a3e..66872a241 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -84,7 +84,7 @@ func run() error { utils.RegisterInterrupt(func(os.Signal) { gui.Stop() }) - go utils.StartEthereum(ethereum, UseSeed) + go utils.StartEthereum(ethereum, SeedNode) fmt.Println("ETH stack took", time.Since(tstart)) diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 5e141bdaf..7c5802076 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -136,7 +136,7 @@ func (ui *UiLib) Muted(content string) { func (ui *UiLib) Connect(button qml.Object) { if !ui.connected { - ui.eth.Start(true) + ui.eth.Start(SeedNode) ui.connected = true button.Set("enabled", false) } |