diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-03 22:50:30 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-03 22:50:30 +0800 |
| commit | 1cbab291a9e05c107c8ad37b5436872651009886 (patch) | |
| tree | 323eeddeb0c8ed17ba1a9ad382b47af418dd9539 /eth | |
| parent | 8181929c9a17b23d8a2eab55b2e8f584fe9b6c50 (diff) | |
| parent | 29e2fb38f8e80dfa077d139d8ff563169c644d74 (diff) | |
| download | dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar.gz dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar.bz2 dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar.lz dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar.xz dexon-1cbab291a9e05c107c8ad37b5436872651009886.tar.zst dexon-1cbab291a9e05c107c8ad37b5436872651009886.zip | |
Merge pull request #1389 from obscuren/txpool-issues
core, miner: miner header validation, transaction & receipt writing
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 2 | ||||
| -rw-r--r-- | eth/protocol_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eth/backend.go b/eth/backend.go index d6ad3381d..618eec9fb 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -339,7 +339,7 @@ func New(config *Config) (*Ethereum, error) { eth.pow = ethash.New() genesis := core.GenesisBlock(uint64(config.GenesisNonce), stateDb) - eth.chainManager, err = core.NewChainManager(genesis, blockDb, stateDb, eth.pow, eth.EventMux()) + eth.chainManager, err = core.NewChainManager(genesis, blockDb, stateDb, extraDb, eth.pow, eth.EventMux()) if err != nil { return nil, err } diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 4c1579d4e..2cc3d06ab 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -165,7 +165,7 @@ func newProtocolManagerForTesting(txAdded chan<- []*types.Transaction) *Protocol var ( em = new(event.TypeMux) db, _ = ethdb.NewMemDatabase() - chain, _ = core.NewChainManager(core.GenesisBlock(0, db), db, db, core.FakePow{}, em) + chain, _ = core.NewChainManager(core.GenesisBlock(0, db), db, db, db, core.FakePow{}, em) txpool = &fakeTxPool{added: txAdded} pm = NewProtocolManager(0, em, txpool, core.FakePow{}, chain) ) |