Merge pull request #3896 from ethcore/timestamp-ignore

Allow retry for future blocks
openethereum · Dec 19, 2016 · 1f8a1ca · 1f8a1ca
2 parents 9e3cadc + d3486b4
commit 1f8a1ca
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ethcore/src/verification/queue/mod.rs b/ethcore/src/verification/queue/mod.rs
@@ -486,7 +486,13 @@ impl<K: Kind> VerificationQueue<K> {
 				Ok(h)
 			},
 			Err(err) => {
-				self.verification.bad.lock().insert(h.clone());
+				match err {
+					// Don't mark future blocks as bad.
+					Error::Block(BlockError::InvalidTimestamp(ref e)) if e.max.is_some() => {},
+					_ => {
+						self.verification.bad.lock().insert(h.clone());
+					}
+				}
 				Err(err)
 			}
 		}