node, chain: Use features pattern for RPC compression configuration

DaMandal0rian · DaMandal0rian · commit b7f93cead301 · 2026-02-01T10:28:43.000-04:00
Replace the separate `compression = "gzip"` field on Web3Provider with
`features = ["compression/gzip"]`, aligning with the pattern established
by firehose providers. This keeps extensibility open for future
compression methods (e.g. "compression/brotli") without schema changes.
diff --git a/chain/ethereum/src/network.rs b/chain/ethereum/src/network.rs
@@ -313,7 +313,7 @@ mod tests {
     use graph::components::network_provider::ProviderManager;
     use graph::components::network_provider::ProviderName;
     use graph::data::value::Word;
-    use graph::endpoint::Compression;
+
     use graph::http::HeaderMap;
     use graph::{
         endpoint::EndpointMetrics,
@@ -394,7 +394,7 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
-            Compression::None,
+            false,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -501,7 +501,7 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
-            Compression::None,
+            false,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -573,7 +573,7 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
-            Compression::None,
+            false,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -641,7 +641,7 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
-            Compression::None,
+            false,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -936,7 +936,7 @@ mod tests {
             HeaderMap::new(),
             endpoint_metrics.clone(),
             "",
-            Compression::None,
+            false,
         );
 
         Arc::new(
diff --git a/chain/ethereum/src/transport.rs b/chain/ethereum/src/transport.rs
@@ -1,5 +1,5 @@
 use graph::components::network_provider::ProviderName;
-use graph::endpoint::{Compression, EndpointMetrics, RequestLabels};
+use graph::endpoint::{EndpointMetrics, RequestLabels};
 use jsonrpc_core::types::Call;
 use jsonrpc_core::Value;
 
@@ -54,22 +54,13 @@ impl Transport {
         headers: graph::http::HeaderMap,
         metrics: Arc<EndpointMetrics>,
         provider: impl AsRef<str>,
-        compression: Compression,
+        gzip: bool,
     ) -> Self {
         // Unwrap: This only fails if something is wrong with the system's TLS config.
         let mut client_builder = reqwest::Client::builder().default_headers(headers);
 
-        match compression {
-            Compression::Gzip => {
-                // Enable gzip compression/decompression for requests and responses
-                client_builder = client_builder.gzip(true);
-            }
-            Compression::None => {
-                // No compression
-            } // Future compression methods can be handled here:
-              // Compression::Brotli => {
-              //     client_builder = client_builder.brotli(true);
-              // }
+        if gzip {
+            client_builder = client_builder.gzip(true);
         }
 
         let client = client_builder.build().unwrap();
diff --git a/graph/src/endpoint.rs b/graph/src/endpoint.rs
@@ -7,7 +7,6 @@ use std::{
 };
 
 use prometheus::IntCounterVec;
-use serde::{Deserialize, Serialize};
 use slog::{warn, Logger};
 
 use crate::components::network_provider::ProviderName;
@@ -18,26 +17,6 @@ use crate::{components::metrics::MetricsRegistry, data::value::Word};
 /// avoid locking since we don't need to modify the entire struture.
 type ProviderCount = Arc<HashMap<ProviderName, AtomicU64>>;
 
-/// Compression methods for RPC transports
-#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq)]
-pub enum Compression {
-    #[serde(rename = "none")]
-    None,
-    #[serde(rename = "gzip")]
-    Gzip,
-    // Future compression methods can be added here:
-    // #[serde(rename = "brotli")]
-    // Brotli,
-    // #[serde(rename = "deflate")]
-    // Deflate,
-}
-
-impl Default for Compression {
-    fn default() -> Self {
-        Compression::None
-    }
-}
-
 /// This struct represents all the current labels except for the result
 /// which is added separately. If any new labels are necessary they should
 /// remain in the same order as added in [`EndpointMetrics::new`]
diff --git a/node/resources/tests/full_config.toml b/node/resources/tests/full_config.toml
@@ -48,7 +48,7 @@ shard = "primary"
 provider = [
   { label = "mainnet-0", url = "http://rpc.mainnet.io", features = ["archive", "traces"] },
   { label = "mainnet-1", details = { type = "web3call", url = "http://rpc.mainnet.io", features = ["archive", "traces"] }},
-  { label = "mainnet-2", details = { type = "web3", url = "http://rpc.mainnet.io", features = ["archive"], compression = "gzip" }},
+  { label = "mainnet-2", details = { type = "web3", url = "http://rpc.mainnet.io", features = ["archive", "compression/gzip"] }},
   { label = "firehose", details = { type = "firehose", url = "http://localhost:9000", features = [] }},
   { label = "substreams", details = { type = "substreams", url = "http://localhost:9000", features = [] }},
 ]
diff --git a/node/src/chain.rs b/node/src/chain.rs
@@ -278,12 +278,13 @@ pub async fn create_ethereum_networks_for_chain(
         }
 
         let logger = logger.new(o!("provider" => provider.label.clone()));
+        let gzip = web3.gzip_compression_enabled();
         info!(
             logger,
             "Creating transport";
             "url" => &web3.url,
             "capabilities" => capabilities,
-            "compression" => ?web3.compression
+            "gzip" => gzip
         );
 
         use crate::config::Transport::*;
@@ -294,7 +295,7 @@ pub async fn create_ethereum_networks_for_chain(
                 web3.headers.clone(),
                 endpoint_metrics.cheap_clone(),
                 &provider.label,
-                web3.compression,
+                gzip,
             ),
             Ipc => Transport::new_ipc(&web3.url).await,
             Ws => Transport::new_ws(&web3.url).await,
diff --git a/node/src/config.rs b/node/src/config.rs
@@ -2,7 +2,6 @@ use graph::{
     anyhow::Error,
     blockchain::BlockchainKind,
     components::network_provider::ChainName,
-    endpoint::Compression,
     env::ENV_VARS,
     firehose::{SubgraphLimit, SUBGRAPHS_PER_CONN},
     itertools::Itertools,
@@ -503,7 +502,6 @@ impl ChainSection {
                         features,
                         headers: Default::default(),
                         rules: vec![],
-                        compression: Compression::None,
                     }),
                 };
                 let entry = chains.entry(name.to_string()).or_insert_with(|| Chain {
@@ -707,10 +705,6 @@ pub struct Web3Provider {
 
     #[serde(default, rename = "match")]
     rules: Vec<Web3Rule>,
-
-    /// Compression method for RPC requests and responses
-    #[serde(default)]
-    pub compression: Compression,
 }
 
 impl Web3Provider {
@@ -721,12 +715,16 @@ impl Web3Provider {
         }
     }
 
+    pub fn gzip_compression_enabled(&self) -> bool {
+        self.features.contains("compression/gzip")
+    }
+
     pub fn limit_for(&self, node: &NodeId) -> SubgraphLimit {
         self.rules.limit_for(node)
     }
 }
 
-const PROVIDER_FEATURES: [&str; 3] = ["traces", "archive", "no_eip1898"];
+const PROVIDER_FEATURES: [&str; 4] = ["traces", "archive", "no_eip1898", "compression/gzip"];
 const DEFAULT_PROVIDER_FEATURES: [&str; 2] = ["traces", "archive"];
 
 impl Provider {
@@ -907,7 +905,6 @@ impl<'de> Deserialize<'de> for Provider {
                             .ok_or_else(|| serde::de::Error::missing_field("features"))?,
                         headers: headers.unwrap_or_else(HeaderMap::new),
                         rules: nodes,
-                        compression: Compression::None,
                     }),
                 };
 
@@ -1226,7 +1223,6 @@ mod tests {
         Chain, Config, FirehoseProvider, Provider, ProviderDetails, Shard, Transport, Web3Provider,
     };
     use graph::blockchain::BlockchainKind;
-    use graph::endpoint::Compression;
     use graph::firehose::SubgraphLimit;
     use graph::http::{HeaderMap, HeaderValue};
     use graph::prelude::regex::Regex;
@@ -1315,7 +1311,6 @@ mod tests {
                     features: BTreeSet::new(),
                     headers: HeaderMap::new(),
                     rules: Vec::new(),
-                    compression: Compression::None,
                 }),
             },
             actual
@@ -1342,7 +1337,6 @@ mod tests {
                     features: BTreeSet::new(),
                     headers: HeaderMap::new(),
                     rules: Vec::new(),
-                    compression: Compression::None,
                 }),
             },
             actual
