aboutsummaryrefslogtreecommitdiffstats
path: root/pow
diff options
context:
space:
mode:
Diffstat (limited to 'pow')
-rw-r--r--pow/ar/block.go12
-rw-r--r--pow/ar/ops.go54
-rw-r--r--pow/ar/pow.go122
-rw-r--r--pow/ar/pow_test.go47
-rw-r--r--pow/ar/rnd.go66
-rw-r--r--pow/block.go1
-rw-r--r--pow/dagger/dagger.go2
-rw-r--r--pow/dash/crypto.c5
-rw-r--r--pow/dash/crypto.go14
-rw-r--r--pow/ezp/pow.go34
10 files changed, 41 insertions, 316 deletions
diff --git a/pow/ar/block.go b/pow/ar/block.go
deleted file mode 100644
index 2124b53b4..000000000
--- a/pow/ar/block.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package ar
-
-import (
- "math/big"
-
- "github.com/ethereum/go-ethereum/trie"
-)
-
-type Block interface {
- Trie() *trie.Trie
- Diff() *big.Int
-}
diff --git a/pow/ar/ops.go b/pow/ar/ops.go
deleted file mode 100644
index 3a099be08..000000000
--- a/pow/ar/ops.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package ar
-
-import "math/big"
-
-const lenops int64 = 9
-
-type OpsFunc func(a, b *big.Int) *big.Int
-
-var ops [lenops]OpsFunc
-
-func init() {
- ops[0] = Add
- ops[1] = Mul
- ops[2] = Mod
- ops[3] = Xor
- ops[4] = And
- ops[5] = Or
- ops[6] = Sub1
- ops[7] = XorSub
- ops[8] = Rsh
-}
-
-func Add(x, y *big.Int) *big.Int {
- return new(big.Int).Add(x, y)
-}
-func Mul(x, y *big.Int) *big.Int {
- return new(big.Int).Mul(x, y)
-}
-func Mod(x, y *big.Int) *big.Int {
- return new(big.Int).Mod(x, y)
-}
-func Xor(x, y *big.Int) *big.Int {
- return new(big.Int).Xor(x, y)
-}
-func And(x, y *big.Int) *big.Int {
- return new(big.Int).And(x, y)
-}
-func Or(x, y *big.Int) *big.Int {
- return new(big.Int).Or(x, y)
-}
-func Sub1(x, y *big.Int) *big.Int {
- a := big.NewInt(-1)
- a.Sub(a, x)
-
- return a
-}
-func XorSub(x, y *big.Int) *big.Int {
- t := Sub1(x, nil)
-
- return t.Xor(t, y)
-}
-func Rsh(x, y *big.Int) *big.Int {
- return new(big.Int).Rsh(x, uint(y.Uint64()%64))
-}
diff --git a/pow/ar/pow.go b/pow/ar/pow.go
deleted file mode 100644
index 8991a674b..000000000
--- a/pow/ar/pow.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package ar
-
-import (
- "math/big"
-
- "github.com/ethereum/go-ethereum/ethutil"
-)
-
-type Entry struct {
- op OpsFunc
- i, j *big.Int
-}
-
-type Tape struct {
- tape []Entry
- block Block
-}
-
-func NewTape(block Block) *Tape {
- return &Tape{nil, block}
-}
-
-func (self *Tape) gen(w, h int64, gen NumberGenerator) {
- self.tape = nil
-
- for v := int64(0); v < h; v++ {
- op := ops[gen.rand64(lenops).Int64()]
- r := gen.rand64(100).Uint64()
-
- var j *big.Int
- if r < 20 && v > 20 {
- j = self.tape[len(self.tape)-1].i
- } else {
- j = gen.rand64(w)
- }
-
- i := gen.rand64(w)
- self.tape = append(self.tape, Entry{op, i, j})
- }
-}
-
-func (self *Tape) runTape(w, h int64, gen NumberGenerator) *big.Int {
- var mem []*big.Int
- for i := int64(0); i < w; i++ {
- mem = append(mem, gen.rand(ethutil.BigPow(2, 64)))
- }
-
- set := func(i, j int) Entry {
- entry := self.tape[i*100+j]
- mem[entry.i.Uint64()] = entry.op(entry.i, entry.j)
-
- return entry
- }
-
- dir := true
- for i := 0; i < int(h)/100; i++ {
- var entry Entry
- if dir {
- for j := 0; j < 100; j++ {
- entry = set(i, j)
- }
- } else {
- for j := 99; i >= 0; j-- {
- entry = set(i, j)
- }
- }
-
- t := mem[entry.i.Uint64()]
- if big.NewInt(2).Cmp(new(big.Int).Mod(t, big.NewInt(37))) < 0 {
- dir = !dir
- }
- }
-
- return Sha3(mem)
-}
-
-func (self *Tape) Verify(header, nonce []byte) bool {
- n := ethutil.BigD(nonce)
-
- var w int64 = 10000
- var h int64 = 150000
- gen := Rnd(Sha3([]interface{}{header, new(big.Int).Div(n, big.NewInt(1000))}))
- self.gen(w, h, gen)
-
- gen = Rnd(Sha3([]interface{}{header, new(big.Int).Mod(n, big.NewInt(1000))}))
- hash := self.runTape(w, h, gen)
-
- it := self.block.Trie().Iterator()
- next := it.Next(string(new(big.Int).Mod(hash, ethutil.BigPow(2, 160)).Bytes()))
-
- req := ethutil.BigPow(2, 256)
- req.Div(req, self.block.Diff())
- return Sha3([]interface{}{hash, next}).Cmp(req) < 0
-}
-
-func (self *Tape) Run(header []byte) []byte {
- nonce := big.NewInt(0)
- var w int64 = 10000
- var h int64 = 150000
-
- req := ethutil.BigPow(2, 256)
- req.Div(req, self.block.Diff())
-
- for {
- if new(big.Int).Mod(nonce, b(1000)).Cmp(b(0)) == 0 {
- gen := Rnd(Sha3([]interface{}{header, new(big.Int).Div(nonce, big.NewInt(1000))}))
- self.gen(w, h, gen)
- }
-
- gen := Rnd(Sha3([]interface{}{header, new(big.Int).Mod(nonce, big.NewInt(1000))}))
- hash := self.runTape(w, h, gen)
-
- it := self.block.Trie().Iterator()
- next := it.Next(string(new(big.Int).Mod(hash, ethutil.BigPow(2, 160)).Bytes()))
-
- if Sha3([]interface{}{hash, next}).Cmp(req) < 0 {
- return nonce.Bytes()
- } else {
- nonce.Add(nonce, ethutil.Big1)
- }
- }
-}
diff --git a/pow/ar/pow_test.go b/pow/ar/pow_test.go
deleted file mode 100644
index b1ebf9281..000000000
--- a/pow/ar/pow_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package ar
-
-import (
- "fmt"
- "math/big"
- "testing"
-
- "github.com/ethereum/go-ethereum/ethdb"
- "github.com/ethereum/go-ethereum/trie"
-)
-
-type TestBlock struct {
- trie *trie.Trie
-}
-
-func NewTestBlock() *TestBlock {
- db, _ := ethdb.NewMemDatabase()
- return &TestBlock{
- trie: trie.New(db, ""),
- }
-}
-
-func (self *TestBlock) Diff() *big.Int {
- return b(10)
-}
-
-func (self *TestBlock) Trie() *trie.Trie {
- return self.trie
-}
-
-func (self *TestBlock) Hash() []byte {
- a := make([]byte, 32)
- a[0] = 10
- a[1] = 2
- return a
-}
-
-func TestPow(t *testing.T) {
- entry := make([]byte, 32)
- entry[0] = 255
-
- block := NewTestBlock()
-
- pow := NewTape(block)
- nonce := pow.Run(block.Hash())
- fmt.Println("Found nonce", nonce)
-}
diff --git a/pow/ar/rnd.go b/pow/ar/rnd.go
deleted file mode 100644
index c62f4e062..000000000
--- a/pow/ar/rnd.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package ar
-
-import (
- "math/big"
-
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/ethutil"
-)
-
-var b = big.NewInt
-
-type Node interface {
- Big() *big.Int
-}
-
-type ByteNode []byte
-
-func (self ByteNode) Big() *big.Int {
- return ethutil.BigD(ethutil.Encode([]byte(self)))
-}
-
-func Sha3(v interface{}) *big.Int {
- if b, ok := v.(*big.Int); ok {
- return ethutil.BigD(crypto.Sha3(b.Bytes()))
- } else if b, ok := v.([]interface{}); ok {
- return ethutil.BigD(crypto.Sha3(ethutil.Encode(b)))
- } else if s, ok := v.([]*big.Int); ok {
- v := make([]interface{}, len(s))
- for i, b := range s {
- v[i] = b
- }
-
- return ethutil.BigD(crypto.Sha3(ethutil.Encode(v)))
- }
-
- return nil
-}
-
-type NumberGenerator interface {
- rand(r *big.Int) *big.Int
- rand64(r int64) *big.Int
-}
-
-type rnd struct {
- seed *big.Int
-}
-
-func Rnd(s *big.Int) rnd {
- return rnd{s}
-}
-
-func (self rnd) rand(r *big.Int) *big.Int {
- o := b(0).Mod(self.seed, r)
-
- self.seed.Div(self.seed, r)
-
- if self.seed.Cmp(ethutil.BigPow(2, 64)) < 0 {
- self.seed = Sha3(self.seed)
- }
-
- return o
-}
-
-func (self rnd) rand64(r int64) *big.Int {
- return self.rand(b(r))
-}
diff --git a/pow/block.go b/pow/block.go
index 62df2b5ff..31e194d8d 100644
--- a/pow/block.go
+++ b/pow/block.go
@@ -6,4 +6,5 @@ type Block interface {
Difficulty() *big.Int
HashNoNonce() []byte
N() []byte
+ Number() *big.Int
}
diff --git a/pow/dagger/dagger.go b/pow/dagger/dagger.go
index 9ac000443..310f8abdd 100644
--- a/pow/dagger/dagger.go
+++ b/pow/dagger/dagger.go
@@ -6,9 +6,9 @@ import (
"math/rand"
"time"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
- "github.com/obscuren/sha3"
)
var powlogger = logger.NewLogger("POW")
diff --git a/pow/dash/crypto.c b/pow/dash/crypto.c
new file mode 100644
index 000000000..9c5a62d16
--- /dev/null
+++ b/pow/dash/crypto.c
@@ -0,0 +1,5 @@
+extern char *Sha3(char *, int);
+char *sha3_cgo(char *data, int l)
+{
+ return Sha3(data, l);
+}
diff --git a/pow/dash/crypto.go b/pow/dash/crypto.go
new file mode 100644
index 000000000..0644a54ae
--- /dev/null
+++ b/pow/dash/crypto.go
@@ -0,0 +1,14 @@
+package dash
+
+/*
+char *sha3_cgo(char *, int); // Forward declaration
+*/
+import "C"
+import (
+ "github.com/ethereum/go-ethereum/crypto"
+)
+
+//export Sha3
+func Sha3(data []byte, l int) []byte {
+ return crypto.Sha3(data)
+}
diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go
index 8c164798a..5571e73cd 100644
--- a/pow/ezp/pow.go
+++ b/pow/ezp/pow.go
@@ -6,10 +6,10 @@ import (
"time"
"github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow"
- "github.com/obscuren/sha3"
)
var powlogger = logger.NewLogger("POW")
@@ -21,7 +21,7 @@ type EasyPow struct {
}
func New() *EasyPow {
- return &EasyPow{turbo: false}
+ return &EasyPow{turbo: true}
}
func (pow *EasyPow) GetHashrate() int64 {
@@ -36,27 +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)
- powlogger.Infoln("Hashing @", pow.HashRate, "khash")
-
- 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) {
@@ -83,7 +89,7 @@ func verify(hash []byte, diff *big.Int, nonce []byte) bool {
sha.Write(d)
verification := new(big.Int).Div(ethutil.BigPow(2, 256), diff)
- res := ethutil.U256(ethutil.BigD(sha.Sum(nil)))
+ res := ethutil.BigD(sha.Sum(nil))
return res.Cmp(verification) <= 0
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-19 14:00:25 +0800