roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #1480 from obscuren/miner-state-sync

Browse Source 
miner: moved state sync
This commit is contained in:
Jeffrey Wilcke 2015-07-19 05:03:59 -07:00
commit 26c0fa1cb0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miner/worker.go
View File

@ -263,6 +263,7 @@ func (self *worker) wait() {
} }
block := result.Block block := result.Block
self.current.state.Sync()
if self.fullValidation { if self.fullValidation {
if _, err := self.chain.InsertChain(types.Blocks{block}); err != nil { if _, err := self.chain.InsertChain(types.Blocks{block}); err != nil {
glog.V(logger.Error).Infoln("mining err", err) glog.V(logger.Error).Infoln("mining err", err)
@ -489,7 +490,6 @@ func (self *worker) commitNewWork() {
// commit state root after all state transitions. // commit state root after all state transitions.
core.AccumulateRewards(self.current.state, header, uncles) core.AccumulateRewards(self.current.state, header, uncles)
current.state.SyncObjects() current.state.SyncObjects()
self.current.state.Sync()
header.Root = current.state.Root() header.Root = current.state.Root()
} }