Merge branch 'ethersphere-frontier/blockpool' into conversion

2015-03-20 18:01:05 +01:00
parent 54dac59285 ecd10d2cf7
commit f4e9638867
16 changed files with 714 additions and 522 deletions
--- a/eth/backend.go
+++ b/eth/backend.go
@ -195,7 +195,8 @@ func New(config *Config) (*Ethereum, error) {

 	hasBlock := eth.chainManager.HasBlock
 	insertChain := eth.chainManager.InsertChain
-	eth.blockPool = blockpool.New(hasBlock, insertChain, eth.pow.Verify)
+	td := eth.chainManager.Td()
+	eth.blockPool = blockpool.New(hasBlock, insertChain, eth.pow.Verify, eth.EventMux(), td)

 	netprv, err := config.nodeKey()
 	if err != nil {