aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-23 16:21:29 +0800
committerobscuren <geffobscura@gmail.com>2014-09-23 16:21:29 +0800
commit1b66e1c93aa2a07afdd349a3a1700ded8e7cf496 (patch)
tree9fba6003c86efcd3c5fb1840d78da5476f74708a
parentdf30588eb61b423a60d805b3d68d5a4e556e2a87 (diff)
parent48fd23dc107c06aea63e75a7a07612a5f10b1dd0 (diff)
downloadgo-tangerine-1b66e1c93aa2a07afdd349a3a1700ded8e7cf496.tar.gz
go-tangerine-1b66e1c93aa2a07afdd349a3a1700ded8e7cf496.tar.zst
go-tangerine-1b66e1c93aa2a07afdd349a3a1700ded8e7cf496.zip
Merge branch 'hotfix/0.6.5-1' into develop
-rw-r--r--ethminer/miner.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 083d9ecde..b74f90e0c 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -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)