diff options
| -rw-r--r-- | examples/counter/main.go | 2 | ||||
| -rw-r--r-- | miner/worker.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/counter/main.go b/examples/counter/main.go index 724a1f7..8dfb6bf 100644 --- a/examples/counter/main.go +++ b/examples/counter/main.go @@ -92,7 +92,7 @@ func main() { gasPrice := big.NewInt(1000000000) blockCount := 0 - chain := coreth.NewETHChain(&config, nil) + chain := coreth.NewETHChain(&config, nil, nil) log.Info(chain.GetGenesisBlock().Hash().Hex()) firstBlock := false var contractAddr common.Address diff --git a/miner/worker.go b/miner/worker.go index a7254e1..e13db06 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -473,7 +473,9 @@ func (w *worker) mainLoop() { uncles = append(uncles, uncle.Header()) return false }) - w.commit(uncles, nil, true, start) + if !w.manualUncle { + w.commit(uncles, nil, true, start) + } } } |