fixed pow stuff

This commit is contained in:
obscuren
2015-03-03 17:55:23 +01:00
parent 22b132e28f
commit 313fe3861b
10 changed files with 28 additions and 58 deletions

View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow/ezp"
"github.com/ethereum/go-ethereum/pow"
)
var minerlogger = logger.NewLogger("MINER")
@ -18,16 +18,19 @@ type Miner struct {
Coinbase []byte
mining bool
pow pow.PoW
}
func New(coinbase []byte, eth core.Backend, minerThreads int) *Miner {
func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Miner {
miner := &Miner{
Coinbase: coinbase,
worker: newWorker(coinbase, eth),
pow: pow,
}
for i := 0; i < minerThreads; i++ {
miner.worker.register(NewCpuMiner(i, ezp.New()))
miner.worker.register(NewCpuMiner(i, miner.pow))
}
return miner

View File

@ -146,6 +146,7 @@ func (self *worker) wait() {
self.current.block.Header().Nonce = work.Nonce
self.current.block.Header().MixDigest = work.MixDigest
self.current.block.Header().SeedHash = work.SeedHash
fmt.Println(self.current.block)
if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil {
self.mux.Post(core.NewMinedBlockEvent{self.current.block})