aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-07-03 17:24:42 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-03 19:56:50 +0800
commit29e2fb38f8e80dfa077d139d8ff563169c644d74 (patch)
tree95ddfb2c8fb11cbaae65c9ee59555411debef4cf /eth
parent03129e7c93a4705eb159a2dacbab6e3755fe02ed (diff)
downloaddexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar.gz
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar.bz2
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar.lz
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar.xz
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.tar.zst
dexon-29e2fb38f8e80dfa077d139d8ff563169c644d74.zip
core, miner: miner header validation, transaction & receipt writing
* Miners do now verify their own header, not their state. * Changed old putTx and putReceipts to be exported * Moved writing of transactions and receipts out of the block processer in to the chain manager. Closes #1386 * Miner post ChainHeadEvent & ChainEvent. Closes #1388
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go2
-rw-r--r--eth/protocol_test.go2
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)
)