core,graph,runtime: Update AscEthereumBlock struct

fordN · fordN · commit cb82efd01818 · 2020-06-29T07:53:00.000-07:00
diff --git a/core/src/subgraph/instance_manager.rs b/core/src/subgraph/instance_manager.rs
@@ -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<EthereumBlock>,
+    block: &Arc<LightEthereumBlock>,
     triggers: Vec<EthereumTrigger>,
 ) -> Result<(IndexingContext<B, T, S>, BlockState), CancelableError<Error>> {
     for trigger in triggers.into_iter() {
diff --git a/graph/src/components/ethereum/adapter.rs b/graph/src/components/ethereum/adapter.rs
@@ -813,6 +813,10 @@ fn parse_block_triggers(
 ) -> Vec<EthereumTrigger> {
     let block_ptr = EthereumBlockPointer::from(&block.ethereum_block);
     let trigger_every_block = block_filter.trigger_every_block;
+    let block_type = match block_filter.full_block {
+        true => BlockType::Full,
+        false => BlockType::Light,
+    };
     let call_filter = EthereumCallFilter::from(block_filter);
     let mut triggers = block.calls.as_ref().map_or(vec![], |calls| {
         calls
@@ -826,7 +830,7 @@ fn parse_block_triggers(
     if trigger_every_block {
         triggers.push(EthereumTrigger::Block(
             block_ptr,
-            EthereumBlockTriggerType::Every(BlockType::Full),
+            EthereumBlockTriggerType::Every(block_type),
         ));
     }
     triggers
@@ -934,7 +938,9 @@ pub fn blocks_with_triggers(
                         .map(|ptr| {
                             EthereumTrigger::Block(
                                 ptr,
-                                EthereumBlockTriggerType::Every(BlockType::Full),
+                                EthereumBlockTriggerType::Every(BlockType::from(
+                                    block_filter.full_block,
+                                )),
                             )
                         })
                         .collect()
diff --git a/graph/src/components/ethereum/mod.rs b/graph/src/components/ethereum/mod.rs
@@ -13,8 +13,9 @@ pub use self::adapter::{
 pub use self::listener::{ChainHeadUpdate, ChainHeadUpdateListener, ChainHeadUpdateStream};
 pub use self::stream::{BlockStream, BlockStreamBuilder, BlockStreamEvent};
 pub use self::types::{
-    EthereumBlockType, BlockFinality, BlockType, EthereumBlock, EthereumBlockData, EthereumBlockPointer,
-    EthereumBlockTriggerType, EthereumBlockWithCalls, EthereumBlockWithTriggers, EthereumCall,
-    EthereumCallData, EthereumEventData, EthereumTransactionData, EthereumTransactionReceiptData,
-    EthereumTrigger, FullEthereumBlockData, LightEthereumBlock, LightEthereumBlockExt,
+    BlockFinality, BlockType, EthereumBlock, EthereumBlockData, EthereumBlockPointer,
+    EthereumBlockTriggerType, EthereumBlockType, EthereumBlockWithCalls, EthereumBlockWithTriggers,
+    EthereumCall, EthereumCallData, EthereumEventData, EthereumTransactionData,
+    EthereumTransactionReceiptData, EthereumTrigger, FullEthereumBlockData, LightEthereumBlock,
+    LightEthereumBlockExt,
 };
diff --git a/graph/src/components/ethereum/types.rs b/graph/src/components/ethereum/types.rs
@@ -203,9 +203,6 @@ impl PartialEq for EthereumTrigger {
 
 impl Eq for EthereumTrigger {}
 
-/// This is used in `EthereumAdapter::triggers_in_block`, called when re-processing a block for
-/// newly created data sources. This allows the re-processing to be reorg safe without having to
-/// always fetch the full block data.
 #[derive(Clone, Debug)]
 pub enum EthereumBlockType {
     Light(LightEthereumBlock),
@@ -303,8 +300,8 @@ impl PartialOrd for EthereumTrigger {
 
 pub struct EthereumTransactionReceiptData {
     // from receipts
-    pub transaction_hash: H256,
-    pub transaction_index: Index,
+    pub hash: H256,
+    pub index: Index,
     pub cumulative_gas_used: U256,
     pub gas_used: Option<U256>,
     pub contract_address: Option<H160>,
@@ -360,8 +357,8 @@ impl<'a> TryFrom<&'a EthereumBlockType> for FullEthereumBlockData {
                     transaction_and_receipt.1.transaction_hash
                 );
                 EthereumTransactionReceiptData {
-                    transaction_hash: transaction_and_receipt.0.hash,
-                    transaction_index: transaction_and_receipt.1.transaction_index,
+                    hash: transaction_and_receipt.0.hash,
+                    index: transaction_and_receipt.1.transaction_index,
                     cumulative_gas_used: transaction_and_receipt.1.cumulative_gas_used,
                     gas_used: transaction_and_receipt.1.gas_used,
                     contract_address: transaction_and_receipt.1.contract_address,
@@ -413,8 +410,8 @@ impl<'a> From<&'a EthereumBlock> for FullEthereumBlockData {
                     transaction_and_receipt.1.transaction_hash
                 );
                 EthereumTransactionReceiptData {
-                    transaction_hash: transaction_and_receipt.0.hash,
-                    transaction_index: transaction_and_receipt.1.transaction_index,
+                    hash: transaction_and_receipt.0.hash,
+                    index: transaction_and_receipt.1.transaction_index,
                     cumulative_gas_used: transaction_and_receipt.1.cumulative_gas_used,
                     gas_used: transaction_and_receipt.1.gas_used,
                     contract_address: transaction_and_receipt.1.contract_address,
@@ -470,10 +467,11 @@ pub struct EthereumBlockData {
     pub difficulty: U256,
     pub total_difficulty: U256,
     pub size: Option<U256>,
+    pub transactions: Vec<EthereumTransactionData>,
 }
 
-impl<'a, T> From<&'a Block<T>> for EthereumBlockData {
-    fn from(block: &'a Block<T>) -> EthereumBlockData {
+impl<'a> From<&'a LightEthereumBlock> for EthereumBlockData {
+    fn from(block: &'a LightEthereumBlock) -> EthereumBlockData {
         EthereumBlockData {
             hash: block.hash.unwrap(),
             parent_hash: block.parent_hash,
@@ -489,6 +487,11 @@ impl<'a, T> From<&'a Block<T>> for EthereumBlockData {
             difficulty: block.difficulty,
             total_difficulty: block.total_difficulty.unwrap_or_default(),
             size: block.size,
+            transactions: block
+                .transactions
+                .iter()
+                .map(|tx| EthereumTransactionData::from(tx))
+                .collect(),
         }
     }
 }
@@ -515,6 +518,11 @@ impl<'a> From<&'a EthereumBlockType> for EthereumBlockData {
             difficulty: block.difficulty,
             total_difficulty: block.total_difficulty.unwrap_or_default(),
             size: block.size,
+            transactions: block
+                .transactions
+                .iter()
+                .map(|tx| EthereumTransactionData::from(tx))
+                .collect(),
         }
     }
 }
diff --git a/runtime/wasm/src/asc_abi/class.rs b/runtime/wasm/src/asc_abi/class.rs
@@ -418,6 +418,26 @@ pub(crate) struct AscEthereumBlock {
     pub size: AscPtr<AscBigInt>,
 }
 
+#[repr(C)]
+#[derive(AscType)]
+pub(crate) struct AscEthereumBlock_0_0_5 {
+    pub hash: AscPtr<AscH256>,
+    pub parent_hash: AscPtr<AscH256>,
+    pub uncles_hash: AscPtr<AscH256>,
+    pub author: AscPtr<AscH160>,
+    pub state_root: AscPtr<AscH256>,
+    pub transactions_root: AscPtr<AscH256>,
+    pub receipts_root: AscPtr<AscH256>,
+    pub number: AscPtr<AscBigInt>,
+    pub gas_used: AscPtr<AscBigInt>,
+    pub gas_limit: AscPtr<AscBigInt>,
+    pub timestamp: AscPtr<AscBigInt>,
+    pub difficulty: AscPtr<AscBigInt>,
+    pub total_difficulty: AscPtr<AscBigInt>,
+    pub size: AscPtr<AscBigInt>,
+    pub transactions: AscPtr<Array<AscPtr<AscEthereumTransaction_0_0_2>>>,
+}
+
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscFullEthereumBlock {
@@ -453,8 +473,8 @@ pub(crate) struct AscEthereumTransaction {
 #[repr(C)]
 #[derive(AscType)]
 pub(crate) struct AscEthereumTransactionReceipt {
-    pub transaction_hash: AscPtr<AscH256>,
-    pub transaction_index: AscPtr<AscBigInt>,
+    pub hash: AscPtr<AscH256>,
+    pub index: AscPtr<AscBigInt>,
     pub cumulative_gas_used: AscPtr<AscBigInt>,
     pub gas_used: AscPtr<AscBigInt>,
     pub contract_address: AscPtr<AscH160>,
diff --git a/runtime/wasm/src/host.rs b/runtime/wasm/src/host.rs
@@ -576,7 +576,7 @@ impl RuntimeHostTrait for RuntimeHost {
         proof_of_indexing: SharedProofOfIndexing,
     ) -> Result<BlockState, anyhow::Error> {
         let block_handler = self.handler_for_block(trigger_type)?;
-        let theblock: EthereumBlockType = match dbg!(trigger_type) {
+        let mapping_block: EthereumBlockType = match trigger_type {
             EthereumBlockTriggerType::Every(BlockType::Full) => match graph::block_on_allow_panic(
                 future::lazy(move || {
                     self.host_exports
@@ -585,7 +585,7 @@ impl RuntimeHostTrait for RuntimeHost {
                 })
                 .compat(),
             ) {
-                Ok(block) => Ok(EthereumBlockType::Full(dbg!(block))),
+                Ok(block) => Ok(EthereumBlockType::Full(block)),
                 Err(e) => Err(anyhow::anyhow!(
                     "Failed to load full block: {}, error: {}",
                     &block.number.unwrap().to_string(),
@@ -606,7 +606,7 @@ impl RuntimeHostTrait for RuntimeHost {
             MappingTrigger::Block {
                 handler: block_handler.clone(),
             },
-            &Arc::new(dbg!(theblock)),
+            &Arc::new(mapping_block),
             proof_of_indexing,
         )
         .await
diff --git a/runtime/wasm/src/to_from/external.rs b/runtime/wasm/src/to_from/external.rs
@@ -325,6 +325,31 @@ impl ToAscObj<AscEthereumBlock> for EthereumBlockData {
     }
 }
 
+impl ToAscObj<AscEthereumBlock_0_0_5> for EthereumBlockData {
+    fn to_asc_obj<H: AscHeap>(&self, heap: &mut H) -> AscEthereumBlock_0_0_5 {
+        AscEthereumBlock_0_0_5 {
+            hash: heap.asc_new(&self.hash),
+            parent_hash: heap.asc_new(&self.parent_hash),
+            uncles_hash: heap.asc_new(&self.uncles_hash),
+            author: heap.asc_new(&self.author),
+            state_root: heap.asc_new(&self.state_root),
+            transactions_root: heap.asc_new(&self.transactions_root),
+            receipts_root: heap.asc_new(&self.receipts_root),
+            number: heap.asc_new(&BigInt::from(self.number)),
+            gas_used: heap.asc_new(&BigInt::from_unsigned_u256(&self.gas_used)),
+            gas_limit: heap.asc_new(&BigInt::from_unsigned_u256(&self.gas_limit)),
+            timestamp: heap.asc_new(&BigInt::from_unsigned_u256(&self.timestamp)),
+            difficulty: heap.asc_new(&BigInt::from_unsigned_u256(&self.difficulty)),
+            total_difficulty: heap.asc_new(&BigInt::from_unsigned_u256(&self.total_difficulty)),
+            size: self
+                .size
+                .map(|size| heap.asc_new(&BigInt::from_unsigned_u256(&size)))
+                .unwrap_or_else(|| AscPtr::null()),
+            transactions: heap.asc_new(self.transactions.as_slice()),
+        }
+    }
+}
+
 impl ToAscObj<AscFullEthereumBlock> for FullEthereumBlockData {
     fn to_asc_obj<H: AscHeap>(&self, heap: &mut H) -> AscFullEthereumBlock {
         AscFullEthereumBlock {
@@ -354,8 +379,8 @@ impl ToAscObj<AscEthereumTransactionReceipt> for EthereumTransactionReceiptData
     fn to_asc_obj<H: AscHeap>(&self, heap: &mut H) -> AscEthereumTransactionReceipt {
         AscEthereumTransactionReceipt {
             //from receipts
-            transaction_hash: heap.asc_new(&self.transaction_hash),
-            transaction_index: heap.asc_new(&BigInt::from(self.transaction_index)),
+            hash: heap.asc_new(&self.hash),
+            index: heap.asc_new(&BigInt::from(self.index)),
             cumulative_gas_used: heap
                 .asc_new(&BigInt::from_unsigned_u256(&self.cumulative_gas_used)),
             gas_used: self
