Merge pull request #1761 from CJentzsch/patch-3

fix block time issue
This commit is contained in:
Jeffrey Wilcke 2015-09-02 15:13:14 -07:00
commit e98854588b

View File

@ -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