Merge pull request #1761 from CJentzsch/patch-3

obscuren · obscuren · commit e98854588b2e · 2015-09-02T15:13:14.000-07:00
fix block time issue
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ func (self *worker) commitNewWork() {`
`434`	`434`	`tstart := time.Now()`
`435`	`435`	`parent := self.chain.CurrentBlock()`
`436`	`436`	`tstamp := tstart.Unix()`
`437`		`- if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) != 1 {`
	`437`	`+ if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) >= 0 {`
`438`	`438`	`tstamp = parent.Time().Int64() + 1`
`439`	`439`	`}`
`440`	`440`	`// this will ensure we're not going off too far in the future`