Commit 819ecd45 authored by Jeffrey Wilcke's avatar Jeffrey Wilcke

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

parent a2333bcb
...@@ -99,7 +99,7 @@ done: ...@@ -99,7 +99,7 @@ done:
switch { switch {
case block.NumberU64() == 0: case block.NumberU64() == 0:
break done break done
case block.NumberU64() == earliestBlockNo: case block.NumberU64() < earliestBlockNo:
break done break done
case self.max <= len(logs): case self.max <= len(logs):
break done break done
......
...@@ -298,6 +298,7 @@ func (self *worker) wait() { ...@@ -298,6 +298,7 @@ func (self *worker) wait() {
self.mux.Post(core.ChainEvent{block, block.Hash(), logs}) self.mux.Post(core.ChainEvent{block, block.Hash(), logs})
if stat == core.CanonStatTy { if stat == core.CanonStatTy {
self.mux.Post(core.ChainHeadEvent{block}) self.mux.Post(core.ChainHeadEvent{block})
self.mux.Post(logs)
} }
}(block, self.current.state.Logs()) }(block, self.current.state.Logs())
......
...@@ -781,7 +781,6 @@ func (self *XEth) PushTx(encodedTx string) (string, error) { ...@@ -781,7 +781,6 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
addr := crypto.CreateAddress(from, tx.Nonce()) addr := crypto.CreateAddress(from, tx.Nonce())
glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr) glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
return addr.Hex(), nil
} else { } else {
glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To()) glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To())
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment