diff options
| -rw-r--r-- | core/filter.go | 2 | ||||
| -rw-r--r-- | event/filter/eth_filter.go | 7 | ||||
| -rw-r--r-- | rpc/api.go | 27 |
3 files changed, 20 insertions, 16 deletions
diff --git a/core/filter.go b/core/filter.go index 487e82902..0aebcbf69 100644 --- a/core/filter.go +++ b/core/filter.go @@ -34,7 +34,7 @@ type Filter struct { topics [][][]byte BlockCallback func(*types.Block, state.Logs) - PendingCallback func(*types.Block, state.Logs) + PendingCallback func(*types.Transaction) LogsCallback func(state.Logs) } diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go index cb75d7e1a..ab811e90e 100644 --- a/event/filter/eth_filter.go +++ b/event/filter/eth_filter.go @@ -62,8 +62,9 @@ func (self *FilterManager) GetFilter(id int) *core.Filter { func (self *FilterManager) filterLoop() { // Subscribe to events events := self.eventMux.Subscribe( - core.PendingBlockEvent{}, + //core.PendingBlockEvent{}, core.ChainEvent{}, + core.TxPreEvent{}, state.Logs(nil)) out: @@ -82,11 +83,11 @@ out: } self.filterMu.RUnlock() - case core.PendingBlockEvent: + case core.TxPreEvent: self.filterMu.RLock() for _, filter := range self.filters { if filter.PendingCallback != nil { - filter.PendingCallback(event.Block, event.Logs) + filter.PendingCallback(event.Tx) } } self.filterMu.RUnlock() diff --git a/rpc/api.go b/rpc/api.go index 7b50a1707..06ed73885 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -180,21 +180,24 @@ func (self *EthereumApi) NewFilterString(args *FilterStringArgs, reply *interfac var id int filter := core.NewFilter(self.xeth().Backend()) - callback := func(block *types.Block, logs state.Logs) { - self.logMut.Lock() - defer self.logMut.Unlock() - - for _, log := range logs { - self.logs[id].add(log) - } - self.logs[id].add(&state.StateLog{}) - } - switch args.Word { case "pending": - filter.PendingCallback = callback + filter.PendingCallback = func(tx *types.Transaction) { + self.logMut.Lock() + defer self.logMut.Unlock() + + self.logs[id].add(&state.StateLog{}) + } case "latest": - filter.BlockCallback = callback + filter.BlockCallback = func(block *types.Block, logs state.Logs) { + self.logMut.Lock() + defer self.logMut.Unlock() + + for _, log := range logs { + self.logs[id].add(log) + } + self.logs[id].add(&state.StateLog{}) + } default: return NewValidationError("Word", "Must be `latest` or `pending`") } |