diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
| commit | a5ea21cd85530eee6eb1bb83c37c20d009f11f74 (patch) | |
| tree | e5be5bd595139ff7dfbe6261e1e659d8e7dd6f9c /miner/miner.go | |
| parent | db24fb792cf0dab91bc85e79aecf6758349002a4 (diff) | |
| parent | 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d (diff) | |
| download | dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.gz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.bz2 dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.lz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.xz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.zst dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.zip | |
merge
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/miner/miner.go b/miner/miner.go index 52dd5687d..63c8e22a7 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -184,9 +184,7 @@ func (self *Miner) mine() { block.Header().Extra = self.Extra // Apply uncles - if len(self.uncles) > 0 { - block.SetUncles(self.uncles) - } + block.SetUncles(self.uncles) parent := chainMan.GetBlock(block.ParentHash()) coinbase := state.GetOrNewStateObject(block.Coinbase()) @@ -206,7 +204,7 @@ func (self *Miner) mine() { block.SetReceipts(receipts) // Accumulate the rewards included for this block - blockProcessor.AccumelateRewards(state, block, parent) + blockProcessor.AccumulateRewards(state, block, parent) state.Update(ethutil.Big0) block.SetRoot(state.Root()) |