diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-20 21:01:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-20 21:01:30 +0800 |
| commit | d8ac267f4128117c3fb9736a40f3dbc327582e32 (patch) | |
| tree | 707896f76c700df83c5cb3ad358d5535e549e694 /core | |
| parent | 982f73fa6d6f12874729faacd0db14fc78d518dd (diff) | |
| download | dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar.gz dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar.bz2 dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar.lz dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar.xz dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.tar.zst dexon-d8ac267f4128117c3fb9736a40f3dbc327582e32.zip | |
dirty tracking for state objects fixed
Diffstat (limited to 'core')
| -rw-r--r-- | core/block_processor.go | 7 | ||||
| -rw-r--r-- | core/chain_manager.go | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index a9795385f..bfd9d4560 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -296,16 +296,13 @@ func (sm *BlockProcessor) AccumulateRewards(statedb *state.StateDB, block, paren r := new(big.Int) r.Mul(BlockReward, big.NewInt(15)).Div(r, big.NewInt(16)) - uncleAccount := statedb.GetAccount(uncle.Coinbase) - uncleAccount.AddAmount(r) + statedb.AddBalance(uncle.Coinbase, r) reward.Add(reward, new(big.Int).Div(BlockReward, big.NewInt(32))) } // Get the account associated with the coinbase - account := statedb.GetAccount(block.Header().Coinbase) - // Reward amount of ether to the coinbase address - account.AddAmount(reward) + statedb.AddBalance(block.Header().Coinbase, reward) return nil } diff --git a/core/chain_manager.go b/core/chain_manager.go index 003781791..dd0dd3cbe 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -397,7 +397,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { if chain { //self.setTransState(state.New(block.Root(), self.db)) - self.eventMux.Post(ChainEvent{block, td}) + //self.eventMux.Post(ChainEvent{block, td}) } if split { |