Fix topic wildcards bug (#277)

darwinia-network · Jan 29, 2021 · 6a6e3f5 · 6a6e3f5
1 parent 761083c
commit 6a6e3f5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/client/rpc-core/src/types/filter.rs b/client/rpc-core/src/types/filter.rs
@@ -272,8 +272,18 @@ impl FilteredParams {
 						}
 					}
 				},
-				VariadicValue::Multiple(_) => {
-					let replaced: Option<Vec<H256>> = self.replace(log, topic);
+				VariadicValue::Multiple(multi) => {
+					// Shrink the topics until the last item is Some.
+					let mut new_multi = multi;
+					while new_multi.iter().last().unwrap_or(&Some(H256::default())).is_none() {
+						new_multi.pop();
+					}
+					// We can discard right away any logs with lesser topics than the filter.
+					if new_multi.len() > log.topics.len() {
+						out = false;
+						break;
+					}
+					let replaced: Option<Vec<H256>> = self.replace(log, VariadicValue::Multiple(new_multi));
 					if let Some(replaced) = replaced {
 						out = false;
 						if log.topics.starts_with(