add rpc url auth

Author: nick1udwig

Cargo.toml

@@ -18,6 +18,7 @@ alloy-sol-types = "0.8.15"
 alloy = { version = "0.8.1", features = [
     "json-rpc",
     "rpc-types",
+    "rpc-types-eth",
 ] }
 anyhow = "1.0"
 bincode = "1.3.3"

src/eth.rs

@@ -1,4 +1,5 @@
 use crate::{Message, Request as KiRequest};
+pub use alloy::rpc::client::Authorization;
 pub use alloy::rpc::json_rpc::ErrorPayload;
 pub use alloy::rpc::types::eth::pubsub::SubscriptionResult;
 pub use alloy::rpc::types::pubsub::Params;
@@ -219,21 +220,67 @@ pub struct ProviderConfig {
     pub provider: NodeOrRpcUrl,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, Hash, Eq, PartialEq)]
+#[derive(Clone, Debug, Serialize, Hash, Eq, PartialEq)]
 pub enum NodeOrRpcUrl {
     Node {
         kns_update: crate::net::KnsUpdate,
         use_as_provider: bool, // false for just-routers inside saved config
     },
-    RpcUrl(String),
+    RpcUrl {
+        url: String,
+        auth: Option<Authorization>,
+    },
 }
 
 impl std::cmp::PartialEq<str> for NodeOrRpcUrl {
     fn eq(&self, other: &str) -> bool {
         match self {
             NodeOrRpcUrl::Node { kns_update, .. } => kns_update.name == other,
-            NodeOrRpcUrl::RpcUrl(url) => url == other,
+            NodeOrRpcUrl::RpcUrl { url, .. } => url == other,
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for NodeOrRpcUrl {
+    fn deserialize<D>(serde::deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        #[serde(untagged)]
+        enum RpcUrlHelper {
+            String(String),
+            Struct {
+                url: String,
+                auth: Option<Authorization>,
+            },
         }
+
+        #[derive(Deserialize)]
+        #[serde(tag = "type")]
+        enum Helper {
+            Node {
+                kns_update: crate::core::KnsUpdate,
+                use_as_provider: bool,
+            },
+            RpcUrl(RpcUrlHelper),
+        }
+
+        let helper = Helper::deserialize(deserializer)?;
+
+        Ok(match helper {
+            Helper::Node {
+                kns_update,
+                use_as_provider,
+            } => NodeOrRpcUrl::Node {
+                kns_update,
+                use_as_provider,
+            },
+            Helper::RpcUrl(url_helper) => match url_helper {
+                RpcUrlHelper::String(url) => NodeOrRpcUrl::RpcUrl { url, auth: None },
+                RpcUrlHelper::Struct { url, auth } => NodeOrRpcUrl::RpcUrl { url, auth },
+            },
+        })
     }
 }