fix: use process_lib dnswire_decode with error handling

kinode/packages/app_store/app_store/Cargo.toml

@@ -11,7 +11,7 @@ alloy-primitives = "0.7.0"
 alloy-sol-types = "0.7.0"
 anyhow = "1.0"
 bincode = "1.3.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "1ea6eda" }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

kinode/packages/app_store/app_store/src/types.rs

@@ -392,14 +392,11 @@ impl State {
                     ),
                 );
 
-                if generate_package_hash(&package_name, publisher_dnswire.to_vec().as_slice())
-                    != package_hash
-                {
+                if generate_package_hash(&package_name, &publisher_dnswire) != package_hash {
                     return Err(anyhow::anyhow!("got log with mismatched package hash"));
                 }
 
-                let Ok(publisher_name) = dnswire_decode(publisher_dnswire.to_vec().as_slice())
-                else {
+                let Ok(publisher_name) = net::dnswire_decode(&publisher_dnswire) else {
                     return Err(anyhow::anyhow!("got log with invalid publisher name"));
                 };
 
@@ -529,35 +526,6 @@ impl State {
     }
 }
 
-/// take a DNSwire-formatted node ID from chain and convert it to a String
-fn dnswire_decode(wire_format_bytes: &[u8]) -> Result<String, std::string::FromUtf8Error> {
-    let mut i = 0;
-    let mut result = Vec::new();
-
-    while i < wire_format_bytes.len() {
-        let len = wire_format_bytes[i] as usize;
-        if len == 0 {
-            break;
-        }
-        let end = i + len + 1;
-        let mut span = wire_format_bytes[i + 1..end].to_vec();
-        span.push('.' as u8);
-        result.push(span);
-        i = end;
-    }
-
-    let flat: Vec<_> = result.into_iter().flatten().collect();
-
-    let name = String::from_utf8(flat)?;
-
-    // Remove the trailing '.' if it exists (it should always exist)
-    if name.ends_with('.') {
-        Ok(name[0..name.len() - 1].to_string())
-    } else {
-        Ok(name)
-    }
-}
-
 /// fetch metadata from metadata_url and verify it matches metadata_hash
 fn fetch_metadata(metadata_url: &str, metadata_hash: &str) -> anyhow::Result<kt::Erc721Metadata> {
     let url = url::Url::parse(metadata_url)?;

kinode/packages/homepage/homepage/src/lib.rs

@@ -40,7 +40,7 @@ wit_bindgen::generate!({
 
 call_init!(init);
 fn init(our: Address) {
-    let mut app_data: BTreeMap<ProcessId, HomepageApp> = BTreeMap::new();
+    let mut app_data: BTreeMap<String, HomepageApp> = BTreeMap::new();
 
     serve_ui(&our, "ui", true, false, vec!["/"]).expect("failed to serve ui");
 
@@ -102,7 +102,7 @@ fn init(our: Address) {
                         );
                     }
                     HomepageRequest::Remove => {
-                        app_data.remove(&message.source().process);
+                        app_data.remove(&message.source().process.to_string());
                     }
                 }
             } else if let Ok(request) = serde_json::from_slice::<HttpServerRequest>(message.body())
@@ -131,7 +131,7 @@ fn init(our: Address) {
                         } else {
                             send_response(
                                 StatusCode::OK,
-                                Some(HashMap::new()),
+                                Some(std::collections::HashMap::new()),
                                 "yes hello".as_bytes().to_vec(),
                             );
                         }

kinode/packages/kns_indexer/kns_indexer/Cargo.toml

@@ -12,7 +12,7 @@ alloy-primitives = "0.7.0"
 alloy-sol-types = "0.7.0"
 bincode = "1.3.3"
 hex = "0.4.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "1ea6eda" }
 rmp-serde = "1.1.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

kinode/packages/kns_indexer/kns_indexer/src/lib.rs

@@ -1,14 +1,13 @@
 use alloy_sol_types::{sol, SolEvent};
 use kinode_process_lib::{
-    await_message, call_init, eth, get_typed_state, println, set_state, Address, Message, Request,
-    Response,
+    await_message, call_init, eth, get_typed_state, net, println, set_state, Address, Message,
+    Request, Response,
 };
 use serde::{Deserialize, Serialize};
 use std::collections::{
     hash_map::{Entry, HashMap},
     BTreeMap,
 };
-use std::string::FromUtf8Error;
 
 wit_bindgen::generate!({
     path: "wit",
@@ -449,33 +448,5 @@ fn get_name(log: &eth::Log) -> anyhow::Result<String> {
             "got event other than NodeRegistered without knowing about existing node name"
         )
     })?;
-    dnswire_decode(decoded.name.to_vec()).map_err(|e| anyhow::anyhow!(e))
-}
-
-fn dnswire_decode(wire_format_bytes: Vec<u8>) -> Result<String, FromUtf8Error> {
-    let mut i = 0;
-    let mut result = Vec::new();
-
-    while i < wire_format_bytes.len() {
-        let len = wire_format_bytes[i] as usize;
-        if len == 0 {
-            break;
-        }
-        let end = i + len + 1;
-        let mut span = wire_format_bytes[i + 1..end].to_vec();
-        span.push('.' as u8);
-        result.push(span);
-        i = end;
-    }
-
-    let flat: Vec<_> = result.into_iter().flatten().collect();
-
-    let name = String::from_utf8(flat)?;
-
-    // Remove the trailing '.' if it exists (it should always exist)
-    if name.ends_with('.') {
-        Ok(name[0..name.len() - 1].to_string())
-    } else {
-        Ok(name)
-    }
+    net::dnswire_decode(&decoded.name).map_err(|e| anyhow::anyhow!(e))
 }