aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-29 04:44:34 +0800
committerobscuren <geffobscura@gmail.com>2014-11-29 04:44:34 +0800
commit1bce02eff70db43b98d68fcd094fd2e15745b021 (patch)
treea69acb327b4f71d59b297ca778450c128dce85f8 /miner
parent8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff)
parenta3559c5e1b469890bb8d71e9992175febaae31c7 (diff)
downloaddexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.gz
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.bz2
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.lz
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.xz
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.zst
dexon-1bce02eff70db43b98d68fcd094fd2e15745b021.zip
Fixed merge
Diffstat (limited to 'miner')
-rw-r--r--miner/miner.go3
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))