Merge pull request #1988 from bas-vk/issue1971

miner: bugfix where blockhash in receipts and logs is left empty

1 files changed, 11 insertions, 0 deletions

diff --git a/miner/worker.go b/miner/worker.go
index aa0fa85cb..754a6fc48 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -302,6 +302,17 @@ func (self *worker) wait() {
 					glog.V(logger.Error).Infoln("error writing block to chain", err)
 					continue
 				}
+
+				// update block hash since it is now available and not when the receipt/log of individual transactions were created
+				for _, r := range work.receipts {
+					for _, l := range r.Logs {
+						l.BlockHash = block.Hash()
+					}
+				}
+				for _, log := range work.state.Logs() {
+					log.BlockHash = block.Hash()
+				}
+
 				// check if canon block and write transactions
 				if stat == core.CanonStatTy {
 					// This puts transactions in a extra db for rpc