X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=protocol%2Fvalidation%2Fblock.go;h=630a87d46d6187f1409419295ddd4191a4bc397f;hp=8b63df0ec15d89deb0c17a08062c8af0c4c4ac54;hb=0f90b9d59e1450d28054a5eb00a42fd9412cac89;hpb=ef55813acfb13a9e9511c07c1f947815e6cd9d6b

diff --git a/protocol/validation/block.go b/protocol/validation/block.go
index 8b63df0e..630a87d4 100644
--- a/protocol/validation/block.go
+++ b/protocol/validation/block.go
@@ -26,13 +26,14 @@ var (
 )
 
 func checkBlockTime(b *bc.Block, parent *state.BlockNode) error {
-	if b.Timestamp > uint64(time.Now().UnixNano()/int64(time.Millisecond))+consensus.MaxTimeOffsetMs {
+	now := uint64(time.Now().UnixNano() / 1e6)
+	if b.Timestamp < (parent.Timestamp + consensus.BlockTimeInterval) {
 		return errBadTimestamp
 	}
-
-	if b.Timestamp <= parent.CalcPastMedianTime() {
+	if b.Timestamp > (now + consensus.MaxTimeOffsetMs) {
 		return errBadTimestamp
 	}
+
 	return nil
 }