graph, store: Parse and persist field topic0

leoyvens · leoyvens · commit cd6a0c021501 · 2019-04-24T11:45:16.000-03:00
diff --git a/graph/src/data/graphql/values.rs b/graph/src/data/graphql/values.rs
@@ -3,7 +3,7 @@ use graphql_parser::query::Value;
 use std::collections::BTreeMap;
 use std::str::FromStr;
 
-use crate::web3::types::H160;
+use crate::web3::types::{H160, H256};
 
 pub trait TryFromValue: Sized {
     fn try_from_value(value: &Value) -> Result<Self, Error>;
@@ -37,6 +37,20 @@ impl TryFromValue for H160 {
     }
 }
 
+impl TryFromValue for H256 {
+    fn try_from_value(value: &Value) -> Result<Self, Error> {
+        match value {
+            Value::String(s) => {
+                // `H160::from_str` takes a hex string with no leading `0x`.
+                let string = s.trim_start_matches("0x");
+                H256::from_str(string)
+                    .map_err(|e| format_err!("Cannot parse H256 value from string `{}`: {}", s, e))
+            }
+            _ => Err(format_err!("Cannot parse value into an H256: {:?}", value)),
+        }
+    }
+}
+
 impl<T> TryFromValue for Vec<T>
 where
     T: TryFromValue,
diff --git a/graph/src/data/subgraph/mod.rs b/graph/src/data/subgraph/mod.rs
@@ -12,7 +12,7 @@ use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::Arc;
 use tokio::prelude::*;
-use web3::types::Address;
+use web3::types::{Address, H256};
 
 use crate::components::link_resolver::LinkResolver;
 use crate::components::store::StoreError;
@@ -406,13 +406,15 @@ impl UnresolvedMappingABI {
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Deserialize)]
 pub struct MappingEventHandler {
     pub event: String,
+    pub topic0: Option<H256>,
     pub handler: String,
 }
 
 impl From<EthereumContractEventHandlerEntity> for MappingEventHandler {
     fn from(entity: EthereumContractEventHandlerEntity) -> Self {
         Self {
             event: entity.event,
+            topic0: entity.topic0,
             handler: entity.handler,
         }
     }
diff --git a/graph/src/data/subgraph/schema.rs b/graph/src/data/subgraph/schema.rs
@@ -765,6 +765,7 @@ impl TryFromValue for EthereumContractAbiEntity {
 #[derive(Debug)]
 pub struct EthereumContractEventHandlerEntity {
     pub event: String,
+    pub topic0: Option<H256>,
     pub handler: String,
 }
 
@@ -778,6 +779,7 @@ impl EthereumContractEventHandlerEntity {
         let mut entity = Entity::new();
         entity.set("id", id);
         entity.set("event", self.event);
+        entity.set("topic0", self.topic0.map_or(Value::Null, Value::from));
         entity.set("handler", self.handler);
         vec![set_entity_operation(Self::TYPENAME, id, entity)]
     }
@@ -787,6 +789,7 @@ impl From<super::MappingEventHandler> for EthereumContractEventHandlerEntity {
     fn from(event_handler: super::MappingEventHandler) -> Self {
         Self {
             event: event_handler.event,
+            topic0: event_handler.topic0,
             handler: event_handler.handler,
         }
     }
@@ -804,6 +807,7 @@ impl TryFromValue for EthereumContractEventHandlerEntity {
 
         Ok(Self {
             event: map.get_required("event")?,
+            topic0: map.get_optional("topic0")?,
             handler: map.get_required("handler")?,
         })
     }
diff --git a/store/postgres/src/subgraphs.graphql b/store/postgres/src/subgraphs.graphql
@@ -90,6 +90,7 @@ type EthereumContractAbi @entity {
 type EthereumContractEventHandler @entity {
     id: ID!
     event: String!
+    topic0: Bytes
     handler: String!
 }
 

Original file line number	Diff line number	Diff line change
`@@ -765,6 +765,7 @@ impl TryFromValue for EthereumContractAbiEntity {`
`765`	`765`	`#[derive(Debug)]`
`766`	`766`	`pub struct EthereumContractEventHandlerEntity {`
`767`	`767`	`pub event: String,`
	`768`	`+ pub topic0: Option<H256>,`
`768`	`769`	`pub handler: String,`
`769`	`770`	`}`
`770`	`771`
`@@ -778,6 +779,7 @@ impl EthereumContractEventHandlerEntity {`
`778`	`779`	`let mut entity = Entity::new();`
`779`	`780`	`entity.set("id", id);`
`780`	`781`	`entity.set("event", self.event);`
	`782`	`+ entity.set("topic0", self.topic0.map_or(Value::Null, Value::from));`
`781`	`783`	`entity.set("handler", self.handler);`
`782`	`784`	`vec![set_entity_operation(Self::TYPENAME, id, entity)]`
`783`	`785`	`}`
`@@ -787,6 +789,7 @@ impl From<super::MappingEventHandler> for EthereumContractEventHandlerEntity {`
`787`	`789`	`fn from(event_handler: super::MappingEventHandler) -> Self {`
`788`	`790`	`Self {`
`789`	`791`	`event: event_handler.event,`
	`792`	`+ topic0: event_handler.topic0,`
`790`	`793`	`handler: event_handler.handler,`
`791`	`794`	`}`
`792`	`795`	`}`
`@@ -804,6 +807,7 @@ impl TryFromValue for EthereumContractEventHandlerEntity {`
`804`	`807`
`805`	`808`	`Ok(Self {`
`806`	`809`	`event: map.get_required("event")?,`
	`810`	`+ topic0: map.get_optional("topic0")?,`
`807`	`811`	`handler: map.get_required("handler")?,`
`808`	`812`	`})`
`809`	`813`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ type EthereumContractAbi @entity {`
`90`	`90`	`type EthereumContractEventHandler @entity {`
`91`	`91`	`id: ID!`
`92`	`92`	`event: String!`
	`93`	`+ topic0: Bytes`
`93`	`94`	`handler: String!`
`94`	`95`	`}`
`95`	`96`