core: Use event to run DKG and CRS in Consensus. (#171)

1 files changed, 8 insertions, 1 deletions

diff --git a/core/lattice-data.go b/core/lattice-data.go
index 7eec7f2..75447c6 100644
--- a/core/lattice-data.go
+++ b/core/lattice-data.go
@@ -43,7 +43,7 @@ var (
 	ErrAcksNotSorted           = fmt.Errorf("acks not sorted")
 	ErrInvalidBlockHeight      = fmt.Errorf("invalid block height")
 	ErrAlreadyInLattice        = fmt.Errorf("block already in lattice")
-	ErrIncorrectBlockTime      = fmt.Errorf("block timestampe is incorrect")
+	ErrIncorrectBlockTime      = fmt.Errorf("block timestamp is incorrect")
 )
 
 // Errors for method usage
@@ -271,6 +271,13 @@ func (data *latticeData) prepareBlock(block *types.Block) {
 			block.ParentHash = curBlock.Hash
 			block.Position.Height = curBlock.Position.Height + 1
 			block.Witness.Height = curBlock.Witness.Height
+			minTimestamp := curBlock.Timestamp.Add(data.minBlockTimeInterval)
+			maxTimestamp := curBlock.Timestamp.Add(data.maxBlockTimeInterval)
+			if block.Timestamp.Before(minTimestamp) {
+				block.Timestamp = minTimestamp
+			} else if block.Timestamp.After(maxTimestamp) {
+				block.Timestamp = maxTimestamp
+			}
 		}
 	}
 	block.Acks = common.NewSortedHashes(acks)