diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 00:55:29 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 00:55:29 +0800 |
| commit | 53b5a45856c5d4c307dc55b4ae1b46efd9471142 (patch) | |
| tree | 56eb1f936610cc461742d2bb08431e304870e85a /eth | |
| parent | b0aaa77f0213cb525a873c3bea92e8a06cff423f (diff) | |
| parent | 313fe3861b3c338b3b6304adac46c86af7e2d52e (diff) | |
| download | dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.gz dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.bz2 dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.lz dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.xz dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.tar.zst dexon-53b5a45856c5d4c307dc55b4ae1b46efd9471142.zip | |
Merge branch 'xcthulhu-publictests' into poc-9
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 7 | ||||
| -rw-r--r-- | eth/protocol.go | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eth/backend.go b/eth/backend.go index 0de0fcf4a..50fb70720 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -7,6 +7,7 @@ import ( "path" "strings" + "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/blockpool" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" @@ -179,11 +180,13 @@ func New(config *Config) (*Ethereum, error) { } eth.chainManager = core.NewChainManager(db, eth.EventMux()) + pow := ethash.New(eth.chainManager) + eth.txPool = core.NewTxPool(eth.EventMux()) - eth.blockProcessor = core.NewBlockProcessor(db, eth.txPool, eth.chainManager, eth.EventMux()) + eth.blockProcessor = core.NewBlockProcessor(db, pow, eth.txPool, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockProcessor) eth.whisper = whisper.New() - eth.miner = miner.New(keyManager.Address(), eth, config.MinerThreads) + eth.miner = miner.New(keyManager.Address(), eth, pow, config.MinerThreads) hasBlock := eth.chainManager.HasBlock insertChain := eth.chainManager.InsertChain diff --git a/eth/protocol.go b/eth/protocol.go index ee2316836..67ed8f9e5 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -14,7 +14,7 @@ import ( ) const ( - ProtocolVersion = 54 + ProtocolVersion = 55 NetworkId = 0 ProtocolLength = uint64(8) ProtocolMaxMsgSize = 10 * 1024 * 1024 |