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

2
eth/backend.go
View File

@ -177,7 +177,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
return nil, err
}
eth.miner = miner.New(eth, eth.chainConfig, eth.EventMux(), eth.engine, config.MinerRecommit, config.MinerGasFloor, config.MinerGasCeil)
eth.miner = miner.New(eth, eth.chainConfig, eth.EventMux(), eth.engine, config.MinerRecommit, config.MinerGasFloor, config.MinerGasCeil, eth.isLocalBlock)
eth.miner.SetExtra(makeExtraData(config.MinerExtraData))
eth.APIBackend = &EthAPIBackend{eth, nil}