core,graph,runtime: Pass EthereumBlockType into process_triggers()

fordN · fordN · commit e2c55c190370 · 2020-06-29T07:53:06.000-07:00
- Rather converting to EthereumBlockType before sending the mapping
request, pass EthereumBlockType down from process_block().
- Add utility functions to EthereumBlockType.
diff --git a/core/src/subgraph/instance.rs b/core/src/subgraph/instance.rs
@@ -135,7 +135,7 @@ where
     async fn process_trigger(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger: EthereumTrigger,
         state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
@@ -154,7 +154,7 @@ where
     async fn process_trigger_in_runtime_hosts(
         logger: &Logger,
         hosts: &[Arc<T::Host>],
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger: EthereumTrigger,
         mut state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
diff --git a/core/src/subgraph/instance_manager.rs b/core/src/subgraph/instance_manager.rs
@@ -638,7 +638,7 @@ where
     }
 
     // Obtain current and new block pointer (after this block is processed)
-    let light_block = Arc::new(block.light_block());
+    let light_block = Arc::new(EthereumBlockType::Light(block.light_block()));
     let block_ptr_after = EthereumBlockPointer::from(&block);
     let block_ptr_for_new_data_sources = block_ptr_after.clone();
 
@@ -879,7 +879,7 @@ async fn process_triggers<B: BlockStreamBuilder, T: RuntimeHostBuilder, S: Send
     mut block_state: BlockState,
     proof_of_indexing: SharedProofOfIndexing,
     ctx: IndexingContext<B, T, S>,
-    block: &Arc<LightEthereumBlock>,
+    block: &Arc<EthereumBlockType>,
     triggers: Vec<EthereumTrigger>,
 ) -> Result<(IndexingContext<B, T, S>, BlockState), CancelableError<Error>> {
     for trigger in triggers.into_iter() {
diff --git a/graph/src/components/ethereum/mod.rs b/graph/src/components/ethereum/mod.rs
@@ -13,9 +13,9 @@ pub use self::adapter::{
 pub use self::listener::{ChainHeadUpdate, ChainHeadUpdateListener, ChainHeadUpdateStream};
 pub use self::stream::{BlockStream, BlockStreamBuilder, BlockStreamEvent};
 pub use self::types::{
-    BlockFinality, BlockType, EthereumBlock, EthereumBlockData, FullEthereumBlockDataWithReceipts, EthereumBlockPointer,
+    BlockFinality, BlockType, EthereumBlock, EthereumBlockData, EthereumBlockPointer,
     EthereumBlockTriggerType, EthereumBlockType, EthereumBlockWithCalls, EthereumBlockWithTriggers,
     EthereumCall, EthereumCallData, EthereumEventData, EthereumTransactionData,
-    EthereumTransactionReceiptData, EthereumTrigger, FullEthereumBlockData, LightEthereumBlock,
-    LightEthereumBlockExt,
+    EthereumTransactionReceiptData, EthereumTrigger, FullEthereumBlockData,
+    FullEthereumBlockDataWithReceipts, LightEthereumBlock, LightEthereumBlockExt,
 };
diff --git a/graph/src/components/ethereum/types.rs b/graph/src/components/ethereum/types.rs
@@ -13,8 +13,6 @@ pub type LightEthereumBlock = Block<Transaction>;
 
 pub trait LightEthereumBlockExt {
     fn number(&self) -> u64;
-    fn transaction_for_log(&self, log: &Log) -> Option<Transaction>;
-    fn transaction_for_call(&self, call: &EthereumCall) -> Option<Transaction>;
     fn parent_ptr(&self) -> Option<EthereumBlockPointer>;
     fn format(&self) -> String;
 }
@@ -24,18 +22,6 @@ impl LightEthereumBlockExt for LightEthereumBlock {
         self.number.unwrap().as_u64()
     }
 
-    fn transaction_for_log(&self, log: &Log) -> Option<Transaction> {
-        log.transaction_hash
-            .and_then(|hash| self.transactions.iter().find(|tx| tx.hash == hash))
-            .cloned()
-    }
-
-    fn transaction_for_call(&self, call: &EthereumCall) -> Option<Transaction> {
-        call.transaction_hash
-            .and_then(|hash| self.transactions.iter().find(|tx| tx.hash == hash))
-            .cloned()
-    }
-
     fn parent_ptr(&self) -> Option<EthereumBlockPointer> {
         match self.number() {
             0 => None,
@@ -212,6 +198,45 @@ pub enum EthereumBlockType {
 
     FullWithReceipts(EthereumBlock),
 }
+impl EthereumBlockType {
+    pub fn light_block(&self) -> &LightEthereumBlock {
+        match self {
+            EthereumBlockType::Light(block) => block,
+            EthereumBlockType::Full(block) => block,
+            EthereumBlockType::FullWithReceipts(block) => &block.block,
+        }
+    }
+
+    pub fn hash(&self) -> H256 {
+        self.light_block().hash.unwrap()
+    }
+
+    pub fn number(&self) -> u64 {
+        self.light_block().number.unwrap().as_u64()
+    }
+
+    pub fn transaction_for_log(&self, log: &Log) -> Option<Transaction> {
+        log.transaction_hash
+            .and_then(|hash| {
+                self.light_block()
+                    .transactions
+                    .iter()
+                    .find(|tx| tx.hash == hash)
+            })
+            .cloned()
+    }
+
+    pub fn transaction_for_call(&self, call: &EthereumCall) -> Option<Transaction> {
+        call.transaction_hash
+            .and_then(|hash| {
+                self.light_block()
+                    .transactions
+                    .iter()
+                    .find(|tx| tx.hash == hash)
+            })
+            .cloned()
+    }
+}
 
 impl Default for EthereumBlockType {
     fn default() -> Self {
@@ -342,7 +367,9 @@ pub struct FullEthereumBlockDataWithReceipts {
 impl<'a> TryFrom<&'a EthereumBlockType> for FullEthereumBlockDataWithReceipts {
     type Error = String;
 
-    fn try_from(block: &'a EthereumBlockType) -> Result<FullEthereumBlockDataWithReceipts, Self::Error> {
+    fn try_from(
+        block: &'a EthereumBlockType,
+    ) -> Result<FullEthereumBlockDataWithReceipts, Self::Error> {
         let fullblock = match block {
             EthereumBlockType::FullWithReceipts(full_block) => full_block,
             EthereumBlockType::Full(_) => return Err(format!(
@@ -770,6 +797,16 @@ impl<'a> From<&'a EthereumBlock> for EthereumBlockPointer {
     }
 }
 
+impl<'a> From<&'a EthereumBlockType> for EthereumBlockPointer {
+    fn from(b: &'a EthereumBlockType) -> EthereumBlockPointer {
+        match b {
+            EthereumBlockType::Light(block) => EthereumBlockPointer::from(block),
+            EthereumBlockType::Full(block) => EthereumBlockPointer::from(block),
+            EthereumBlockType::FullWithReceipts(block) => EthereumBlockPointer::from(block),
+        }
+    }
+}
+
 impl From<(H256, u64)> for EthereumBlockPointer {
     fn from((hash, number): (H256, u64)) -> EthereumBlockPointer {
         if number >= (1 << 63) {
diff --git a/graph/src/components/subgraph/host.rs b/graph/src/components/subgraph/host.rs
@@ -27,7 +27,7 @@ pub trait RuntimeHost: Send + Sync + Debug + 'static {
     async fn process_log(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         transaction: &Arc<Transaction>,
         log: &Arc<Log>,
         state: BlockState,
@@ -38,7 +38,7 @@ pub trait RuntimeHost: Send + Sync + Debug + 'static {
     async fn process_call(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         transaction: &Arc<Transaction>,
         call: &Arc<EthereumCall>,
         state: BlockState,
@@ -49,7 +49,7 @@ pub trait RuntimeHost: Send + Sync + Debug + 'static {
     async fn process_block(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger_type: &EthereumBlockTriggerType,
         state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
diff --git a/graph/src/components/subgraph/instance.rs b/graph/src/components/subgraph/instance.rs
@@ -38,7 +38,7 @@ pub trait SubgraphInstance<H: RuntimeHost> {
     async fn process_trigger(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger: EthereumTrigger,
         state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
@@ -48,7 +48,7 @@ pub trait SubgraphInstance<H: RuntimeHost> {
     async fn process_trigger_in_runtime_hosts(
         logger: &Logger,
         hosts: &[Arc<H>],
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger: EthereumTrigger,
         state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
diff --git a/graph/src/data/subgraph/mod.rs b/graph/src/data/subgraph/mod.rs
@@ -528,7 +528,9 @@ pub enum BlockHandlerData {
 impl From<EthereumBlockHandlerData> for BlockHandlerData {
     fn from(data: EthereumBlockHandlerData) -> Self {
         match data {
-            EthereumBlockHandlerData::FullBlockWithReceipts => BlockHandlerData::FullBlockWithReceipts,
+            EthereumBlockHandlerData::FullBlockWithReceipts => {
+                BlockHandlerData::FullBlockWithReceipts
+            }
             EthereumBlockHandlerData::FullBlock => BlockHandlerData::FullBlock,
             EthereumBlockHandlerData::Block => BlockHandlerData::Block,
         }
diff --git a/graph/src/data/subgraph/schema.rs b/graph/src/data/subgraph/schema.rs
@@ -1114,7 +1114,7 @@ impl TryFromValue for EthereumBlockHandlerFilterEntity {
 pub enum EthereumBlockHandlerData {
     Block,
     FullBlock,
-    FullBlockWithReceipts
+    FullBlockWithReceipts,
 }
 
 impl Default for EthereumBlockHandlerData {
diff --git a/graph/src/lib.rs b/graph/src/lib.rs
@@ -77,7 +77,7 @@ pub mod prelude {
         BlockFinality, BlockStream, BlockStreamBuilder, BlockStreamEvent, BlockStreamMetrics,
         ChainHeadUpdate, ChainHeadUpdateListener, ChainHeadUpdateStream, EthereumAdapter,
         EthereumAdapterError, EthereumBlock, EthereumBlockData, EthereumBlockFilter,
-        EthereumBlockPointer, EthereumBlockTriggerType, EthereumBlockWithCalls,
+        EthereumBlockPointer, EthereumBlockTriggerType, EthereumBlockType, EthereumBlockWithCalls,
         EthereumBlockWithTriggers, EthereumCall, EthereumCallData, EthereumCallFilter,
         EthereumContractCall, EthereumContractCallError, EthereumEventData, EthereumLogFilter,
         EthereumNetworkIdentifier, EthereumTransactionData, EthereumTrigger, FullEthereumBlockData,
diff --git a/runtime/wasm/src/host.rs b/runtime/wasm/src/host.rs
@@ -474,7 +474,7 @@ impl RuntimeHostTrait for RuntimeHost {
     async fn process_call(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         transaction: &Arc<Transaction>,
         call: &Arc<EthereumCall>,
         state: BlockState,
@@ -561,7 +561,7 @@ impl RuntimeHostTrait for RuntimeHost {
                 outputs,
                 handler: call_handler.clone(),
             },
-            &Arc::new(EthereumBlockType::Light(LightEthereumBlock::from(block.as_ref().clone()))),
+            block,
             proof_of_indexing,
         )
         .await
@@ -570,37 +570,41 @@ impl RuntimeHostTrait for RuntimeHost {
     async fn process_block(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         trigger_type: &EthereumBlockTriggerType,
         state: BlockState,
         proof_of_indexing: SharedProofOfIndexing,
     ) -> Result<BlockState, anyhow::Error> {
         let block_handler = self.handler_for_block(trigger_type)?;
         let mapping_block: EthereumBlockType = match trigger_type {
-            EthereumBlockTriggerType::Every(BlockType::FullWithReceipts) => match graph::block_on_allow_panic(
-                future::lazy(move || {
-                    self.host_exports
-                        .ethereum_adapter
-                        .load_full_block(logger, block.as_ref().clone())
-                })
-                .compat(),
-            ) {
-                Ok(block) => Ok(EthereumBlockType::FullWithReceipts(block)),
-                Err(e) => Err(anyhow::anyhow!(
-                    "Failed to load full block: {}, error: {}",
-                    &block.number.unwrap().to_string(),
-                    e
-                )),
-            }?,
-            EthereumBlockTriggerType::Every(BlockType::Full) => EthereumBlockType::Full(LightEthereumBlock::from(block.as_ref().clone())),
-            _ => EthereumBlockType::Light(LightEthereumBlock::from(block.as_ref().clone()))
+            EthereumBlockTriggerType::Every(BlockType::FullWithReceipts) => {
+                match graph::block_on_allow_panic(
+                    future::lazy(move || {
+                        self.host_exports
+                            .ethereum_adapter
+                            .load_full_block(logger, block.light_block().clone())
+                    })
+                    .compat(),
+                ) {
+                    Ok(block) => Ok(EthereumBlockType::FullWithReceipts(block)),
+                    Err(e) => Err(anyhow::anyhow!(
+                        "Failed to load full block: {}, error: {}",
+                        &block.number().to_string(),
+                        e
+                    )),
+                }?
+            }
+            EthereumBlockTriggerType::Every(BlockType::Full) => {
+                EthereumBlockType::Full(block.light_block().clone())
+            }
+            _ => block.as_ref().clone(),
         };
 
         self.send_mapping_request(
             logger,
             o! {
-                "hash" => block.hash.unwrap().to_string(),
-                "number" => &block.number.unwrap().to_string(),
+                "hash" => block.hash().to_string(),
+                "number" => &block.number().to_string(),
             },
             state,
             &block_handler.handler,
@@ -616,7 +620,7 @@ impl RuntimeHostTrait for RuntimeHost {
     async fn process_log(
         &self,
         logger: &Logger,
-        block: &Arc<LightEthereumBlock>,
+        block: &Arc<EthereumBlockType>,
         transaction: &Arc<Transaction>,
         log: &Arc<Log>,
         state: BlockState,
@@ -721,7 +725,7 @@ impl RuntimeHostTrait for RuntimeHost {
                 params,
                 handler: event_handler.clone(),
             },
-            &Arc::new(EthereumBlockType::Light(block.as_ref()))),
+            block,
             proof_of_indexing,
         )
         .await
diff --git a/runtime/wasm/src/module/mod.rs b/runtime/wasm/src/module/mod.rs
@@ -166,7 +166,9 @@ impl WasmInstance {
         // Prepare an Ethereum Block for the WASM runtime
         let arg = match block.as_ref() {
             EthereumBlockType::FullWithReceipts(block) => self
-                .asc_new::<AscFullEthereumBlockWithReceipts, _>(&FullEthereumBlockDataWithReceipts::from(block))
+                .asc_new::<AscFullEthereumBlockWithReceipts, _>(
+                    &FullEthereumBlockDataWithReceipts::from(block),
+                )
                 .erase(),
             EthereumBlockType::Full(block) => self
                 .asc_new::<AscFullEthereumBlock, _>(&FullEthereumBlockData::from(block))
diff --git a/runtime/wasm/src/to_from/external.rs b/runtime/wasm/src/to_from/external.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 
 use graph::components::ethereum::{
     EthereumBlockData, EthereumCallData, EthereumEventData, EthereumTransactionData,
-    EthereumTransactionReceiptData, FullEthereumBlockData, FullEthereumBlockDataWithReceipts
+    EthereumTransactionReceiptData, FullEthereumBlockData, FullEthereumBlockDataWithReceipts,
 };
 use graph::data::store;
 use graph::prelude::anyhow::{ensure, Error};

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ impl TryFromValue for EthereumBlockHandlerFilterEntity {`
`1114`	`1114`	`pub enum EthereumBlockHandlerData {`
`1115`	`1115`	`Block,`
`1116`	`1116`	`FullBlock,`
`1117`		`- FullBlockWithReceipts`
	`1117`	`+ FullBlockWithReceipts,`
`1118`	`1118`	`}`
`1119`	`1119`
`1120`	`1120`	`impl Default for EthereumBlockHandlerData {`