poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/0.6.5-1' into develop

This commit is contained in:
obscuren 2014-09-23 10:21:29 +02:00
parent df30588eb6 48fd23dc10
commit 1b66e1c93a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethminer/miner.go
View File

@ -3,6 +3,7 @@ package ethminer
import ( import (
"bytes" "bytes"
"sort" "sort"
"time"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethlog"
@ -135,6 +136,12 @@ func (miner *Miner) listener() {
} }
} }
default: default:
// This hack is only temporarily
if len(miner.txs) == 0 {
time.Sleep(2 * time.Second)
continue
}
miner.mineNewBlock() miner.mineNewBlock()
} }
} }
@ -159,6 +166,7 @@ func (miner *Miner) Stop() {
} }
func (self *Miner) mineNewBlock() { func (self *Miner) mineNewBlock() {
stateManager := self.ethereum.StateManager() stateManager := self.ethereum.StateManager()
self.block = self.ethereum.BlockChain().NewBlock(self.coinbase) self.block = self.ethereum.BlockChain().NewBlock(self.coinbase)