diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 03:44:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 03:44:30 +0800 |
| commit | d00e2731e50f5b535e5deba63ea7f93168906712 (patch) | |
| tree | ad910fd3335d5bc7b7741196b91e340d4322a503 /cmd | |
| parent | db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff) | |
| parent | 429077a5a043ea6664f795ab34ad09ec2f65286f (diff) | |
| download | go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar.gz go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar.bz2 go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar.lz go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar.xz go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.tar.zst go-tangerine-d00e2731e50f5b535e5deba63ea7f93168906712.zip | |
Merge branch 'develop' of https://github.com/tgerring/go-ethereum into tgerring-develop
Conflicts:
rpc/http/server.go
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/flags.go | 2 | ||||
| -rw-r--r-- | cmd/mist/flags.go | 2 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index e0fbbb008..5bbcf3f36 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -96,7 +96,7 @@ 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") diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 9dc3ae10a..9f91582f6 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -111,7 +111,7 @@ func Init() { flag.StringVar(&OutboundPort, "port", "30303", "listening port") flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support") 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", true, "start rpc server") flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server") diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 43ad88c55..c26dab44c 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -205,7 +205,7 @@ func StartWebSockets(eth *eth.Ethereum, wsPort int) { clilogger.Infoln("Starting WebSockets") var err error - eth.WsServer, err = rpcws.NewWebSocketServer(eth, wsPort) + eth.WsServer, err = rpcws.NewWebSocketServer(xeth.New(eth), wsPort) if err != nil { clilogger.Errorf("Could not start RPC interface (port %v): %v", wsPort, err) } else { |