aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-06 04:22:44 +0800
committerobscuren <geffobscura@gmail.com>2015-02-06 04:22:44 +0800
commit2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6 (patch)
treed770ff203eec3c730d838e88b7609934b550a56f
parent8be1d134aae80390c1b45b86f06c4842fabbcd17 (diff)
parent99a1551b20ebb2d8e0a40287e840c56cd55942b1 (diff)
downloadgo-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.gz
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.bz2
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.lz
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.xz
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.tar.zst
go-tangerine-2f30a27b2be39197dd6e9f6aabe6fe11026bd2f6.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
-rw-r--r--cmd/ethereum/flags.go4
-rw-r--r--cmd/ethereum/main.go2
-rw-r--r--cmd/mist/flags.go4
-rw-r--r--cmd/mist/main.go2
-rw-r--r--cmd/mist/ui_lib.go2
-rw-r--r--cmd/utils/cmd.go4
-rw-r--r--eth/backend.go12
7 files changed, 13 insertions, 17 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 5bbcf3f36..af57c6a67 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -49,7 +49,7 @@ var (
AddPeer string
MaxPeer int
GenAddr bool
- UseSeed bool
+ SeedNode string
SecretFile string
ExportDir string
NonInteractive bool
@@ -101,7 +101,7 @@ func Init() {
flag.BoolVar(&StartRpc, "rpc", false, "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(&SHH, "shh", true, "whisper protocol (on)")
flag.BoolVar(&Dial, "dial", true, "dial out connections (on)")
flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 288040ee7..4b16fb79f 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -134,7 +134,7 @@ func main() {
utils.StartWebSockets(ethereum, WsPort)
}
- utils.StartEthereum(ethereum, UseSeed)
+ utils.StartEthereum(ethereum, SeedNode)
if StartJsConsole {
InitJsConsole(ethereum)
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)
}
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index c26dab44c..70df289c3 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -121,9 +121,9 @@ func exit(err error) {
os.Exit(status)
}
-func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
+func StartEthereum(ethereum *eth.Ethereum, SeedNode string) {
clilogger.Infof("Starting %s", ethereum.ClientIdentity())
- err := ethereum.Start(UseSeed)
+ err := ethereum.Start(SeedNode)
if err != nil {
exit(err)
}
diff --git a/eth/backend.go b/eth/backend.go
index a8db3ab20..43e757435 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -17,10 +17,6 @@ import (
"github.com/ethereum/go-ethereum/whisper"
)
-const (
- seedNodeAddress = "poc-8.ethdev.com:30303"
-)
-
type Config struct {
Name string
Version string
@@ -223,7 +219,7 @@ func (s *Ethereum) Coinbase() []byte {
}
// Start the ethereum
-func (s *Ethereum) Start(seed bool) error {
+func (s *Ethereum) Start(seedNode string) error {
err := s.net.Start()
if err != nil {
return err
@@ -246,9 +242,9 @@ func (s *Ethereum) Start(seed bool) error {
go s.blockBroadcastLoop()
// TODO: read peers here
- if seed {
- logger.Infof("Connect to seed node %v", seedNodeAddress)
- if err := s.SuggestPeer(seedNodeAddress); err != nil {
+ if len(seedNode) > 0 {
+ logger.Infof("Connect to seed node %v", seedNode)
+ if err := s.SuggestPeer(seedNode); err != nil {
logger.Infoln(err)
}
}