keep only the newest eth provider for a given url

hyperware-ai · Feb 7, 2025 · a72d018 · a72d018
1 parent 6044f08
commit a72d018
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kinode/packages/settings/Cargo.lock b/kinode/packages/settings/Cargo.lock
diff --git a/kinode/src/main.rs b/kinode/src/main.rs
@@ -111,6 +111,7 @@ async fn main() {
     );
 
     // default eth providers/routers
+    let mut is_eth_provider_config_updated = false;
     let mut eth_provider_config: lib::eth::SavedConfigs = if let Ok(contents) =
         tokio::fs::read_to_string(home_directory_path.join(".eth_providers")).await
     {
@@ -121,6 +122,7 @@ async fn main() {
             serde_json::from_str(DEFAULT_ETH_PROVIDERS).unwrap()
         }
     } else {
+        is_eth_provider_config_updated = true;
         serde_json::from_str(DEFAULT_ETH_PROVIDERS).unwrap()
     };
     if let Some(rpc) = rpc {
@@ -135,18 +137,12 @@ async fn main() {
                 },
             },
         );
-        // save the new provider config
-        tokio::fs::write(
-            home_directory_path.join(".eth_providers"),
-            serde_json::to_string(&eth_provider_config).unwrap(),
-        )
-        .await
-        .expect("failed to save new eth provider config!");
+        is_eth_provider_config_updated = true;
     }
     if let Some(rpc_config) = rpc_config {
         let rpc_config = tokio::fs::read_to_string(rpc_config)
             .await
-            .expect("could not read rpc-config");
+            .expect("cant read rpc-config");
         let rpc_config: Vec<RpcUrlConfigInput> =
             serde_json::from_str(&rpc_config).expect("rpc-config had invalid format");
         for RpcUrlConfigInput { url, auth } in rpc_config {
@@ -159,6 +155,9 @@ async fn main() {
                 },
             );
         }
+        is_eth_provider_config_updated = true;
+    }
+    if is_eth_provider_config_updated {
         // save the new provider config
         tokio::fs::write(
             home_directory_path.join(".eth_providers"),

diff --git a/lib/src/eth.rs b/lib/src/eth.rs
@@ -192,7 +192,21 @@ impl SavedConfigs {
     /// insert while enforcing that each config is unique
     pub fn insert(&mut self, index: usize, config: ProviderConfig) {
         // filter out any configs which are the same as incoming config
-        self.0.retain(|c| c != &config);
+        if let NodeOrRpcUrl::RpcUrl { ref url, .. } = config.provider {
+            // remove old occurrences with matching URLs to make sure
+            //  auth is what was passed in and never an old value
+            self.0.retain(|c| {
+                if let NodeOrRpcUrl::RpcUrl {
+                    url: ref old_url, ..
+                } = c.provider
+                {
+                    return url != old_url;
+                }
+                c != &config
+            });
+        } else {
+            self.0.retain(|c| c != &config);
+        }
         self.0.insert(index, config);
     }
 }