From 3002570085c6823da4b8e12015eafa4bd87177fb Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Thu, 20 Mar 2014 11:20:10 +0100
Subject: [PATCH] Mining rework

---
 ethereum.go   | 87 ++-------------------------------------------------
 ui/library.go |  7 +++--
 2 files changed, 7 insertions(+), 87 deletions(-)

diff --git a/ethereum.go b/ethereum.go
index 4d1a74ed14..556a33851c 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -1,12 +1,11 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
+	"github.com/ethereum/eth-go/ethminer"
 	"github.com/ethereum/eth-go/ethutil"
-	"github.com/ethereum/eth-go/ethwire"
 	"github.com/ethereum/go-ethereum/ui"
 	"github.com/niemeyer/qml"
 	"github.com/obscuren/secp256k1-go"
@@ -173,97 +172,17 @@ func main() {
 		RegisterInterupts(ethereum)
 		ethereum.Start()
 
-		minerChan := make(chan ethutil.React, 1)
-		ethereum.Reactor().Subscribe("newBlock", minerChan)
-		ethereum.Reactor().Subscribe("newTx", minerChan)
-
-		minerChan2 := make(chan ethutil.React, 1)
-		ethereum.Reactor().Subscribe("newBlock", minerChan2)
-		ethereum.Reactor().Subscribe("newTx", minerChan2)
-
-		ethereum.StateManager().PrepareMiningState()
-
 		if StartMining {
 			log.Printf("Miner started\n")
 
 			go func() {
-				pow := &ethchain.EasyPow{}
 				data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
 				keyRing := ethutil.NewValueFromBytes(data)
 				addr := keyRing.Get(1).Bytes()
-				txs := ethereum.TxPool().Flush()
-				block := ethereum.BlockChain().NewBlock(addr, txs)
-				var uncles []*ethchain.Block
 
-				for {
-					select {
-					case chanMessage := <-minerChan:
-						log.Println("REACTOR: Got new block")
+				miner := ethminer.NewDefaultMiner(addr, ethereum)
+				miner.Start()
 
-						if block, ok := chanMessage.Resource.(*ethchain.Block); ok {
-							if bytes.Compare(ethereum.BlockChain().CurrentBlock.Hash(), block.Hash()) == 0 {
-								// TODO: Perhaps continue mining to get some uncle rewards
-								log.Println("New top block found resetting state")
-								// TODO: We probably want to skip this if it's our own block
-								// Reapplies the latest block to the mining state, thus resetting
-								ethereum.StateManager().PrepareMiningState()
-								block = ethereum.BlockChain().NewBlock(addr, txs)
-								log.Println("Block set")
-							} else {
-								if bytes.Compare(block.PrevHash, ethereum.BlockChain().CurrentBlock.PrevHash) == 0 {
-									log.Println("HELLO UNCLE")
-									// TODO: Add uncle to block
-									uncles = append(uncles, block)
-								}
-							}
-						}
-
-						if tx, ok := chanMessage.Resource.(*ethchain.Transaction); ok {
-							log.Println("REACTOR: Got new transaction", tx)
-							found := false
-							for _, ctx := range txs {
-								if found = bytes.Compare(ctx.Hash(), tx.Hash()) == 0; found {
-									break
-								}
-
-							}
-							if found == false {
-								log.Println("We did not know about this transaction, adding")
-								txs = ethereum.TxPool().Flush()
-							} else {
-								log.Println("We already had this transaction, ignoring")
-							}
-						}
-						log.Println("Sending block reset")
-						// Start mining over
-						log.Println("Block reset done")
-					default:
-						// Create a new block which we're going to mine
-						log.Println("Mining on block. Includes", len(txs), "transactions")
-
-						// Apply uncles
-						if len(uncles) > 0 {
-							block.SetUncles(uncles)
-						}
-
-						// Apply all transactions to the block
-						ethereum.StateManager().ApplyTransactions(block, txs)
-						ethereum.StateManager().AccumelateRewards(block, block)
-
-						// Search the nonce
-						block.Nonce = pow.Search(block, minerChan2)
-						if block.Nonce != nil {
-							ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
-							err := ethereum.StateManager().ProcessBlock(block)
-							if err != nil {
-								log.Println(err)
-							} else {
-								//log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock)
-								log.Printf("🔨  Mined block %x\n", block.Hash())
-							}
-						}
-					}
-				}
 			}()
 		}
 
diff --git a/ui/library.go b/ui/library.go
index 8412a8d6c4..d6ce94b75a 100644
--- a/ui/library.go
+++ b/ui/library.go
@@ -27,14 +27,15 @@ func (lib *EthLib) CreateTx(receiver, a, data string) string {
 	}
 
 	k, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
-	keyRing := ethutil.NewValueFromBytes(k)
+	keyPair := ethutil.NewKeyFromBytes(k)
 
 	amount := ethutil.Big(a)
 	code := ethchain.Compile(strings.Split(data, "\n"))
 	tx := ethchain.NewTransaction(hash, amount, code)
-	tx.Nonce = lib.stateManager.GetAddrState(keyRing.Get(1).Bytes()).Nonce
+	tx.Nonce = lib.stateManager.GetAddrState(keyPair.Address()).Nonce
+
+	tx.Sign(keyPair.PrivateKey)
 
-	tx.Sign(keyRing.Get(0).Bytes())
 	ethutil.Config.Log.Infof("nonce: %x", tx.Nonce)
 
 	lib.txPool.QueueTransaction(tx)