From ac80ec59dc223c679639aaae9a42325e18cde9c8 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Mon, 29 Jun 2015 15:17:05 +0200
Subject: [PATCH] miner: update root only when mining

---
 miner/worker.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/miner/worker.go b/miner/worker.go
index 3a2d7a41b1..bc2fe1ab24 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -416,10 +416,12 @@ func (self *worker) commitNewWork() {
 		delete(self.possibleUncles, hash)
 	}
 
-	// commit state root after all state transitions.
-	core.AccumulateRewards(self.current.state, header, uncles)
-	current.state.Update()
-	header.Root = current.state.Root()
+	if atomic.LoadInt32(&self.mining) == 1 {
+		// commit state root after all state transitions.
+		core.AccumulateRewards(self.current.state, header, uncles)
+		current.state.Update()
+		header.Root = current.state.Root()
+	}
 
 	// create the new block whose nonce will be mined.
 	current.block = types.NewBlock(header, current.txs, uncles, current.receipts)