diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-16 21:18:41 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-16 21:18:41 +0800 |
| commit | b74775400906cc582bdbb98bf5067c5258ee491f (patch) | |
| tree | fefd9cfe28ce5b409d58c70b03cf4a6d6dc84873 /eth/backend.go | |
| parent | f466243417f60531998e8b500f2bb043af5b3d2a (diff) | |
| parent | 1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8 (diff) | |
| download | dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar.gz dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar.bz2 dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar.lz dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar.xz dexon-b74775400906cc582bdbb98bf5067c5258ee491f.tar.zst dexon-b74775400906cc582bdbb98bf5067c5258ee491f.zip | |
Merge pull request #1881 from Gustav-Simonsson/state_new_error
core/state, core, miner: handle missing root error from state.New
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index 83eefca5b..18900c91e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -389,7 +389,8 @@ func New(config *Config) (*Ethereum, error) { return nil, err } - eth.txPool = core.NewTxPool(eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit) + newPool := core.NewTxPool(eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit) + eth.txPool = newPool eth.blockProcessor = core.NewBlockProcessor(chainDb, eth.pow, eth.blockchain, eth.EventMux()) eth.blockchain.SetProcessor(eth.blockProcessor) |