Merge ethereum/poc-9 into accounts-integration

Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
This commit is contained in:
Felix Lange
2015-03-09 23:25:46 +01:00
84 changed files with 25638 additions and 6387 deletions

View File

@ -13,6 +13,7 @@ type Backend interface {
PeerCount() int
IsListening() bool
Peers() []*p2p.Peer
Db() ethutil.Database
BlockDb() ethutil.Database
StateDb() ethutil.Database
EventMux() *event.TypeMux
}