diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-29 04:44:34 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-29 04:44:34 +0800 |
| commit | 1bce02eff70db43b98d68fcd094fd2e15745b021 (patch) | |
| tree | a69acb327b4f71d59b297ca778450c128dce85f8 /miner | |
| parent | 8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff) | |
| parent | a3559c5e1b469890bb8d71e9992175febaae31c7 (diff) | |
| download | go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.gz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.bz2 go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.lz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.xz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.zst go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.zip | |
Fixed merge
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/miner.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/miner/miner.go b/miner/miner.go index 795385424..c5bff5690 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -179,7 +179,6 @@ func (self *Miner) mine() { chainMan = self.eth.ChainManager() block = chainMan.NewBlock(self.Coinbase) ) - block.MinGasPrice = self.MinAcceptedGasPrice // Apply uncles if len(self.uncles) > 0 { @@ -206,7 +205,7 @@ func (self *Miner) mine() { // Accumulate the rewards included for this block blockManager.AccumelateRewards(block.State(), block, parent) - block.State().Update() + block.State().Update(nil) minerlogger.Infof("Mining on block. Includes %v transactions", len(transactions)) |