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

wtf: try and fix cargo manifest

Browse Source
This commit is contained in:
dr-frmr 2024-05-17 20:41:02 -06:00
parent a7d7f4f89e
commit ff0b411eed
No known key found for this signature in database
32 changed files with 414 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

726
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
kinode/packages/app_store/app_store/Cargo.toml
View File

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

2
kinode/packages/app_store/download/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/app_store/ft_worker/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rand = "0.8" rand = "0.8"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

2
kinode/packages/app_store/install/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/app_store/uninstall/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/chess/chess/Cargo.toml
View File

@ -10,7 +10,7 @@ simulation-mode = []
anyhow = "1.0" anyhow = "1.0"
base64 = "0.22.0" base64 = "0.22.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
pleco = "0.5" pleco = "0.5"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

2
kinode/packages/homepage/homepage/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/kino_updates/widget/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
url = "2.5.0" url = "2.5.0"

2
kinode/packages/kns_indexer/api/kns_indexer:sys-v0.wit
View File

@ -36,5 +36,5 @@ interface kns-indexer {
world kns-indexer-sys-v0 { world kns-indexer-sys-v0 {
import kns-indexer; import kns-indexer;
include process; include process-v0;
} }

2
kinode/packages/kns_indexer/get_block/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/kns_indexer/get_block/src/lib.rs
View File

@ -2,7 +2,7 @@ use kinode_process_lib::{await_next_message_body, call_init, eth, println, Addre
wit_bindgen::generate!({ wit_bindgen::generate!({
path: "target/wit", path: "target/wit",
world: "process", world: "process-v0",
}); });
call_init!(init); call_init!(init);

4
kinode/packages/kns_indexer/kns_indexer/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "kns_indexer" name = "kns_indexer"
version = "0.2.1" version = "0.3.0"
edition = "2021" edition = "2021"
[features] [features]
@ -12,7 +12,7 @@ alloy-primitives = "0.7.0"
alloy-sol-types = "0.7.0" alloy-sol-types = "0.7.0"
bincode = "1.3.3" bincode = "1.3.3"
hex = "0.4.3" hex = "0.4.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", ref = "c8ad6b0" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", ref = "900428d" }
rmp-serde = "1.1.2" rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

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

@ -1,3 +1,6 @@
use crate::kinode::process::kns_indexer::{
GetStateRequest, IndexerRequests, NamehashToNameRequest, NodeInfoRequest,
};
use alloy_sol_types::{sol, SolEvent}; use alloy_sol_types::{sol, SolEvent};
use kinode_process_lib::{ use kinode_process_lib::{
await_message, call_init, eth, net, println, Address, Message, Request, Response, await_message, call_init, eth, net, println, Address, Message, Request, Response,
@ -8,10 +11,6 @@ use std::collections::{
BTreeMap, BTreeMap,
}; };
use crate::kinode::process::kns_indexer::{
GetStateRequest, IndexerRequests, NamehashToNameRequest, NodeInfoRequest,
};
wit_bindgen::generate!({ wit_bindgen::generate!({
path: "target/wit", path: "target/wit",
world: "kns-indexer-sys-v0", world: "kns-indexer-sys-v0",
@ -43,24 +42,11 @@ struct State {
names: HashMap<String, String>, names: HashMap<String, String>,
// human readable name to most recent on-chain routing information as json // human readable name to most recent on-chain routing information as json
// NOTE: not every namehash will have a node registered // NOTE: not every namehash will have a node registered
nodes: HashMap<String, KnsUpdate>, nodes: HashMap<String, net::KnsUpdate>,
// last block we have an update from // last block we have an update from
block: u64, block: u64,
} }
#[derive(Clone, Debug, Serialize, Deserialize)]
pub enum NetAction {
KnsUpdate(KnsUpdate),
KnsBatchUpdate(Vec<KnsUpdate>),
}
impl TryInto<Vec<u8>> for NetAction {
type Error = anyhow::Error;
fn try_into(self) -> Result<Vec<u8>, Self::Error> {
Ok(rmp_serde::to_vec(&self)?)
}
}
sol! { sol! {
// Logged whenever a KNS node is created // Logged whenever a KNS node is created
event NodeRegistered(bytes32 indexed node, bytes name); event NodeRegistered(bytes32 indexed node, bytes name);
@ -190,9 +176,9 @@ fn main(our: Address, mut state: State) -> anyhow::Result<()> {
// shove initial state into net::net // shove initial state into net::net
Request::new() Request::new()
.target((&our.node, "net", "distro", "sys")) .target((&our.node, "net", "distro", "sys"))
.try_body(NetAction::KnsBatchUpdate( .body(rmp_serde::to_vec(&net::NetAction::KnsBatchUpdate(
state.nodes.values().cloned().collect::<Vec<_>>(), state.nodes.values().cloned().collect::<Vec<_>>(),
))? ))?)
.send()?; .send()?;
// set_state(&bincode::serialize(&state)?); // set_state(&bincode::serialize(&state)?);
@ -345,7 +331,7 @@ fn handle_log(our: &Address, state: &mut State, log: &eth::Log) -> anyhow::Resul
let node = state let node = state
.nodes .nodes
.entry(name.to_string()) .entry(name.to_string())
.or_insert_with(|| KnsUpdate { .or_insert_with(|| net::KnsUpdate {
name: name.to_string(), name: name.to_string(),
owner: "".to_string(), owner: "".to_string(),
node: node_id.to_string(), node: node_id.to_string(),
@ -406,7 +392,7 @@ fn handle_log(our: &Address, state: &mut State, log: &eth::Log) -> anyhow::Resul
{ {
Request::new() Request::new()
.target((&our.node, "net", "distro", "sys")) .target((&our.node, "net", "distro", "sys"))
.try_body(NetAction::KnsUpdate(node.clone()))? .body(rmp_serde::to_vec(&net::NetAction::KnsUpdate(node.clone()))?)
.send()?; .send()?;
} }

3
kinode/packages/kns_indexer/metadata.json
View File

@ -10,8 +10,9 @@
"code_hashes": { "code_hashes": {
"0.2.1": "" "0.2.1": ""
}, },
"wit_version": 0,
"dependencies": [] "dependencies": []
}, },
"external_url": "https://kinode.org", "external_url": "https://kinode.org",
"animation_url": "" "animation_url": ""
} }

2
kinode/packages/kns_indexer/state/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/kns_indexer/state/src/lib.rs
View File

@ -4,7 +4,7 @@ use std::collections::HashMap;
wit_bindgen::generate!({ wit_bindgen::generate!({
path: "target/wit", path: "target/wit",
world: "process", world: "process-v0",
}); });
/// From main kns_indexer process /// From main kns_indexer process

2
kinode/packages/terminal/alias/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/cat/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/echo/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/hi/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/m/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
clap = "4.4.18" clap = "4.4.18"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
regex = "1.10.3" regex = "1.10.3"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

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

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rmp-serde = "1.1.2" rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/net_diagnostics/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rmp-serde = "1.1.2" rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/peer/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rmp-serde = "1.1.2" rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/peers/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
simulation-mode = [] simulation-mode = []
[dependencies] [dependencies]
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rmp-serde = "1.1.2" rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/terminal/terminal/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
rand = "0.8" rand = "0.8"
regex = "1.10.3" regex = "1.10.3"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

2
kinode/packages/terminal/top/Cargo.toml
View File

@ -8,7 +8,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
wit-bindgen = "0.24.0" wit-bindgen = "0.24.0"

2
kinode/packages/tester/test_runner/Cargo.toml
View File

@ -9,7 +9,7 @@ simulation-mode = []
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0" thiserror = "1.0"

2
kinode/packages/tester/tester/Cargo.toml
View File

@ -10,7 +10,7 @@ simulation-mode = []
anyhow = "1.0" anyhow = "1.0"
bincode = "1.3.3" bincode = "1.3.3"
indexmap = "2.1" indexmap = "2.1"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.7.2" } kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0" thiserror = "1.0"

2
lib/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "Apache-2.0"
[build-dependencies] [build-dependencies]
anyhow = "1.0.71" anyhow = "1.0.71"
kit = { git = "https://github.com/kinode-dao/kit", rev = "49093a0" } kit = { git = "https://github.com/kinode-dao/kit", rev = "d319c5b" }
reqwest = { version = "0.12.4", features = ["blocking"] } reqwest = { version = "0.12.4", features = ["blocking"] }
tokio = "1.28" tokio = "1.28"

4
lib/src/core.rs
View File

@ -2,7 +2,7 @@ use crate::wit;
use ring::signature; use ring::signature;
use rusqlite::types::{FromSql, FromSqlError, ToSql, ValueRef}; use rusqlite::types::{FromSql, FromSqlError, ToSql, ValueRef};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet, BTreeMap};
use thiserror::Error; use thiserror::Error;
lazy_static::lazy_static! { lazy_static::lazy_static! {
@ -1843,7 +1843,7 @@ pub struct KnsUpdate {
pub node: String, // hex namehash of node pub node: String, // hex namehash of node
pub public_key: String, pub public_key: String,
pub ips: Vec<String>, pub ips: Vec<String>,
pub ports: HashMap<String, u16>, pub ports: BTreeMap<String, u16>,
pub routers: Vec<String>, pub routers: Vec<String>,
} }