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/mist | |
parent | db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff) | |
parent | 429077a5a043ea6664f795ab34ad09ec2f65286f (diff) | |
download | dexon-d00e2731e50f5b535e5deba63ea7f93168906712.tar.gz dexon-d00e2731e50f5b535e5deba63ea7f93168906712.tar.zst dexon-d00e2731e50f5b535e5deba63ea7f93168906712.zip |
Merge branch 'develop' of https://github.com/tgerring/go-ethereum into tgerring-develop
Conflicts:
rpc/http/server.go
Diffstat (limited to 'cmd/mist')
-rw-r--r-- | cmd/mist/flags.go | 2 |
1 files changed, 1 insertions, 1 deletions
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") |