mirror of
https://gitlab.com/pulsechaincom/go-pulse.git
synced 2024-12-26 05:17:19 +00:00
Merge branch 'hotfix/0.6.5-1'
This commit is contained in:
commit
0705bb3fe5
@ -3,6 +3,7 @@ package ethminer
|
||||
import (
|
||||
"bytes"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethlog"
|
||||
@ -135,6 +136,12 @@ func (miner *Miner) listener() {
|
||||
}
|
||||
}
|
||||
default:
|
||||
// This hack is only temporarily
|
||||
if len(miner.txs) == 0 {
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
miner.mineNewBlock()
|
||||
}
|
||||
}
|
||||
@ -159,6 +166,7 @@ func (miner *Miner) Stop() {
|
||||
}
|
||||
|
||||
func (self *Miner) mineNewBlock() {
|
||||
|
||||
stateManager := self.ethereum.StateManager()
|
||||
|
||||
self.block = self.ethereum.BlockChain().NewBlock(self.coinbase)
|
||||
|
Loading…
Reference in New Issue
Block a user