miner, xeth: fire log event during mining. Fix return raw tx

This commit is contained in:
Jeffrey Wilcke 2015-07-08 15:18:52 +02:00
parent a2333bcbb4
commit 819ecd4508
3 changed files with 2 additions and 2 deletions

View File

@ -99,7 +99,7 @@ done:
switch {
case block.NumberU64() == 0:
break done
case block.NumberU64() == earliestBlockNo:
case block.NumberU64() < earliestBlockNo:
break done
case self.max <= len(logs):
break done

View File

@ -298,6 +298,7 @@ func (self *worker) wait() {
self.mux.Post(core.ChainEvent{block, block.Hash(), logs})
if stat == core.CanonStatTy {
self.mux.Post(core.ChainHeadEvent{block})
self.mux.Post(logs)
}
}(block, self.current.state.Logs())

View File

@ -781,7 +781,6 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
addr := crypto.CreateAddress(from, tx.Nonce())
glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
return addr.Hex(), nil
} else {
glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To())
}