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

Merge 48c7ddc2e9 into ff3a5d24d2

Browse source
This commit is contained in:
Mymskmkt 2018-09-13 02:12:32 +00:00 committed by GitHub
commit a518017bea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
miner/worker.go
View file

@ -831,7 +831,12 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
header.Coinbase = w.coinbase header.Coinbase = w.coinbase
} }
if err := w.engine.Prepare(w.chain, header); err != nil { if err := w.engine.Prepare(w.chain, header); err != nil {
if w.isRunning() {
log.Error("Failed to prepare header for mining", "err", err) log.Error("Failed to prepare header for mining", "err", err)
} else {
log.Trace("Failed to prepare header for mining", "err", err)
}
return return
} }
// If we are care about TheDAO hard-fork check whether to override the extra-data or not // If we are care about TheDAO hard-fork check whether to override the extra-data or not