Commit Graph

8 Commits

Author SHA1 Message Date
obscuren 125bdc3253 Merge branch 'develop' into poc8
Conflicts:
	cmd/ethereum/flags.go
2014-12-20 02:45:05 +01:00
obscuren 0a9dc1536c Increased peer from 10 to 30 2014-12-20 02:33:45 +01:00
zelig 72290f67fe resolve merge conflict hell 2014-12-14 20:57:29 +00:00
zelig 61940b2275 adapt cmd/cli to new backend
- new flag nat for nat support UPNP|PMP
- new flag pmp for PMP gateway IP
- add NatType to utils/cmd to get p2p.NAT from nat type string
- obsolete usepnp flag
- get rid of IsUpToDate and sleep in miner start
- ethereum constructor takes nat type, port, maxpeer
- add pubkey arg to client identity
2014-12-14 20:52:28 +00:00
zelig d9b16c1197 new cli options
- nat UPNP|PMP
- gateway for PMP NAT
- obsolete usepnp
- add pubkey to client identity
2014-12-14 20:30:56 +00:00
obscuren b1c247231b ethlog => logger 2014-10-31 12:56:05 +01:00
Felix Lange 184055b3e2 cmd/*: add license headers 2014-10-23 15:48:53 +02:00
Felix Lange 69baa465ea Merge eth-go repository into go-ethereum
mist, etheruem have been moved to cmd/
2014-10-23 15:01:27 +02:00