diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
| commit | a5ea21cd85530eee6eb1bb83c37c20d009f11f74 (patch) | |
| tree | e5be5bd595139ff7dfbe6261e1e659d8e7dd6f9c /cmd/ethereum | |
| parent | db24fb792cf0dab91bc85e79aecf6758349002a4 (diff) | |
| parent | 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d (diff) | |
| download | go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.gz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.bz2 go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.lz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.xz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.zst go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.zip | |
merge
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 8 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 885cdfe5b..bcdd7aa84 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -41,6 +41,7 @@ var ( StartRpc bool StartWebSockets bool RpcPort int + WsPort int NatType string PMPGateway string OutboundPort string @@ -48,7 +49,7 @@ var ( AddPeer string MaxPeer int GenAddr bool - UseSeed bool + SeedNode string SecretFile string ExportDir string NonInteractive bool @@ -96,11 +97,12 @@ func Init() { flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)") flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP") flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers") - flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") + flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on") + flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on") 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 b7997d485..f8851ecd3 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -36,7 +36,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.8.1" + Version = "0.8.2" ) var clilogger = logger.NewLogger("CLI") @@ -132,10 +132,10 @@ func main() { } if StartWebSockets { - utils.StartWebSockets(ethereum) + utils.StartWebSockets(ethereum, WsPort) } - utils.StartEthereum(ethereum, UseSeed) + utils.StartEthereum(ethereum, SeedNode) if StartJsConsole { InitJsConsole(ethereum) |