@@ -1450,7 +1444,6 @@ mod tests {
                     features,
                     headers,
                     rules: Vec::new(),
-                    compression: Compression::None,
                 }),
             },
             actual
@@ -1476,7 +1469,6 @@ mod tests {
                     features: BTreeSet::new(),
                     headers: HeaderMap::new(),
                     rules: Vec::new(),
-                    compression: Compression::None,
                 }),
             },
             actual
@@ -1846,7 +1838,6 @@ mod tests {
                     features: BTreeSet::new(),
                     headers: HeaderMap::new(),
                     rules: Vec::new(),
-                    compression: Compression::None,
                 }),
             },
             actual
@@ -1860,63 +1851,57 @@ mod tests {
     }
 
     #[test]
-    fn it_parses_web3_provider_with_compression() {
-        let actual = toml::from_str(
+    fn it_parses_web3_provider_with_gzip_compression_feature() {
+        let actual: Provider = toml::from_str(
             r#"
             label = "compressed"
-            details = { type = "web3", url = "http://localhost:8545", features = ["archive"], compression = "gzip" }
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive", "compression/gzip"] }
         "#,
         )
         .unwrap();
 
+        let mut features = BTreeSet::new();
+        features.insert("archive".to_string());
+        features.insert("compression/gzip".to_string());
+
         assert_eq!(
             Provider {
                 label: "compressed".to_owned(),
                 details: ProviderDetails::Web3(Web3Provider {
                     transport: Transport::Rpc,
                     url: "http://localhost:8545".to_owned(),
-                    features: {
-                        let mut features = BTreeSet::new();
-                        features.insert("archive".to_string());
-                        features
-                    },
+                    features,
                     headers: HeaderMap::new(),
                     rules: Vec::new(),
-                    compression: Compression::Gzip,
                 }),
             },
             actual
         );
+
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert!(web3.gzip_compression_enabled());
+            }
+            _ => panic!("expected Web3 provider"),
+        }
     }
 
     #[test]
