diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
| commit | 429dd2a100f3b9e2b612b59bcb48f79a805cd6f9 (patch) | |
| tree | c91fee673e461a192d4d783193c8ddbead4a97d2 /chain/dagger.go | |
| parent | 48488017e498916c81122c01cfe1880afdd00d48 (diff) | |
| download | go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.gz go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.zst go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.zip | |
Implemented new miner w/ ui interface for merged mining. Closes #177
* Miner has been rewritten
* Added new miner pane
* Added option for local txs
* Added option to read from MergeMining contract and list them for
merged mining
Diffstat (limited to 'chain/dagger.go')
| -rw-r--r-- | chain/dagger.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chain/dagger.go b/chain/dagger.go index 3333e002d..2cf70e091 100644 --- a/chain/dagger.go +++ b/chain/dagger.go @@ -47,6 +47,7 @@ func (pow *EasyPow) Search(block *Block, stop <-chan struct{}) []byte { select { case <-stop: powlogger.Infoln("Breaking from mining") + pow.HashRate = 0 return nil default: i++ @@ -55,7 +56,7 @@ func (pow *EasyPow) Search(block *Block, stop <-chan struct{}) []byte { elapsed := time.Now().UnixNano() - start hashes := ((float64(1e9) / float64(elapsed)) * float64(i)) / 1000 pow.HashRate = int64(hashes) - powlogger.Infoln("Hashing @", int64(pow.HashRate), "khash") + powlogger.Infoln("Hashing @", pow.HashRate, "khash") t = time.Now() } |