diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-16 06:02:22 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-16 06:02:22 +0800 |
| commit | d116b9595cf6424293cc94d0dbe78153da860727 (patch) | |
| tree | d855d927424171b258f14598d451c982d9c25736 /eth | |
| parent | 82c0780f81bef8c88db9dff4bb34917f2934c71d (diff) | |
| parent | 55d85d60fdad2cbd7947d87b2a81bd8df6a18025 (diff) | |
| download | go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.gz go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.bz2 go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.lz go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.xz go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.zst go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.zip | |
Merge pull request #989 from obscuren/develop
core, miner: fork resolving and restart miner after sync op
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/eth/backend.go b/eth/backend.go index 064018955..a7107f8d8 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -190,6 +190,7 @@ type Ethereum struct { // logger logger.LogSystem Mining bool + MinerThreads int NatSpec bool DataDir string etherbase common.Address @@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) { ethVersionId: config.ProtocolVersion, netVersionId: config.NetworkId, NatSpec: config.NatSpec, + MinerThreads: config.MinerThreads, } eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) |