gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
obscuren
2015-02-13 15:05:56 +01:00
parent db24fb792c 38faf2c51a
commit a5ea21cd85
311 changed files with 24908 additions and 8721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ethereum/flags.go
View File

@ -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")

6
cmd/ethereum/main.go
View File

@ -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)