forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 20c8f17a8f into 8f09242d7f

Browse source
This commit is contained in:
Christoph Jentzsch 2015-09-02 21:22:44 +00:00
commit f0bc80ed15
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
miner/worker.go
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)) != -1 {
tstamp = parent.Time().Int64() + 1
}
// this will ensure we're not going off too far in the future