diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-20 05:46:15 +0800 |
| commit | 000658539136645e743d83d57a8106b2a9796b93 (patch) | |
| tree | ca37fb68b6b7574d7c888968813598e68d301659 /eth | |
| parent | fa4cbad315609e41d88c59ecbce7c6c6169fc57a (diff) | |
| parent | 639ac5c3daa253f36d41672165a5727d8eba207e (diff) | |
| download | dexon-000658539136645e743d83d57a8106b2a9796b93.tar dexon-000658539136645e743d83d57a8106b2a9796b93.tar.gz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.bz2 dexon-000658539136645e743d83d57a8106b2a9796b93.tar.lz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.xz dexon-000658539136645e743d83d57a8106b2a9796b93.tar.zst dexon-000658539136645e743d83d57a8106b2a9796b93.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eth/backend.go b/eth/backend.go index d109ab98e..b57e9fd69 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -53,6 +53,8 @@ type Config struct { Shh bool Dial bool + MinerThreads int + KeyManager *crypto.KeyManager } @@ -153,7 +155,7 @@ func New(config *Config) (*Ethereum, error) { eth.blockProcessor = core.NewBlockProcessor(db, eth.txPool, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockProcessor) eth.whisper = whisper.New() - eth.miner = miner.New(keyManager.Address(), eth) + eth.miner = miner.New(keyManager.Address(), eth, config.MinerThreads) hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain @@ -209,9 +211,7 @@ func (s *Ethereum) Coinbase() []byte { return nil } // TODO func (s *Ethereum) Start() error { jsonlogger.LogJson(ðlogger.LogStarting{ ClientString: s.net.Name, - Coinbase: ethutil.Bytes2Hex(s.KeyManager().Address()), ProtocolVersion: ProtocolVersion, - LogEvent: ethlogger.LogEvent{Guid: ethutil.Bytes2Hex(crypto.FromECDSAPub(&s.net.PrivateKey.PublicKey))}, }) err := s.net.Start() |