aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-20 21:02:53 +0800
committerobscuren <geffobscura@gmail.com>2014-05-20 21:02:53 +0800
commit0c4040d191662593b627048e35dde6a9ec1ce307 (patch)
treeb5d75f0a69ebe069bfb6b6aca3adc7e4fb012436 /ethchain
parent2bd377a3de54652923558b63cc8756531269e36e (diff)
parent31e44c2ab959124cbcf2de45385373b9898727bc (diff)
downloadgo-tangerine-0c4040d191662593b627048e35dde6a9ec1ce307.tar.gz
go-tangerine-0c4040d191662593b627048e35dde6a9ec1ce307.tar.zst
go-tangerine-0c4040d191662593b627048e35dde6a9ec1ce307.zip
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/state_manager.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go
index 098263e8a..c7c6857d8 100644
--- a/ethchain/state_manager.go
+++ b/ethchain/state_manager.go
@@ -180,6 +180,7 @@ func (sm *StateManager) ProcessBlock(state *State, block *Block, dontReact bool)
// Add the block to the chain
sm.bc.Add(block)
+ sm.notifyChanges(state)
ethutil.Config.Log.Infof("[STATE] Added block #%d (%x)\n", block.BlockInfo().Number, block.Hash())
if dontReact == false {
@@ -188,8 +189,6 @@ func (sm *StateManager) ProcessBlock(state *State, block *Block, dontReact bool)
state.manifest.Reset()
}
- sm.notifyChanges(state)
-
sm.Ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
sm.Ethereum.TxPool().RemoveInvalid(state)