Merge branch 'miner' of github.com-obscure:ethereum/eth-go into miner

ethchain/block_chain.go

@@ -169,6 +169,8 @@ func (bc *BlockChain) ResetTillBlockHash(hash []byte) error {
 		bc.LastBlockHash = bc.genesisBlock.Hash()
 		bc.LastBlockNumber = 1
 	} else {
+		// TODO: Somehow this doesn't really give the right numbers, double check.
+		// TODO: Change logs into debug lines
 		returnTo = bc.GetBlock(hash)
 		bc.CurrentBlock = returnTo
 		bc.LastBlockHash = returnTo.Hash()

ethminer/miner.go

@@ -105,6 +105,7 @@ func (miner *Miner) listener() {
 				if found == false {
 					log.Println("[MINER] We did not know about this transaction, adding")
 					miner.txs = append(miner.txs, tx)
+					miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)
 					miner.block.SetTransactions(miner.txs)
 				} else {
 					log.Println("[MINER] We already had this transaction, ignoring")