diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-21 18:21:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-21 18:21:42 +0800 |
| commit | 8f91d47bf3c26b850f0f40f79856141087e6ef82 (patch) | |
| tree | 95e14a764593dee08eabc0d6cff6285c9e695542 /ethminer | |
| parent | 93261b98c2bc664af30676129def291ff9e8a9ce (diff) | |
| parent | 5d2669dbd35b9449cbbb249dcec89e2a64c90f30 (diff) | |
| download | go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar.gz go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar.bz2 go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar.lz go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar.xz go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.tar.zst go-tangerine-8f91d47bf3c26b850f0f40f79856141087e6ef82.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ethminer')
| -rw-r--r-- | ethminer/miner.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index a50b3712f..bfea8e580 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -165,6 +165,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) |