diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
| commit | dd60382fc3724ee9c9507cba8df9e6d6db1d5d51 (patch) | |
| tree | 65cf02326774f51a6c3fa96dbc71dd0ddecbc6cd /ethereum | |
| parent | 32c6126593100d37c38e423ec62c56938e5f9155 (diff) | |
| parent | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (diff) | |
| download | dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.gz dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.zst dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
ethereal/ethereum.go
ethereum/ethereum.go
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/config.go | 2 | ||||
| -rw-r--r-- | ethereum/ethereum.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ethereum/config.go b/ethereum/config.go index 234e79f12..7ca1a9801 100644 --- a/ethereum/config.go +++ b/ethereum/config.go @@ -7,6 +7,7 @@ import ( var StartConsole bool var StartMining bool var StartRpc bool +var RpcPort int var UseUPnP bool var OutboundPort string var ShowGenesis bool @@ -26,6 +27,7 @@ func Init() { flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits") //flag.BoolVar(&UseGui, "gui", true, "use the gui") flag.BoolVar(&StartRpc, "r", false, "start rpc server") + flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") flag.BoolVar(&UseSeed, "seed", true, "seed peers") diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index b60eb4181..5b578deba 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -133,7 +133,7 @@ func main() { go console.Start() } if StartRpc { - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum)) + ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) if err != nil { logger.Infoln("Could not start RPC interface:", err) } else { |