diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-03 18:47:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-03 18:47:07 +0800 |
| commit | e5532154a50114d5ffb1ffd850b746cab00cb899 (patch) | |
| tree | 0042cc997ccf4166b9b52464339d52d37d7a8ad6 /pow | |
| parent | 9666db2a442887ccf8ec2d81f5e2fedc1a3a3d3e (diff) | |
| parent | f75becc264f8bde0f58391fc226243d03e78aa7b (diff) | |
| download | go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.gz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.bz2 go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.lz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.xz go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.tar.zst go-tangerine-e5532154a50114d5ffb1ffd850b746cab00cb899.zip | |
Merge branch 'release/1.3.0'
Conflicts:
VERSION
cmd/geth/main.go
Diffstat (limited to 'pow')
| -rw-r--r-- | pow/ezp/pow.go | 2 | ||||
| -rw-r--r-- | pow/pow.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index 03bb3da29..f7ae1cbf1 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -48,7 +48,7 @@ func (pow *EasyPow) Turbo(on bool) { pow.turbo = on } -func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}) (uint64, []byte) { +func (pow *EasyPow) Search(block pow.Block, stop <-chan struct{}, index int) (uint64, []byte) { r := rand.New(rand.NewSource(time.Now().UnixNano())) hash := block.HashNoNonce() diff := block.Difficulty() diff --git a/pow/pow.go b/pow/pow.go index 22daf35e4..592d96475 100644 --- a/pow/pow.go +++ b/pow/pow.go @@ -17,7 +17,7 @@ package pow type PoW interface { - Search(block Block, stop <-chan struct{}) (uint64, []byte) + Search(block Block, stop <-chan struct{}, index int) (uint64, []byte) Verify(block Block) bool GetHashrate() int64 Turbo(bool) |