aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2019-09-25 17:27:38 -0400
committerDeterminant <[email protected]>2019-09-25 17:27:38 -0400
commitd4db89bc68208c3b31e6439347d0648936bf7d73 (patch)
tree03ccaa3b027a888368c6039f0f5509258dd34d0e
parent083d6fdeeb166ac280748da735b11363075b7136 (diff)
...
-rw-r--r--examples/counter/main.go2
-rw-r--r--miner/worker.go4
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)
+ }
}
}