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

@ -84,7 +84,7 @@ func (self *Gui) DumpState(hash, path string) {
return
}
stateDump = state.New(block.Root(), self.eth.Db()).Dump()
stateDump = state.New(block.Root(), self.eth.StateDb()).Dump()
}
file, err := os.OpenFile(path[7:], os.O_CREATE|os.O_RDWR, os.ModePerm)