Browse Source

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

Jeffrey Wilcke 10 years ago
parent
commit
819ecd4508
3 changed files with 2 additions and 2 deletions
  1. 1 1
      core/filter.go
  2. 1 0
      miner/worker.go
  3. 0 1
      xeth/xeth.go

+ 1 - 1
core/filter.go

@@ -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

+ 1 - 0
miner/worker.go

@@ -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())
 

+ 0 - 1
xeth/xeth.go

@@ -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())
 	}