Skip to content

G
Geth-Modification
Commit 0705bb3f authored by obscuren's avatar obscuren
Browse files
Options

Merge branch 'hotfix/0.6.5-1'

parents ce149d27 48fd23dc
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
ethminer/miner.go
View file @ 0705bb3f
...@@ -3,6 +3,7 @@ package ethminer ...@@ -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() { ...@@ -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() { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment