ethereum: Remove support for old config

Author: leoyvens

Cargo.lock

@@ -13,7 +13,6 @@ lazy_static = "1.2.0"
 mockall = "0.9.1"
 state_machine_future = "0.2"
 serde = "1.0"
-config = { version = "0.11", features = ["toml"], default-features = false }
 dirs-next = "2.0"
 anyhow = "1.0"
 tiny-keccak = "1.5.0"

chain/ethereum/Cargo.toml

@@ -1,5 +1,4 @@
 mod adapter;
-mod config;
 mod data_source;
 mod ethereum_adapter;
 pub mod network_indexer;

chain/ethereum/src/config.rs

@@ -8,8 +8,6 @@ use web3::RequestId;
 
 use graph::prelude::*;
 
-use super::config::ETHEREUM_CONFIG;
-
 /// Abstraction over the different web3 transports.
 #[derive(Clone, Debug)]
 pub enum Transport {
@@ -37,14 +35,11 @@ impl Transport {
     ///
     /// Note: JSON-RPC over HTTP doesn't always support subscribing to new
     /// blocks (one such example is Infura's HTTP endpoint).
-    pub fn new_rpc(rpc: &str) -> (EventLoopHandle, Self) {
+    pub fn new_rpc(rpc: &str, headers: ::http::HeaderMap) -> (EventLoopHandle, Self) {
         let max_parallel_http: usize = env::var_os("ETHEREUM_RPC_MAX_PARALLEL_REQUESTS")
             .map(|s| s.to_str().unwrap().parse().unwrap())
             .unwrap_or(64);
 
-        let cfg = ETHEREUM_CONFIG.rpc.get(rpc);
-        let headers = cfg.map(|cfg| cfg.http_headers.clone()).unwrap_or_default();
-
         http::Http::with_max_parallel_and_headers(rpc, max_parallel_http, headers)
             .map(|(event_loop, transport)| (event_loop, Transport::RPC(transport)))
             .expect("Failed to connect to Ethereum RPC")

chain/ethereum/src/lib.rs

@@ -41,6 +41,7 @@ toml = "0.5.7"
 shellexpand = "2.1.0"
 diesel = "1.4.6"
 fail = "0.4"
+http = "0.1.21" # must be compatible with the version rust-web3 uses
 
 [dev-dependencies]
 assert_cli = "0.6"

chain/ethereum/src/transport.rs

@@ -8,6 +8,7 @@ use graph::{
 };
 use graph_store_postgres::{DeploymentPlacer, Shard as ShardName, PRIMARY_SHARD};
 
+use http::HeaderMap;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet};
@@ -436,6 +437,7 @@ impl ChainSection {
                     transport,
                     url: url.to_string(),
                     features,
+                    headers: Default::default(),
                 };
                 let entry = chains.entry(name.to_string()).or_insert_with(|| Chain {
                     shard: PRIMARY_SHARD.to_string(),
@@ -466,13 +468,38 @@ impl Chain {
     }
 }
 
+fn deserialize_http_headers<'de, D>(deserializer: D) -> Result<HeaderMap, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let kvs: BTreeMap<String, String> = Deserialize::deserialize(deserializer)?;
+    let mut headers = HeaderMap::new();
+    for (k, v) in kvs.into_iter() {
+        headers.insert(
+            k.parse::<http::header::HeaderName>()
+                .expect(&format!("invalid HTTP header name: {}", k)),
+            v.parse::<http::header::HeaderValue>()
+                .expect(&format!("invalid HTTP header value: {}: {}", k, v)),
+        );
+    }
+    Ok(headers)
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Provider {
     pub label: String,
     #[serde(default)]
     pub transport: Transport,
     pub url: String,
     pub features: BTreeSet<String>,
+
+    // TODO: This should be serialized.
+    #[serde(
+        skip_serializing,
+        default,
+        deserialize_with = "deserialize_http_headers"
+    )]
+    pub headers: HeaderMap,
 }
 
 const PROVIDER_FEATURES: [&str; 3] = ["traces", "archive", "no_eip1898"];

docs/ethereum-config.md

@@ -468,7 +468,7 @@ async fn create_ethereum_networks(
             use crate::config::Transport::*;
 
             let (transport_event_loop, transport) = match provider.transport {
-                Rpc => Transport::new_rpc(&provider.url),
+                Rpc => Transport::new_rpc(&provider.url, provider.headers),
                 Ipc => Transport::new_ipc(&provider.url),
                 Ws => Transport::new_ws(&provider.url),
             };