From 1966e57e396e33145b86ae41ba6776eb24030806 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Wed, 11 Feb 2015 13:37:32 +0100
Subject: [PATCH] Avoid making blocks with invalid timestamps.

---
 libethereum/State.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libethereum/State.cpp b/libethereum/State.cpp
index e44b81c83..beab32abb 100644
--- a/libethereum/State.cpp
+++ b/libethereum/State.cpp
@@ -370,7 +370,7 @@ void State::resetCurrent()
 	m_cache.clear();
 	m_currentBlock = BlockInfo();
 	m_currentBlock.coinbaseAddress = m_ourAddress;
-	m_currentBlock.timestamp = time(0);
+	m_currentBlock.timestamp = max(m_previousBlock.timestamp + 1, (u256)time(0));
 	m_currentBlock.transactionsRoot = h256();
 	m_currentBlock.sha3Uncles = h256();
 	m_currentBlock.populateFromParent(m_previousBlock);