aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-27 19:51:42 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-27 19:51:42 +0800
commit8951a03db39a2a877ada34c927d78352d465303e (patch)
tree36a8c7e50090337c9f8342594af82dd231c03ad0 /core
parente13f413ef54ca84d3dfb999e18d64b361b98b60a (diff)
parent912ae80350c72a9cbefe60969fc9c88b1db302f3 (diff)
downloaddexon-8951a03db39a2a877ada34c927d78352d465303e.tar
dexon-8951a03db39a2a877ada34c927d78352d465303e.tar.gz
dexon-8951a03db39a2a877ada34c927d78352d465303e.tar.bz2
dexon-8951a03db39a2a877ada34c927d78352d465303e.tar.lz
dexon-8951a03db39a2a877ada34c927d78352d465303e.tar.xz
dexon-8951a03db39a2a877ada34c927d78352d465303e.tar.zst
dexon-8951a03db39a2a877ada34c927d78352d465303e.zip
Merge pull request #1121 from obscuren/miner_time_fix
Miner time fix
Diffstat (limited to 'core')
-rw-r--r--core/block_processor.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/block_processor.go b/core/block_processor.go
index e064cdd80..6cd1c8aa3 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -304,8 +304,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
}