use auth for url rpc

hyperware-ai · Feb 5, 2025 · bd927c2 · bd927c2
1 parent e99c8c5
commit bd927c2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/kinode/packages/settings/settings/src/lib.rs b/kinode/packages/settings/settings/src/lib.rs
@@ -557,7 +557,7 @@ fn eth_config_convert(
                             use_as_provider: true,
                         }
                     }
-                    SettingsNodeOrRpcUrl::RpcUrl(url) => eth::NodeOrRpcUrl::RpcUrl(url),
+                    SettingsNodeOrRpcUrl::RpcUrl { url, auth } => eth::NodeOrRpcUrl::RpcUrl { url, auth },
                 },
                 trusted: true,
             }))

diff --git a/kinode/src/eth/mod.rs b/kinode/src/eth/mod.rs
@@ -80,15 +80,15 @@ impl ActiveProviders {
                     },
                 );
             }
-            NodeOrRpcUrl::RpcUrl(url) => {
+            NodeOrRpcUrl::RpcUrl { url, auth } => {
                 self.remove_provider(&url);
                 self.urls.insert(
                     0,
                     UrlProvider {
                         trusted: new.trusted,
                         url,
                         pubsub: vec![],
-                        auth: None,
+                        auth,
                     },
                 );
             }

diff --git a/kinode/src/eth/utils.rs b/kinode/src/eth/utils.rs
@@ -36,7 +36,10 @@ pub fn providers_to_saved_configs(providers: &Providers) -> SavedConfigs {
                     .iter()
                     .map(|url_provider| ProviderConfig {
                         chain_id: *entry.key(),
-                        provider: NodeOrRpcUrl::RpcUrl(url_provider.url.clone()),
+                        provider: NodeOrRpcUrl::RpcUrl {
+                            url: url_provider.url.clone(),
+                            auth: url_provider.auth.clone(),
+                        },
                         trusted: url_provider.trusted,
                     })
                     .chain(entry.nodes.iter().map(|node_provider| ProviderConfig {

diff --git a/kinode/src/main.rs b/kinode/src/main.rs
@@ -127,7 +127,10 @@ async fn main() {
             lib::eth::ProviderConfig {
                 chain_id: CHAIN_ID,
                 trusted: true,
-                provider: lib::eth::NodeOrRpcUrl::RpcUrl(rpc.to_string()),
+                provider: lib::eth::NodeOrRpcUrl::RpcUrl {
+                    url: rpc.to_string(),
+                    auth: None, // TODO
+                },
             },
         );
         // save the new provider config
@@ -150,10 +153,10 @@ async fn main() {
             lib::eth::ProviderConfig {
                 chain_id: 31337,
                 trusted: true,
-                provider: lib::eth::NodeOrRpcUrl::RpcUrl(format!(
-                    "ws://localhost:{}",
-                    local_chain_port
-                )),
+                provider: lib::eth::NodeOrRpcUrl::RpcUrl {
+                    url: format!("ws://localhost:{local_chain_port}"),
+                    auth: None,
+                },
             },
         );
     }

diff --git a/lib/src/eth.rs b/lib/src/eth.rs
@@ -203,7 +203,6 @@ pub struct ProviderConfig {
     pub chain_id: u64,
     pub trusted: bool,
     pub provider: NodeOrRpcUrl,
-    pub auth: Option<Authorization>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, Hash, Eq, PartialEq)]
@@ -212,14 +211,17 @@ pub enum NodeOrRpcUrl {
         kns_update: crate::core::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,
         }
     }
 }