Merge branch 'develop' of github.com:ethereum/eth-go into feature/ethutil-refactor

2014-07-21 13:31:26 +01:00
parent 1e4af85a38 8f91d47bf3
commit 13cc220c0d
7 changed files with 68 additions and 33 deletions
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@ -172,6 +172,7 @@ func (self *Miner) mineNewBlock() {
 		logger.Debugln(err)
 	}
 	self.txs = append(txs, unhandledTxs...)
+	self.block.SetTxHash(receipts)

 	// Set the transactions to the block so the new SHA3 can be calculated
 	self.block.SetReceipts(receipts, txs)