graph, node: Allow rpc clients when using firehose

Author: incrypto32

graph/src/blockchain/client.rs

@@ -11,13 +11,17 @@ use anyhow::anyhow;
 // Substreams only requires the FirehoseEndpoints.
 #[derive(Debug)]
 pub enum ChainClient<C: Blockchain> {
-    Firehose(FirehoseEndpoints),
+    Firehose(FirehoseEndpoints, Option<C::Client>),
     Rpc(C::Client),
 }
 
 impl<C: Blockchain> ChainClient<C> {
     pub fn new_firehose(firehose_endpoints: FirehoseEndpoints) -> Self {
-        Self::Firehose(firehose_endpoints)
+        Self::Firehose(firehose_endpoints, None)
+    }
+
+    pub fn new_firehose_with_rpc(firehose_endpoints: FirehoseEndpoints, rpc: C::Client) -> Self {
+        Self::Firehose(firehose_endpoints, Some(rpc))
     }
 
     pub fn new_rpc(rpc: C::Client) -> Self {
@@ -26,21 +30,22 @@ impl<C: Blockchain> ChainClient<C> {
 
     pub fn is_firehose(&self) -> bool {
         match self {
-            ChainClient::Firehose(_) => true,
+            ChainClient::Firehose(_, _) => true,
             ChainClient::Rpc(_) => false,
         }
     }
 
     pub async fn firehose_endpoint(&self) -> anyhow::Result<Arc<FirehoseEndpoint>> {
         match self {
-            ChainClient::Firehose(endpoints) => endpoints.endpoint().await,
+            ChainClient::Firehose(endpoints, _) => endpoints.endpoint().await,
             _ => Err(anyhow!("firehose endpoint requested on rpc chain client")),
         }
     }
 
     pub fn rpc(&self) -> anyhow::Result<&C::Client> {
         match self {
             Self::Rpc(rpc) => Ok(rpc),
+            Self::Firehose(_, Some(rpc)) => Ok(rpc),
             _ => Err(anyhow!("rpc endpoint requested on firehose chain client")),
         }
     }

node/src/chain.rs

@@ -523,7 +523,10 @@ pub async fn networks_as_chains(
                 let eth_adapters = networks.ethereum_rpcs(chain_id.clone());
 
                 let cc = if firehose_endpoints.len() > 0 {
-                    ChainClient::<graph_chain_ethereum::Chain>::new_firehose(firehose_endpoints)
+                    ChainClient::<graph_chain_ethereum::Chain>::new_firehose_with_rpc(
+                        firehose_endpoints,
+                        eth_adapters.clone(),
+                    )
                 } else {
                     ChainClient::<graph_chain_ethereum::Chain>::new_rpc(eth_adapters.clone())
                 };