From da2fae0e437f9467a943acfe0571a8a24e8e76fd Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 9 Feb 2015 16:20:34 +0100 Subject: Basic structure miner --- pow/ezp/pow.go | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'pow/ezp/pow.go') diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index e4caa076a..5571e73cd 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -21,7 +21,7 @@ type EasyPow struct { } func New() *EasyPow { - return &EasyPow{turbo: false} + return &EasyPow{turbo: true} } func (pow *EasyPow) GetHashrate() int64 { @@ -36,26 +36,33 @@ func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}) []byte { r := rand.New(rand.NewSource(time.Now().UnixNano())) hash := block.HashNoNonce() diff := block.Difficulty() - i := int64(0) + //i := int64(0) + // TODO fix offset + i := rand.Int63() + starti := i start := time.Now().UnixNano() - t := time.Now() + + // Make sure stop is empty +empty: + for { + select { + case <-stop: + default: + break empty + } + } for { select { case <-stop: - powlogger.Infoln("Breaking from mining") pow.HashRate = 0 return nil default: i++ - if time.Since(t) > (1 * time.Second) { - elapsed := time.Now().UnixNano() - start - hashes := ((float64(1e9) / float64(elapsed)) * float64(i)) / 1000 - pow.HashRate = int64(hashes) - - t = time.Now() - } + elapsed := time.Now().UnixNano() - start + hashes := ((float64(1e9) / float64(elapsed)) * float64(i-starti)) / 1000 + pow.HashRate = int64(hashes) sha := crypto.Sha3(big.NewInt(r.Int63()).Bytes()) if verify(hash, diff, sha) { -- cgit v1.2.3 From 4d49d7b5a64774990c55dc2046195985bd716259 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 13 Feb 2015 18:30:06 +0100 Subject: Reset hash rate to 0 when mining is stopped --- pow/ezp/pow.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pow/ezp/pow.go') diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index 5571e73cd..f4a8b80e5 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -42,6 +42,8 @@ func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}) []byte { starti := i start := time.Now().UnixNano() + defer func() { pow.HashRate = 0 }() + // Make sure stop is empty empty: for { @@ -55,7 +57,6 @@ empty: for { select { case <-stop: - pow.HashRate = 0 return nil default: i++ -- cgit v1.2.3 From 32c7ebc51dcb31f21efe1b9c75f2b86cd216f510 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 14 Feb 2015 16:52:14 +0100 Subject: Fixed mining & limited hash power --- pow/ezp/pow.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pow/ezp/pow.go') diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index f4a8b80e5..540381243 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -21,7 +21,7 @@ type EasyPow struct { } func New() *EasyPow { - return &EasyPow{turbo: true} + return &EasyPow{turbo: false} } func (pow *EasyPow) GetHashrate() int64 { -- cgit v1.2.3