aboutsummaryrefslogtreecommitdiffstats
path: root/miner
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 /miner
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 'miner')
-rw-r--r--miner/worker.go35
1 files changed, 30 insertions, 5 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 90914ddcb..a23b663f9 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -79,9 +79,10 @@ type worker struct {
quit chan struct{}
pow pow.PoW
- eth core.Backend
- chain *core.ChainManager
- proc *core.BlockProcessor
+ eth core.Backend
+ chain *core.ChainManager
+ proc *core.BlockProcessor
+ extraDb common.Database
coinbase common.Address
gasPrice *big.Int
@@ -105,6 +106,7 @@ func newWorker(coinbase common.Address, eth core.Backend) *worker {
worker := &worker{
eth: eth,
mux: eth.EventMux(),
+ extraDb: eth.ExtraDb(),
recv: make(chan *types.Block),
gasPrice: new(big.Int),
chain: eth.ChainManager(),
@@ -233,11 +235,28 @@ func (self *worker) wait() {
continue
}
- _, err := self.chain.WriteBlock(block, false)
+ parent := self.chain.GetBlock(block.ParentHash())
+ if parent == nil {
+ glog.V(logger.Error).Infoln("Invalid block found during mining")
+ continue
+ }
+ if err := core.ValidateHeader(self.eth.BlockProcessor().Pow, block.Header(), parent, true); err != nil {
+ glog.V(logger.Error).Infoln("Invalid header on mined block:", err)
+ continue
+ }
+
+ stat, err := self.chain.WriteBlock(block, false)
if err != nil {
glog.V(logger.Error).Infoln("error writing block to chain", err)
continue
}
+ // check if canon block and write transactions
+ if stat == core.CanonStatTy {
+ // This puts transactions in a extra db for rpc
+ core.PutTransactions(self.extraDb, block, block.Transactions())
+ // store the receipts
+ core.PutReceipts(self.extraDb, block.Hash(), self.current.receipts)
+ }
// check staleness and display confirmation
var stale, confirm string
@@ -252,7 +271,13 @@ func (self *worker) wait() {
glog.V(logger.Info).Infof("🔨 Mined %sblock (#%v / %x). %s", stale, block.Number(), block.Hash().Bytes()[:4], confirm)
// broadcast before waiting for validation
- go self.mux.Post(core.NewMinedBlockEvent{block})
+ go func(block *types.Block, logs state.Logs) {
+ self.mux.Post(core.NewMinedBlockEvent{block})
+ self.mux.Post(core.ChainEvent{block, block.Hash(), logs})
+ if stat == core.CanonStatTy {
+ self.mux.Post(core.ChainHeadEvent{block})
+ }
+ }(block, self.current.state.Logs())
self.commitNewWork()
}