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

finish merge

Browse Source
This commit is contained in:
hosted-fornet 2024-05-13 16:32:39 -07:00
parent 2576b07edd
commit 7da4cfbb0d
8 changed files with 48 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Cargo.lock generated
View File

@ -3084,7 +3084,7 @@ dependencies = [
"hmac",
"http 1.1.0",
"jwt",
"kit 0.3.1 (git+https://github.com/kinode-dao/kit?rev=25b474a)",
"kit 0.4.1",
"lazy_static",
"lib",
"log",
@ -3237,73 +3237,6 @@ dependencies = [
"wit-bindgen",
]
[[package]]
name = "kit"
version = "0.3.1"
dependencies = [
"anyhow",
"base64 0.21.7",
"clap",
"color-eyre",
"dirs 5.0.1",
"fs-err",
"futures-util",
"git2",
"hex",
"kinode_process_lib 0.7.0 (git+https://github.com/kinode-dao/process_lib.git?rev=2aa3a1a)",
"nix",
"regex",
"reqwest 0.11.27",
"rmp-serde",
"semver 1.0.22",
"serde",
"serde_json",
"thiserror",
"tokio",
"tokio-tungstenite 0.20.1",
"toml",
"tracing",
"tracing-appender",
"tracing-error",
"tracing-subscriber",
"walkdir",
"zip 0.6.6",
]
[[package]]
name = "kit"
version = "0.3.1"
source = "git+https://github.com/kinode-dao/kit?rev=25b474a#25b474abec180f6ae63b3f2c13f459a180b5be73"
dependencies = [
"anyhow",
"base64 0.21.7",
"clap",
"color-eyre",
"dirs 5.0.1",
"fs-err",
"futures-util",
"git2",
"hex",
"kinode_process_lib 0.6.0",
"nix",
"regex",
"reqwest 0.11.27",
"rmp-serde",
"semver 1.0.22",
"serde",
"serde_json",
"thiserror",
"tokio",
"tokio-tungstenite 0.20.1",
"toml",
"tracing",
"tracing-appender",
"tracing-error",
"tracing-subscriber",
"walkdir",
"zip 0.6.6",
]
[[package]]
name = "kit"
version = "0.3.1"
@ -3338,6 +3271,41 @@ dependencies = [
"zip 0.6.6",
]
[[package]]
name = "kit"
version = "0.4.1"
source = "git+https://github.com/kinode-dao/kit?rev=63eb4c5#63eb4c5c3e3d3046b45e837a56f22246e322a408"
dependencies = [
"anyhow",
"base64 0.21.7",
"clap",
"color-eyre",
"dirs 5.0.1",
"fs-err",
"futures-util",
"git2",
"hex",
"kinode_process_lib 0.7.0 (git+https://github.com/kinode-dao/process_lib.git?rev=2aa3a1a)",
"nix",
"regex",
"reqwest 0.11.27",
"rmp-serde",
"semver 1.0.22",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
"tokio-tungstenite 0.20.1",
"toml",
"tracing",
"tracing-appender",
"tracing-error",
"tracing-subscriber",
"walkdir",
"zip 0.6.6",
]
[[package]]
name = "kns_indexer"
version = "0.2.1"
@ -3378,7 +3346,7 @@ version = "0.7.2"
dependencies = [
"alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=6f8ebb4)",
"anyhow",
"kit 0.3.1 (git+https://github.com/kinode-dao/kit?rev=659f59e)",
"kit 0.3.1",
"lazy_static",
"rand 0.8.5",
"reqwest 0.12.4",

2
kinode/Cargo.toml
View File

@ -14,7 +14,7 @@ path = "src/main.rs"
[build-dependencies]
anyhow = "1.0.71"
kit = { git = "https://github.com/kinode-dao/kit", rev = "b905fd7" }
kit = { git = "https://github.com/kinode-dao/kit", rev = "63eb4c5" }
rayon = "1.8.1"
sha2 = "0.10"
tokio = "1.28"

2
kinode/build.rs
View File

@ -59,7 +59,7 @@ fn build_and_zip_package(
) -> anyhow::Result<(String, String, Vec<u8>)> {
let rt = tokio::runtime::Runtime::new().unwrap();
rt.block_on(async {
kit::build::execute(&entry_path, true, false, true, features, None) // TODO
kit::build::execute(&entry_path, true, false, true, features, None, None) // TODO
.await
.map_err(|e| anyhow::anyhow!("{:?}", e))?;

5
kinode/packages/homepage/api/homepage:sys-api-v0.wit
View File

@ -11,7 +11,8 @@ interface homepage-sys-api-v0 {
record add-request {
label: string,
icon: string,
path: string,
icon: option<string>,
path: option<string>,
widget: option<string>,
}
}

11
kinode/packages/homepage/homepage/src/lib.rs
View File

@ -81,16 +81,7 @@ fn init(our: Address) {
// they must have messaging access to us in order to perform this.
if let Ok(request) = serde_json::from_slice::<HomepageRequest>(message.body()) {
match request {
<<<<<<< HEAD
HomepageRequest::Add(AddRequest { label, icon, path }) => {
=======
HomepageRequest::Add {
label,
icon,
path,
widget,
} => {
>>>>>>> develop
HomepageRequest::Add(AddRequest { label, icon, path, widget }) => {
app_data.insert(
message.source().process.to_string(),
HomepageApp {

5
kinode/packages/kino_updates/metadata.json
View File

@ -9,8 +9,9 @@
"mirrors": [],
"code_hashes": {
"0.1.0": ""
}
},
"dependencies": []
},
"external_url": "https://kinode.org",
"animation_url": ""
}
}

2
kinode/packages/kino_updates/widget/src/lib.rs
View File

@ -2,7 +2,7 @@ use kinode_process_lib::{call_init, http, timer, Address, Request};
use serde::{Deserialize, Serialize};
wit_bindgen::generate!({
path: "wit",
path: "target/wit",
world: "process",
});

2
kinode/src/main.rs
View File

@ -106,7 +106,7 @@ async fn main() {
.get_one::<u16>("fakechain-port")
.cloned()
.unwrap_or(8545);
eth_provider_config.push(lib::eth::ProviderConfig {
eth_provider_config.insert(lib::eth::ProviderConfig {
chain_id: 31337,
trusted: true,
provider: lib::eth::NodeOrRpcUrl::RpcUrl(format!(