-    fn it_parses_web3_provider_with_no_compression() {
-        let actual = toml::from_str(
+    fn it_parses_web3_provider_without_compression_feature() {
+        let actual: Provider = toml::from_str(
             r#"
             label = "uncompressed"
-            details = { type = "web3", url = "http://localhost:8545", features = ["archive"], compression = "none" }
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive"] }
         "#,
         )
         .unwrap();
 
-        assert_eq!(
-            Provider {
-                label: "uncompressed".to_owned(),
-                details: ProviderDetails::Web3(Web3Provider {
-                    transport: Transport::Rpc,
-                    url: "http://localhost:8545".to_owned(),
-                    features: {
-                        let mut features = BTreeSet::new();
-                        features.insert("archive".to_string());
-                        features
-                    },
-                    headers: HeaderMap::new(),
-                    rules: Vec::new(),
-                    compression: Compression::None,
-                }),
-            },
-            actual
-        );
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert!(!web3.gzip_compression_enabled());
+            }
+            _ => panic!("expected Web3 provider"),
+        }
     }
 
     #[test]

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ shard = "primary"`
`48`	`48`	`provider = [`
`49`	`49`	`{ label = "mainnet-0", url = "http://rpc.mainnet.io", features = ["archive", "traces"] },`
`50`	`50`	`{ label = "mainnet-1", details = { type = "web3call", url = "http://rpc.mainnet.io", features = ["archive", "traces"] }},`
`51`		`- { label = "mainnet-2", details = { type = "web3", url = "http://rpc.mainnet.io", features = ["archive"], compression = "gzip" }},`
	`51`	`+ { label = "mainnet-2", details = { type = "web3", url = "http://rpc.mainnet.io", features = ["archive", "compression/gzip"] }},`
`52`	`52`	`{ label = "firehose", details = { type = "firehose", url = "http://localhost:9000", features = [] }},`
`53`	`53`	`{ label = "substreams", details = { type = "substreams", url = "http://localhost:9000", features = [] }},`
`54`	`54`	`]`