mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-02-26 15:47:21 +00:00
Merge pull request #1480 from obscuren/miner-state-sync
miner: moved state sync
This commit is contained in:
commit
26c0fa1cb0
1 changed files with 1 additions and 1 deletions
|
|
@ -263,6 +263,7 @@ func (self *worker) wait() {
|
|||
}
|
||||
block := result.Block
|
||||
|
||||
self.current.state.Sync()
|
||||
if self.fullValidation {
|
||||
if _, err := self.chain.InsertChain(types.Blocks{block}); err != nil {
|
||||
glog.V(logger.Error).Infoln("mining err", err)
|
||||
|
|
@ -489,7 +490,6 @@ func (self *worker) commitNewWork() {
|
|||
// commit state root after all state transitions.
|
||||
core.AccumulateRewards(self.current.state, header, uncles)
|
||||
current.state.SyncObjects()
|
||||
self.current.state.Sync()
|
||||
header.Root = current.state.Root()
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue