graph, core: Add a new SubgraphFilter struct

Author: incrypto32

core/src/subgraph/runner.rs

@@ -8,7 +8,7 @@ use graph::blockchain::block_stream::{
     BlockStreamError, BlockStreamEvent, BlockWithTriggers, FirehoseCursor,
 };
 use graph::blockchain::{
-    Block, BlockTime, Blockchain, DataSource as _, Trigger, TriggerFilter as _,
+    Block, BlockTime, Blockchain, DataSource as _, SubgraphFilter, Trigger, TriggerFilter as _,
     TriggerFilterWrapper,
 };
 use graph::components::store::{EmptyStore, GetScope, ReadStore, StoredDynamicDataSource};
@@ -136,7 +136,16 @@ where
         let subgraph_filter = data_sources
             .iter()
             .filter_map(|ds| ds.as_subgraph())
-            .map(|ds| (ds.source.address(), ds.source.start_block))
+            .map(|ds| SubgraphFilter {
+                subgraph: ds.source.address(),
+                start_block: ds.source.start_block,
+                entities: ds
+                    .mapping
+                    .handlers
+                    .iter()
+                    .map(|handler| handler.entity.clone())
+                    .collect(),
+            })
             .collect::<Vec<_>>();
 
         // if static_filters is not enabled we just stick to the filter based on all the data sources.

graph/src/blockchain/mod.rs

@@ -253,13 +253,21 @@ impl From<web3::Error> for IngestorError {
 #[derive(Debug)]
 pub struct TriggerFilterWrapper<C: Blockchain> {
     pub filter: Arc<C::TriggerFilter>,
-    pub subgraph_filter: Vec<(DeploymentHash, BlockNumber)>, // TODO(krishna): Make this a struct
+    pub subgraph_filter: Vec<SubgraphFilter>,
+}
+
+
+#[derive(Clone, Debug)]
+pub struct SubgraphFilter {
+    pub subgraph: DeploymentHash,
+    pub start_block: BlockNumber,
+    pub entities: Vec<String>,
 }
 
 impl<C: Blockchain> TriggerFilterWrapper<C> {
     pub fn new(
         filter: C::TriggerFilter,
-        subgraph_filter: Vec<(DeploymentHash, BlockNumber)>,
+        subgraph_filter: Vec<SubgraphFilter>,
     ) -> Self {
         Self {
             filter: Arc::new(filter),