uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-31 04:24:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove trailing ., remove old namehash_to_name script

Browse Source
This commit is contained in:
dr-frmr 2024-07-16 18:41:58 +02:00
parent b0302ff509
commit 95a78c874d
No known key found for this signature in database
5 changed files with 29 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -3750,16 +3750,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "namehash_to_name"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.3 (git+https://github.com/kinode-dao/process_lib?branch=develop)",
"rmp-serde",
"serde",
"wit-bindgen",
]
[[package]]
name = "native-tls"
version = "0.2.12"

2
Cargo.toml
View File

@ -23,7 +23,7 @@ members = [
"kinode/packages/settings/settings",
"kinode/packages/terminal/terminal",
"kinode/packages/terminal/alias", "kinode/packages/terminal/cat", "kinode/packages/terminal/echo", "kinode/packages/terminal/hi", "kinode/packages/terminal/kfetch", "kinode/packages/terminal/kill", "kinode/packages/terminal/m", "kinode/packages/terminal/top",
"kinode/packages/terminal/namehash_to_name", "kinode/packages/terminal/net_diagnostics", "kinode/packages/terminal/peer", "kinode/packages/terminal/peers",
"kinode/packages/terminal/net_diagnostics", "kinode/packages/terminal/peer", "kinode/packages/terminal/peers",
"kinode/packages/tester/tester",
]
default-members = ["lib"]

46
kinode/packages/kns_indexer/kns_indexer/src/lib.rs
View File

@ -277,7 +277,10 @@ fn handle_log(our: &Address, state: &mut State, log: &eth::Log) -> anyhow::Resul
let child_hash = decoded.childhash.to_string();
let label = String::from_utf8(decoded.name.to_vec())?;
let name = format!("{}.{}", label, get_parent_name(state, &parent_hash));
let name = match get_parent_name(&state.names, &parent_hash) {
Some(parent_name) => format!("{}.{}", label, parent_name),
None => label,
};
state.names.insert(child_hash.clone(), name.clone());
@ -298,57 +301,58 @@ fn handle_log(our: &Address, state: &mut State, log: &eth::Log) -> anyhow::Resul
let decoded = kimap::contract::Note::decode_log_data(log.data(), true).unwrap();
let note = String::from_utf8(decoded.note.to_vec())?;
let _note_hash: String = decoded.notehash.to_string();
let node_hash = decoded.nodehash.to_string();
let name = get_parent_name(state, &node_hash);
let Some(node_name) = get_parent_name(&state.names, &node_hash) else {
return Err(anyhow::anyhow!("parent node for note not found"));
};
match note.as_str() {
"~ws-port" => {
let ws = bytes_to_port(&decoded.data)?;
state.nodes.entry(name.clone()).and_modify(|node| {
state.nodes.entry(node_name.clone()).and_modify(|node| {
node.ports.insert("ws".to_string(), ws);
// port defined, -> direct
node.routers = vec![];
});
node = Some(name.clone());
node = Some(node_name);
}
"~tcp-port" => {
let tcp = bytes_to_port(&decoded.data)?;
state.nodes.entry(name.clone()).and_modify(|node| {
state.nodes.entry(node_name.clone()).and_modify(|node| {
node.ports.insert("tcp".to_string(), tcp);
// port defined, -> direct
node.routers = vec![];
});
node = Some(name.clone());
node = Some(node_name);
}
"~net-key" => {
if decoded.data.len() != 32 {
return Err(anyhow::anyhow!("invalid net-key length"));
}
state.nodes.entry(name.clone()).and_modify(|node| {
state.nodes.entry(node_name.clone()).and_modify(|node| {
node.public_key = decoded.data.to_string();
});
node = Some(name);
node = Some(node_name);
}
"~routers" => {
let routers = decode_routers(&decoded.data)?;
state.nodes.entry(name.clone()).and_modify(|node| {
state.nodes.entry(node_name.clone()).and_modify(|node| {
node.routers = routers;
// -> indirect
node.ports = BTreeMap::new();
node.ips = vec![];
});
node = Some(name.clone());
node = Some(node_name);
}
"~ip" => {
let ip = bytes_to_ip(&decoded.data)?;
state.nodes.entry(name.clone()).and_modify(|node| {
state.nodes.entry(node_name.clone()).and_modify(|node| {
node.ips.push(ip.to_string());
// -> direct
node.routers = vec![];
});
node = Some(name.clone());
node = Some(node_name);
}
_ => {}
}
@ -406,28 +410,34 @@ fn fetch_and_process_logs(
}
}
fn get_parent_name(state: &mut State, parent_hash: &str) -> String {
fn get_parent_name(names: &HashMap<String, String>, parent_hash: &str) -> Option<String> {
let mut current_hash = parent_hash;
let mut components = Vec::new(); // Collect components in a vector
let mut visited_hashes = std::collections::HashSet::new();
while let Some(parent_name) = state.names.get(current_hash) {
while let Some(parent_name) = names.get(current_hash) {
if !visited_hashes.insert(current_hash) {
break;
}
components.push(parent_name.clone());
if !parent_name.is_empty() {
components.push(parent_name.clone());
}
// Update current_hash to the parent's hash for the next iteration
if let Some(new_parent_hash) = state.names.get(parent_name) {
if let Some(new_parent_hash) = names.get(parent_name) {
current_hash = new_parent_hash;
} else {
break;
}
}
if components.is_empty() {
return None;
}
components.reverse();
components.join(".")
Some(components.join("."))
}
// TEMP. Either remove when event reimitting working with anvil,

19
kinode/packages/terminal/namehash_to_name/Cargo.toml
View File

@ -1,19 +0,0 @@
[package]
name = "namehash_to_name"
version = "0.1.0"
edition = "2021"
[features]
simulation-mode = []
[dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", branch = "develop" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0"
[lib]
crate-type = ["cdylib"]
[package.metadata.component]
package = "kinode:process"

35
kinode/packages/terminal/namehash_to_name/src/lib.rs
View File

@ -1,35 +0,0 @@
use kinode_process_lib::{
await_next_message_body, call_init, net, println, Address, Message, Request,
};
wit_bindgen::generate!({
path: "target/wit",
world: "process-v0",
});
call_init!(init);
fn init(_our: Address) {
let Ok(args) = await_next_message_body() else {
println!("failed to get args");
return;
};
let Ok(namehash) = String::from_utf8(args) else {
println!("argument must be a string");
return;
};
let Ok(Ok(Message::Response { body, .. })) = Request::to(("our", "net", "distro", "sys"))
.body(rmp_serde::to_vec(&net::NetAction::GetName(namehash.clone())).unwrap())
.send_and_await_response(5)
else {
println!("failed to get name from networking module");
return;
};
let Ok(net::NetResponse::Name(maybe_name)) = rmp_serde::from_slice(&body) else {
println!("got malformed response from networking module");
return;
};
match maybe_name {
Some(name) => println!("{namehash}: {name}"),
None => println!("no name found for {namehash}"),
}
}