gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eth, miner: prefer locally generated uncles vs remote ones (#17715)

Browse Source 
* core, eth: fix dependency cycle

* eth, miner: perfer to locally generated uncle
This commit is contained in:
gary rong
2018-09-21 05:11:55 +08:00
committed by Péter Szilágyi
parent ba0a8b7887
commit 457e930f27
4 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
miner/miner.go
View File

@ -52,13 +52,13 @@ type Miner struct {
shouldStart int32 // should start indicates whether we should start after sync
}
func New(eth Backend, config *params.ChainConfig, mux *event.TypeMux, engine consensus.Engine, recommit time.Duration, gasFloor, gasCeil uint64) *Miner {
func New(eth Backend, config *params.ChainConfig, mux *event.TypeMux, engine consensus.Engine, recommit time.Duration, gasFloor, gasCeil uint64, isLocalBlock func(block *types.Block) bool) *Miner {
miner := &Miner{
eth: eth,
mux: mux,
engine: engine,
exitCh: make(chan struct{}),
worker: newWorker(config, engine, eth, mux, recommit, gasFloor, gasCeil),
worker: newWorker(config, engine, eth, mux, recommit, gasFloor, gasCeil, isLocalBlock),
canStart: 1,
}
go miner.update()