aboutsummaryrefslogtreecommitdiffstats
path: root/ethminer
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-07-21 20:31:26 +0800
committerzelig <viktor.tron@gmail.com>2014-07-21 20:31:26 +0800
commit13cc220c0d7f9b31478b49a1109d44aeab66b372 (patch)
tree7f103997d746e2b5da20eed3ce20cb2521b12852 /ethminer
parent1e4af85a380977233a3bceaf5e2a020a281aa19a (diff)
parent8f91d47bf3c26b850f0f40f79856141087e6ef82 (diff)
downloadgo-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar.gz
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar.bz2
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar.lz
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar.xz
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.tar.zst
go-tangerine-13cc220c0d7f9b31478b49a1109d44aeab66b372.zip
Merge branch 'develop' of github.com:ethereum/eth-go into feature/ethutil-refactor
Diffstat (limited to 'ethminer')
-rw-r--r--ethminer/miner.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go
index 602ab0f35..8659d2889 100644
--- 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)