Serve typed blocks from recent block cache to avoid repeated deserialization

chain/ethereum/src/chain.rs

@@ -46,7 +46,6 @@ use crate::codec::HeaderOnlyBlock;
 use crate::data_source::DataSourceTemplate;
 use crate::data_source::UnresolvedDataSourceTemplate;
 use crate::ingestor::PollingBlockIngestor;
-use crate::json_block::EthereumJsonBlock;
 use crate::network::EthereumNetworkAdapters;
 use crate::polling_block_stream::PollingBlockStream;
 use crate::runtime::runtime_adapter::eth_call_gas;
@@ -66,6 +65,7 @@ use graph::blockchain::block_stream::{
     BlockStream, BlockStreamBuilder, BlockStreamError, BlockStreamMapper, FirehoseCursor,
     TriggersAdapterWrapper,
 };
+use graph::components::ethereum::EthereumJsonBlock;
 
 /// Celo Mainnet: 42220, Testnet Alfajores: 44787, Testnet Baklava: 62320
 const CELO_CHAIN_IDS: [u64; 3] = [42220, 44787, 62320];

chain/ethereum/src/ethereum_adapter.rs

@@ -66,7 +66,6 @@ use crate::adapter::EthereumRpcError;
 use crate::adapter::ProviderStatus;
 use crate::call_helper::interpret_eth_call_error;
 use crate::chain::BlockFinality;
-use crate::json_block::EthereumJsonBlock;
 use crate::trigger::{LogPosition, LogRef};
 use crate::Chain;
 use crate::NodeCapabilities;
@@ -80,6 +79,7 @@ use crate::{
     trigger::{EthereumBlockTriggerType, EthereumTrigger},
     ENV_VARS,
 };
+use graph::components::ethereum::EthereumJsonBlock;
 
 type AlloyProvider = FillProvider<
     JoinFill<

chain/ethereum/src/lib.rs

@@ -7,8 +7,6 @@ mod data_source;
 mod env;
 mod ethereum_adapter;
 mod ingestor;
-mod json_block;
-mod json_patch;
 mod polling_block_stream;
 pub mod runtime;
 mod transport;

chain/ethereum/src/transport.rs

@@ -1,5 +1,5 @@
-use crate::json_patch;
 use alloy::transports::{TransportError, TransportErrorKind, TransportFut};
+use graph::components::ethereum::json_patch;
 use graph::components::network_provider::ProviderName;
 use graph::endpoint::{ConnectionType, EndpointMetrics, RequestLabels};
 use graph::prelude::alloy::rpc::json_rpc::{RequestPacket, ResponsePacket};

chain/ethereum/src/json_block.rs → graph/src/components/ethereum/json_block.rs

@@ -1,7 +1,7 @@
-use graph::prelude::serde_json::{self as json, Value};
-use graph::prelude::{EthereumBlock, LightEthereumBlock};
+use serde_json::{self as json, Value};
 
-use crate::json_patch;
+use super::json_patch;
+use super::types::{EthereumBlock, LightEthereumBlock};
 
 #[derive(Debug)]
 pub struct EthereumJsonBlock(Value);

chain/ethereum/src/json_patch.rs → graph/src/components/ethereum/json_patch.rs

@@ -7,9 +7,9 @@
 //!
 //! Also used by `PatchingHttp` for chains that don't support EIP-2718 typed transactions.
 
-use graph::prelude::serde_json::Value;
+use serde_json::Value;
 
-pub(crate) fn patch_type_field(obj: &mut Value) -> bool {
+pub fn patch_type_field(obj: &mut Value) -> bool {
     if let Value::Object(map) = obj {
         if !map.contains_key("type") {
             map.insert("type".to_string(), Value::String("0x0".to_string()));
@@ -19,7 +19,7 @@ pub(crate) fn patch_type_field(obj: &mut Value) -> bool {
     false
 }
 
-pub(crate) fn patch_block_transactions(block: &mut Value) -> bool {
+pub fn patch_block_transactions(block: &mut Value) -> bool {
     let Some(txs) = block.get_mut("transactions").and_then(|t| t.as_array_mut()) else {
         return false;
     };
@@ -30,7 +30,7 @@ pub(crate) fn patch_block_transactions(block: &mut Value) -> bool {
     patched
 }
 
-pub(crate) fn patch_receipts(result: &mut Value) -> bool {
+pub fn patch_receipts(result: &mut Value) -> bool {
     match result {
         Value::Object(_) => patch_type_field(result),
         Value::Array(arr) => {
@@ -47,7 +47,7 @@ pub(crate) fn patch_receipts(result: &mut Value) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use graph::prelude::serde_json::json;
+    use serde_json::json;
 
     #[test]
     fn patch_type_field_adds_missing_type() {

graph/src/components/ethereum/mod.rs

@@ -1,6 +1,9 @@
+pub mod json_block;
+pub mod json_patch;
 mod network;
 mod types;
 
+pub use self::json_block::EthereumJsonBlock;
 pub use self::network::AnyNetworkBare;
 pub use self::types::{
     AnyBlock, AnyTransaction, AnyTransactionReceiptBare, EthereumBlock, EthereumBlockWithCalls,