roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

core: fixed wildcard topic filters. Closes #725

Browse Source
This commit is contained in:
obscuren 2015-04-24 13:36:34 +02:00
parent 31811365e0
commit cd2782f59c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/filter.go
View File

@ -131,17 +131,26 @@ Logs:
logTopics := make([]common.Hash, len(self.topics))
copy(logTopics, log.Topics)
// If the to filtered topics is greater than the amount of topics in
// logs, skip.
if len(self.topics) > len(log.Topics) {
continue Logs
}
for i, topics := range self.topics {
for _, topic := range topics {
var match bool
for _, topic := range topics {
// common.Hash{} is a match all (wildcard)
if (topic == common.Hash{}) || log.Topics[i] == topic {
match = true
break
}
}
if !match {
continue Logs
}
}
}
ret = append(ret, log)
@ -168,7 +177,7 @@ func (self *Filter) bloomFilter(block *types.Block) bool {
for _, sub := range self.topics {
var included bool
for _, topic := range sub {
if types.BloomLookup(block.Bloom(), topic) {
if (topic == common.Hash{}) || types.BloomLookup(block.Bloom(), topic) {
included = true
break
}