From fc3941d1fdfdea1b6c6e3053dea05979be3555e4 Mon Sep 17 00:00:00 2001 From: Christoph Jentzsch Date: Wed, 2 Sep 2015 23:24:17 +0200 Subject: [PATCH 1/2] fix block time issue currently, under normal circumstances, you always set the timestamp to previous.Time() + 1. credits to https://www.reddit.com/r/ethereum/comments/3jcs5r/code_avg_block_time_vs_difficulty_adjustment/cuoi4op style --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miner/worker.go b/miner/worker.go index 86970ec071..16a16931d7 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 From 587669215b878566c4a7b91fbf88a6fd2ec4f46a Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Thu, 3 Sep 2015 00:52:42 +0200 Subject: [PATCH 2/2] cmd/geth: bump 1.1.2 --- cmd/geth/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index c821e3bc20..1b720ac379 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,10 +48,10 @@ import ( const ( ClientIdentifier = "Geth" - Version = "1.1.1" + Version = "1.1.2" VersionMajor = 1 VersionMinor = 1 - VersionPatch = 1 + VersionPatch = 2 ) var (