refactor: align radix custom rpc header with evm implementation (#7110)

Author: yjamin

rust/main/Cargo.lock

@@ -22,6 +22,7 @@ members = [
   "utils/backtrace-oneline",
   "utils/crypto",
   "utils/hex",
+  "utils/reqwest-utils",
   "utils/run-locally",
 ]
 resolver = "2"
@@ -190,8 +191,8 @@ radix-engine-interface = { git = "https://github.com/hyperlane-xyz/radixdlt-scry
 scrypto = { git = "https://github.com/hyperlane-xyz/radixdlt-scrypto.git", branch = "hyperlane", features = [
   "serde",
 ] }
-core-api-client = { git = "https://github.com/hyperlane-xyz/radix-apis-rust-clients.git", branch = "hyperlane" }
-gateway-api-client = { git = "https://github.com/hyperlane-xyz/radix-apis-rust-clients.git", branch = "hyperlane" }
+core-api-client = { git = "https://github.com/hyperlane-xyz/radix-apis-rust-clients.git", rev = "2d284dad4ef48cab302cfa0435c548b54923b7e1" }
+gateway-api-client = { git = "https://github.com/hyperlane-xyz/radix-apis-rust-clients.git", rev = "2d284dad4ef48cab302cfa0435c548b54923b7e1" }
 scrypto-derive = { git = "https://github.com/hyperlane-xyz/radixdlt-scrypto.git", branch = "hyperlane" }
 sbor = { git = "https://github.com/hyperlane-xyz/radixdlt-scrypto.git", branch = "hyperlane", features = [
   "serde",

rust/main/Cargo.toml

@@ -37,6 +37,7 @@ hyperlane-core = { path = "../../hyperlane-core", features = ["async"] }
 hyperlane-metric = { path = "../../hyperlane-metric" }
 hyperlane-operation-verifier = { path = "../../applications/hyperlane-operation-verifier" }
 hyperlane-warp-route = { path = "../../applications/hyperlane-warp-route" }
+reqwest-utils = { path = "../../utils/reqwest-utils" }
 
 [build-dependencies]
 abigen = { path = "../../utils/abigen", features = ["ethers"] }

rust/main/chains/hyperlane-ethereum/Cargo.toml

@@ -1,5 +1,4 @@
 use std::fmt::Debug;
-use std::str::FromStr;
 use std::sync::{Arc, OnceLock};
 use std::time::Duration;
 
@@ -17,8 +16,8 @@ use ethers::types::Address;
 use ethers_signers::Signer;
 use hyperlane_core::rpc_clients::FallbackProvider;
 use hyperlane_metric::utils::url_to_host_info;
-use reqwest::header::{HeaderName, HeaderValue};
 use reqwest::{Client, Url};
+use reqwest_utils::parse_custom_rpc_headers;
 use thiserror::Error;
 
 use ethers_prometheus::json_rpc_client::{JsonRpcBlockGetter, PrometheusJsonRpcClient};
@@ -328,50 +327,14 @@ fn get_reqwest_client(url: &Url) -> ChainResult<Client> {
     if let Some(client) = client_cache.get(url) {
         return Ok(client.clone());
     }
-    let client = build_new_reqwest_client(url.clone())?;
-    client_cache.insert(url.clone(), client.clone());
-    Ok(client)
-}
-
-/// Builds a new reqwest client with the given URL.
-/// Generally `get_reqwest_client` should be used instead of this function,
-/// as it caches the client for reuse.
-fn build_new_reqwest_client(url: Url) -> ChainResult<Client> {
-    let mut queries_to_keep = vec![];
-    let mut headers = reqwest::header::HeaderMap::new();
-
-    // A hack to pass custom headers to the provider without
-    // requiring a bunch of changes to our configuration surface area.
-    // Any `custom_rpc_header` query parameter is expected to have the value
-    // format: `header_name:header_value`, will be added to the headers
-    // of the HTTP client, and removed from the URL params.
-    let mut updated_url = url.clone();
-    for (key, value) in url.query_pairs() {
-        if key != "custom_rpc_header" {
-            queries_to_keep.push((key.clone(), value.clone()));
-            continue;
-        }
-        if let Some((header_name, header_value)) = value.split_once(':') {
-            let header_name =
-                HeaderName::from_str(header_name).map_err(ChainCommunicationError::from_other)?;
-            let mut header_value =
-                HeaderValue::from_str(header_value).map_err(ChainCommunicationError::from_other)?;
-            header_value.set_sensitive(true);
-            headers.insert(header_name, header_value);
-        }
-    }
-
-    updated_url
-        .query_pairs_mut()
-        .clear()
-        .extend_pairs(queries_to_keep);
-
+    let (headers, _) =
+        parse_custom_rpc_headers(url).map_err(ChainCommunicationError::from_other)?;
     let client = Client::builder()
         .timeout(HTTP_CLIENT_TIMEOUT)
         .default_headers(headers)
         .build()
         .map_err(EthereumProviderConnectionError::from)?;
-
+    client_cache.insert(url.clone(), client.clone());
     Ok(client)
 }
 

rust/main/chains/hyperlane-ethereum/src/rpc_clients/trait_builder.rs

@@ -9,6 +9,7 @@ bech32 = { workspace = true }
 chrono = { workspace = true }
 core-api-client = { workspace = true }
 crypto = { path = "../../utils/crypto" }
+reqwest-utils = { path = "../../utils/reqwest-utils" }
 derive-new = { workspace = true }
 futures = { workspace = true }
 gateway-api-client = { workspace = true }
@@ -26,7 +27,7 @@ radix-common = { workspace = true }
 radix-engine-interface = { workspace = true }
 radix-transactions = { workspace = true }
 regex = { workspace = true }
-reqwest = "0.12.15"
+reqwest = { workspace = true }
 ripemd = { workspace = true }
 sbor = { workspace = true, features = ["serde"] }
 scrypto = { workspace = true, features = ["serde"] }

rust/main/chains/hyperlane-radix/Cargo.toml

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, str::FromStr};
+use std::str::FromStr;
 
 use scrypto::network::NetworkDefinition;
 use url::Url;
@@ -12,31 +12,19 @@ pub struct ConnectionConf {
     pub gateway: Vec<Url>,
     /// Network definitions
     pub network: NetworkDefinition,
-    /// Core Headers
-    pub core_header: Vec<HashMap<String, String>>,
-    /// Gateway Headers
-    pub gateway_header: Vec<HashMap<String, String>>,
 }
 
 impl ConnectionConf {
     /// Returns a new Connection Config
-    pub fn new(
-        core: Vec<Url>,
-        gateway: Vec<Url>,
-        network_name: String,
-        core_header: Vec<HashMap<String, String>>,
-        gateway_header: Vec<HashMap<String, String>>,
-    ) -> Self {
+    pub fn new(core: Vec<Url>, gateway: Vec<Url>, network_name: String) -> Self {
         let network = match network_name.as_str() {
             "localnet" => NetworkDefinition::localnet(),
             _ => NetworkDefinition::from_str(&network_name).unwrap_or(NetworkDefinition::mainnet()),
         };
 
         Self {
             core,
-            core_header,
             gateway,
-            gateway_header,
             network,
         }
     }