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

Merge ethereum/poc-9 into accounts-integration

Browse Source 
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
parent cd51860bf0 676a0de58d
commit 9bf513e993
84 changed files with 25638 additions and 6387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/utils/cmd.go
View File

@ -145,7 +145,7 @@ func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
parent := ethereum.ChainManager().GetBlock(block.ParentHash())
statedb := state.New(parent.Root(), ethereum.Db())
statedb := state.New(parent.Root(), ethereum.StateDb())
_, err := ethereum.BlockProcessor().TransitionState(statedb, parent, block, true)
if err != nil {
return err