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 remote-tracking branch 'ethereum/master' into develop

Browse source 
Conflicts:
	cmd/gexp/main.go
This commit is contained in:
Christopher Franko 2015-09-02 22:37:46 -04:00
commit 8b50fbc849
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/gexp/main.go
View file

@ -47,12 +47,11 @@ import (
)
const (
ClientIdentifier = "Gexp"
Version = "1.1.1"
Version = "1.1.2"
VersionMajor = 1
VersionMinor = 1
VersionPatch = 1
VersionPatch = 2
)
var (

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