Updated cache on sealed block

Author: arkpar

ethcore/src/client/client.rs

@@ -1131,6 +1131,7 @@ impl MiningBlockChainClient for Client {
 		let block_data = block.rlp_bytes();
 		let route = self.commit_block(block, &h, &block_data);
 		trace!(target: "client", "Imported sealed block #{} ({})", number, h);
+		self.state_db.lock().sync_cache(&route.enacted, &route.retracted, false);
 
 		let (enacted, retracted) = self.calculate_enacted_retracted(&[route]);
 		self.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);

ethcore/src/state_db.rs

@@ -180,17 +180,18 @@ impl StateDB {
 	/// Apply buffered cache changes and synchronize canonical
 	/// state cache with the best block state.
 	/// This function updates the cache by removing entries that are
-	/// invalidated by chain reorganization. `update_cache` should be
+	/// invalidated by chain reorganization. `sync_cache` should be
 	/// called after the block has been commited and the blockchain
 	/// route has ben calculated.
 	pub fn sync_cache(&mut self, enacted: &[H256], retracted: &[H256], is_best: bool) {
 		trace!("sync_cache id = (#{:?}, {:?}), parent={:?}, best={}", self.commit_number, self.commit_hash, self.parent_hash, is_best);
 		let mut cache = self.account_cache.lock();
 		let mut cache = &mut *cache;
 
-		// Clean changes from re-enacted and retracted blocks
+		// Clean changes from re-enacted and retracted blocks.
+		// Filter out commiting block if any.
 		let mut clear = false;
-		for block in enacted.iter().filter(|h| self.commit_hash.as_ref().map_or(false, |p| *h != p)) {
+		for block in enacted.iter().filter(|h| self.commit_hash.as_ref().map_or(true, |p| *h != p)) {
 			clear = clear || {
 				if let Some(ref mut m) = cache.modifications.iter_mut().find(|ref m| &m.hash == block) {
 					trace!("Reverting enacted block {:?}", block);