forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #297 from dinhln89/delay

Browse source 
Fixed delay longer than 10 seconds when near at block checkpoint.
This commit is contained in:
Tuna 2018-11-23 09:40:05 +07:00 committed by GitHub
commit 2cd7af7193
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
miner/worker.go
View file

@ -54,6 +54,8 @@ const (
chainSideChanSize = 10
// timeout waiting for M1
waitPeriod = 10
// timeout for checkpoint.
waitPeriodCheckpoint = 60
)
// Agent can register themself with the worker
@ -495,6 +497,11 @@ func (self *worker) commitNewWork() {
}
h := hop(len(masternodes), preIndex, curIndex)
gap := waitPeriod * int64(h)
// Check nearest checkpoint block in hop range.
nearest := self.config.Posv.Epoch - (parent.Header().Number.Uint64() % self.config.Posv.Epoch)
if uint64(h) >= nearest {
gap += waitPeriodCheckpoint
}
log.Info("Distance from the parent block", "seconds", gap, "hops", h)
L:
select {