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 /ethereal/config.go | |
| parent | 32c6126593100d37c38e423ec62c56938e5f9155 (diff) | |
| parent | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (diff) | |
| download | go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.gz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.bz2 go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.lz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.xz go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.zst go-tangerine-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
ethereal/ethereum.go
ethereum/ethereum.go
Diffstat (limited to 'ethereal/config.go')
| -rw-r--r-- | ethereal/config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ethereal/config.go b/ethereal/config.go index 94f896c5f..e4bdb0a00 100644 --- a/ethereal/config.go +++ b/ethereal/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 @@ -28,6 +29,7 @@ func Init() { flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&ExportKey, "export", false, "export private key") + flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.StringVar(&OutboundPort, "p", "30303", "listening port") flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") |