aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-09-03 06:13:14 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-09-03 06:13:14 +0800
commite98854588b2e31b8743ecca88d2db8f6ab0ff2ae (patch)
tree7bb324bd4b7a2cdfd12d6faba074a276bacaa9be
parentb2c17a5a63da692accb1d047e0944d4d79546db5 (diff)
parent0fda4c4e1556671e2a2cdc1561fa9b8fe643eed5 (diff)
downloadgo-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar.gz
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar.bz2
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar.lz
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar.xz
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.tar.zst
go-tangerine-e98854588b2e31b8743ecca88d2db8f6ab0ff2ae.zip
Merge pull request #1761 from CJentzsch/patch-3
fix block time issue
-rw-r--r--miner/worker.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 86970ec07..16a16931d 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -434,7 +434,7 @@ func (self *worker) commitNewWork() {
tstart := time.Now()
parent := self.chain.CurrentBlock()
tstamp := tstart.Unix()
- if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) != 1 {
+ if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) >= 0 {
tstamp = parent.Time().Int64() + 1
}
// this will ensure we're not going off too far in the future