core, miner: fixed miner time issue and removed future blocks

* Miner should no longer generate blocks with a time stamp less or equal
than it's parent.
* Future blocks are no longer processed and queued directly.
  Closes #1118

1 files changed, 1 insertions, 2 deletions

diff --git a/core/block_processor.go b/core/block_processor.go
index 037782407..454c40e27 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -306,8 +306,7 @@ func (sm *BlockProcessor) ValidateHeader(block, parent *types.Header, checkPow b
 		return fmt.Errorf("GasLimit check failed for block %v (%v > %v)", block.GasLimit, a, b)
 	}
 
-	// Allow future blocks up to 10 seconds
-	if int64(block.Time) > time.Now().Unix()+4 {
+	if int64(block.Time) > time.Now().Unix() {
 		return BlockFutureErr
 	}