merge

1 files changed, 7 insertions, 4 deletions

diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go
index cb75d7e1a..1abd48389 100644
--- a/event/filter/eth_filter.go
+++ b/event/filter/eth_filter.go
@@ -48,7 +48,9 @@ func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) {
 func (self *FilterManager) UninstallFilter(id int) {
 	self.filterMu.Lock()
 	defer self.filterMu.Unlock()
-	delete(self.filters, id)
+	if _, ok := self.filters[id]; ok {
+		delete(self.filters, id)
+	}
 }
 
 // GetFilter retrieves a filter installed using InstallFilter.
@@ -62,8 +64,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 +85,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()