From 457e930f27242381db5b5fe185c30bed9a5f2f89 Mon Sep 17 00:00:00 2001 From: gary rong Date: Fri, 21 Sep 2018 05:11:55 +0800 Subject: eth, miner: prefer locally generated uncles vs remote ones (#17715) * core, eth: fix dependency cycle * eth, miner: perfer to locally generated uncle --- eth/backend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eth') diff --git a/eth/backend.go b/eth/backend.go index ca0b13eed..b555b064a 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -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} -- cgit