diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-06-17 17:40:37 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-06-17 17:40:37 +0800 |
| commit | a90ffe1af1b28935fc77a2c5cf37972bac03f062 (patch) | |
| tree | 1cd743d3d2719df7c9a8bf76922f9e5676d6fc30 /ethchain/state_manager.go | |
| parent | 01e6f63e98636e7200b626185b85dfa254ce2834 (diff) | |
| parent | 3621988e15c025d2bd7b80e4691a6b236574f0a1 (diff) | |
| download | dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar.gz dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar.bz2 dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar.lz dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar.xz dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.tar.zst dexon-a90ffe1af1b28935fc77a2c5cf37972bac03f062.zip | |
Merge branch 'develop' of github.com:ethereum/eth-go into develop
Diffstat (limited to 'ethchain/state_manager.go')
| -rw-r--r-- | ethchain/state_manager.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go index 36bb14846..a0051181f 100644 --- a/ethchain/state_manager.go +++ b/ethchain/state_manager.go @@ -181,7 +181,6 @@ func (sm *StateManager) ProcessBlock(state *State, parent, block *Block, dontRea coinbase.SetGasPool(block.CalcGasLimit(parent)) // Process the transactions on to current block - //sm.ApplyTransactions(block.Coinbase, state, parent, block.Transactions()) sm.ProcessTransactions(coinbase, state, block, parent, block.Transactions()) // Block validation @@ -197,6 +196,9 @@ func (sm *StateManager) ProcessBlock(state *State, parent, block *Block, dontRea return err } + // Update the state with pending changes + state.Update() + if !block.State().Cmp(state) { return fmt.Errorf("Invalid merkle root.\nrec: %x\nis: %x", block.State().trie.Root, state.trie.Root) } |