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
This commit is contained in:
obscuren
2014-11-07 12:18:48 +01:00
parent 48488017e4
commit 429dd2a100
18 changed files with 558 additions and 233 deletions

View File

@ -315,9 +315,12 @@ out:
// otherwise process and don't emit anything
if len(blocks) > 0 {
chainManager := self.eth.ChainManager()
// Test and import
chain := chain.NewChain(blocks)
_, err := chainManager.TestChain(chain)
_, err := chainManager.TestChain(chain, true)
if err != nil {
poollogger.Debugln(err)
self.Reset()
poollogger.Debugf("Punishing peer for supplying bad chain (%v)\n", self.peer.conn.RemoteAddr())
@ -327,7 +330,7 @@ out:
self.td = ethutil.Big0
self.peer = nil
} else {
chainManager.InsertChain(chain)
//chainManager.InsertChain(chain)
for _, block := range blocks {
self.Remove(block.Hash())
}