diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-20 21:01:35 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-20 21:01:35 +0800 |
| commit | 28ddc16a9b5779b6b31036e8248ed8457de7b443 (patch) | |
| tree | 7508db500151bdaf0ebed726286f823e67993103 /event | |
| parent | c161d73d429ef421cdb9c75b743c16d72aa8a89a (diff) | |
| parent | 01ff0b3176e6d83dcc5e6716f04301de71e3fc9e (diff) | |
| download | go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.gz go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.bz2 go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.lz go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.xz go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.zst go-tangerine-28ddc16a9b5779b6b31036e8248ed8457de7b443.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'event')
| -rw-r--r-- | event/filter/eth_filter.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go index 4ba66a7e0..cb75d7e1a 100644 --- a/event/filter/eth_filter.go +++ b/event/filter/eth_filter.go @@ -63,7 +63,7 @@ func (self *FilterManager) filterLoop() { // Subscribe to events events := self.eventMux.Subscribe( core.PendingBlockEvent{}, - //core.ChainEvent{}, + core.ChainEvent{}, state.Logs(nil)) out: @@ -77,7 +77,7 @@ out: self.filterMu.RLock() for _, filter := range self.filters { if filter.BlockCallback != nil { - filter.BlockCallback(event.Block) + filter.BlockCallback(event.Block, event.Logs) } } self.filterMu.RUnlock() @@ -86,7 +86,7 @@ out: self.filterMu.RLock() for _, filter := range self.filters { if filter.PendingCallback != nil { - filter.PendingCallback(event.Block) + filter.PendingCallback(event.Block, event.Logs) } } self.filterMu.RUnlock() |