diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
| commit | bab78bbeb691d95bdd0222435af0c11cb3485a79 (patch) | |
| tree | 804c9689546ce362a2862b00bb4e76160052f5d6 /cmd/ethereum | |
| parent | 7a79428278412ab1f73708af51bce063b000b7a7 (diff) | |
| parent | 1360f027d9e365242466ca346b2b56f421729d91 (diff) | |
| download | go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.gz go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.bz2 go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.lz go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.xz go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.zst go-tangerine-bab78bbeb691d95bdd0222435af0c11cb3485a79.zip | |
Merge branch 'tests' of github.com:ethereum/go-ethereum into tests
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 2 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 783944cf2..85aca47c3 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -85,7 +85,7 @@ func Init() { flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") flag.StringVar(&OutboundPort, "port", "30303", "listening port") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") - flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") + flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server") diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index c39f904fb..2a3c46054 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -30,7 +30,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.7.7" + Version = "0.7.10" ) var clilogger = logger.NewLogger("CLI") @@ -77,7 +77,7 @@ func main() { var block *types.Block if len(DumpHash) == 0 && DumpNumber == -1 { - block = ethereum.ChainManager().CurrentBlock + block = ethereum.ChainManager().CurrentBlock() } else if len(DumpHash) > 0 { block = ethereum.ChainManager().GetBlock(ethutil.Hex2Bytes(DumpHash)) } else { |