From f8acc0af7e48ef3e6b1ed710fc429ece81db1dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 2 May 2017 16:48:36 +0300
Subject: [PATCH] consensus/ethash: fix a timestamp update race
---
consensus/ethash/ethash.go | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
index b028f50e6..94a9ea332 100644
--- a/consensus/ethash/ethash.go
+++ b/consensus/ethash/ethash.go
@@ -467,8 +467,9 @@ func (ethash *Ethash) cache(block uint64) []uint32 {
future = &cache{epoch: epoch + 1}
ethash.fcache = future
}
+ // New current cache, set its initial timestamp
+ current.used = time.Now()
}
- current.used = time.Now()
ethash.lock.Unlock()
// Wait for generation finish, bump the timestamp and finalize the cache
@@ -529,8 +530,9 @@ func (ethash *Ethash) dataset(block uint64) []uint32 {
future = &dataset{epoch: epoch + 1}
ethash.fdataset = future
}
+ // New current dataset, set its initial timestamp
+ current.used = time.Now()
}
- current.used = time.Now()
ethash.lock.Unlock()
// Wait for generation finish, bump the timestamp and finalize the cache
--
GitLab