Merge branch 'master' into develop

This commit is contained in:
obscuren 2014-06-29 10:44:03 +02:00
commit 328ee9a3ec
2 changed files with 4 additions and 0 deletions

0
install.sh Normal file → Executable file
View File

View File

@ -204,6 +204,10 @@ func StartMining(ethereum *eth.Ethereum) bool {
miner = ethminer.NewDefaultMiner(addr, ethereum) miner = ethminer.NewDefaultMiner(addr, ethereum)
// Give it some time to connect with peers // Give it some time to connect with peers
time.Sleep(3 * time.Second) time.Sleep(3 * time.Second)
for !ethereum.IsUpToDate() == false {
time.Sleep(5 * time.Second)
}
logger.Infoln("Miner started") logger.Infoln("Miner started")
miner := ethminer.NewDefaultMiner(addr, ethereum) miner := ethminer.NewDefaultMiner(addr, ethereum)
miner.Start() miner.Start()