diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-08 21:18:52 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-08 21:34:11 +0800 |
| commit | 819ecd450860827ad1e5840104722f3f51858b5a (patch) | |
| tree | 4635515ac0224b613eeca26b9a0e6ec6a9451a0a | |
| parent | a2333bcbb46245e07357be1f9af4108e9bf1fe40 (diff) | |
| download | dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar.gz dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar.bz2 dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar.lz dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar.xz dexon-819ecd450860827ad1e5840104722f3f51858b5a.tar.zst dexon-819ecd450860827ad1e5840104722f3f51858b5a.zip | |
miner, xeth: fire log event during mining. Fix return raw tx
| -rw-r--r-- | core/filter.go | 2 | ||||
| -rw-r--r-- | miner/worker.go | 1 | ||||
| -rw-r--r-- | xeth/xeth.go | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/filter.go b/core/filter.go index 277976a55..135960117 100644 --- a/core/filter.go +++ b/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 diff --git a/miner/worker.go b/miner/worker.go index 79514b231..1dfc4c77e 100644 --- a/miner/worker.go +++ b/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()) diff --git a/xeth/xeth.go b/xeth/xeth.go index d1085dc92..2781c67c9 100644 --- a/xeth/xeth.go +++ b/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()) } |