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

fix: go and find all the places that wit versions take effect, and line them up

Browse Source
This commit is contained in:
dr-frmr 2024-05-18 00:59:40 -06:00
parent 65d8fd2d10
commit e7a4f93376
No known key found for this signature in database
56 changed files with 133 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Cargo.lock generated
View File

@ -78,7 +78,7 @@ name = "alias"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -649,7 +649,7 @@ dependencies = [
"alloy-sol-types 0.7.0",
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rand 0.8.5",
"serde",
"serde_json",
@ -1160,7 +1160,7 @@ name = "cat"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -1223,7 +1223,7 @@ dependencies = [
"anyhow",
"base64 0.22.0",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"pleco",
"serde",
"serde_json",
@ -1935,7 +1935,7 @@ name = "download"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -1966,7 +1966,7 @@ name = "echo"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -2186,7 +2186,7 @@ version = "0.2.0"
dependencies = [
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rand 0.8.5",
"serde",
"serde_json",
@ -2346,7 +2346,7 @@ dependencies = [
name = "get_block"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -2546,7 +2546,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
name = "hi"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -2576,7 +2576,7 @@ version = "0.1.1"
dependencies = [
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -2887,7 +2887,7 @@ name = "install"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -3128,28 +3128,6 @@ dependencies = [
"lib",
]
[[package]]
name = "kinode_process_lib"
version = "0.7.1"
source = "git+https://github.com/kinode-dao/process_lib?tag=v0.7.2#61a8de975fd0a812a0a033ee0975fb83dd166224"
dependencies = [
"alloy-json-rpc 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=cad7935)",
"alloy-primitives 0.7.0",
"alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=cad7935)",
"alloy-transport 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=cad7935)",
"anyhow",
"bincode",
"http 1.1.0",
"mime_guess",
"rand 0.8.5",
"rmp-serde",
"serde",
"serde_json",
"thiserror",
"url",
"wit-bindgen",
]
[[package]]
name = "kinode_process_lib"
version = "0.8.0"
@ -3175,7 +3153,7 @@ dependencies = [
[[package]]
name = "kinode_process_lib"
version = "0.8.0"
source = "git+https://github.com/kinode-dao/process_lib?rev=900428d#900428d62e4920eb299dba05f5ce75aae35fa947"
source = "git+https://github.com/kinode-dao/process_lib?rev=dcb7709#dcb7709bb11d4e31f7e45d9b8e3ef51019daf16b"
dependencies = [
"alloy-json-rpc 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=cad7935)",
"alloy-primitives 0.7.0",
@ -3238,7 +3216,7 @@ dependencies = [
"anyhow",
"bincode",
"hex",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"serde_json",
@ -3439,7 +3417,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"regex",
"serde",
"serde_json",
@ -3571,7 +3549,7 @@ dependencies = [
name = "namehash_to_name"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"wit-bindgen",
@ -3599,7 +3577,7 @@ dependencies = [
name = "net_diagnostics"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"wit-bindgen",
@ -3892,7 +3870,7 @@ dependencies = [
name = "peer"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"wit-bindgen",
@ -3902,7 +3880,7 @@ dependencies = [
name = "peers"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"wit-bindgen",
@ -4911,7 +4889,7 @@ dependencies = [
"anyhow",
"base64 0.22.0",
"bincode",
"kinode_process_lib 0.7.1",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rmp-serde",
"serde",
"serde_json",
@ -5130,7 +5108,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
name = "state"
version = "0.1.0"
dependencies = [
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -5296,7 +5274,7 @@ version = "0.1.1"
dependencies = [
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"rand 0.8.5",
"regex",
"serde",
@ -5310,7 +5288,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"thiserror",
@ -5324,7 +5302,7 @@ dependencies = [
"anyhow",
"bincode",
"indexmap",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"thiserror",
@ -5567,7 +5545,7 @@ name = "top"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -5890,7 +5868,7 @@ name = "uninstall"
version = "0.1.0"
dependencies = [
"anyhow",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"wit-bindgen",
@ -6585,7 +6563,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bincode",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=900428d)",
"kinode_process_lib 0.8.0 (git+https://github.com/kinode-dao/process_lib?rev=dcb7709)",
"serde",
"serde_json",
"url",

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"
anyhow = "1.0"
bincode = "1.3.3"
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "900428d" }
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "dcb7709" }
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

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

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

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

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

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

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

9
kinode/packages/app_store/pkg/scripts.json
View File

@ -8,7 +8,8 @@
],
"grant_capabilities": [
"main:app_store:sys"
]
],
"wit_version": 0
},
"install.wasm": {
"root": false,
@ -19,7 +20,8 @@
],
"grant_capabilities": [
"main:app_store:sys"
]
],
"wit_version": 0
},
"uninstall.wasm": {
"root": false,
@ -30,6 +32,7 @@
],
"grant_capabilities": [
"main:app_store:sys"
]
],
"wit_version": 0
}
}

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

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

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

@ -28,5 +28,5 @@ interface chess {
world chess-sys-v0 {
import chess;
include process;
include process-v0;
}

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

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

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

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

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

@ -19,5 +19,5 @@ interface homepage {
world homepage-sys-v0 {
import homepage;
include process;
include process-v0;
}

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

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

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

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

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

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

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

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

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

@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
/// Fetching OS version from main package.. LMK if there's a better way...

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

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

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

@ -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", rev = "900428d" }
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "dcb7709" }
rmp-serde = "1.1.2"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

6
kinode/packages/kns_indexer/pkg/scripts.json
View File

@ -8,7 +8,8 @@
],
"grant_capabilities": [
"eth:distro:sys"
]
],
"wit_version": 0
},
"state.wasm": {
"root": false,
@ -19,6 +20,7 @@
],
"grant_capabilities": [
"kns_indexer:kns_indexer:sys"
]
],
"wit_version": 0
}
}

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

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

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

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

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

@ -10,7 +10,7 @@ simulation-mode = []
anyhow = "1.0"
base64 = "0.22.0"
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="dcb7709" }
rmp-serde = "1.2.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

2
kinode/packages/settings/settings/src/lib.rs
View File

@ -134,7 +134,7 @@ impl SettingsState {
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
call_init!(initialize);

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

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

2
kinode/packages/terminal/alias/src/lib.rs
View File

@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
#[derive(Debug, Serialize, Deserialize)]

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

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

2
kinode/packages/terminal/cat/src/lib.rs
View File

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

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

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

2
kinode/packages/terminal/echo/src/lib.rs
View File

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

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

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

2
kinode/packages/terminal/hi/src/lib.rs
View File

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

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

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

2
kinode/packages/terminal/m/src/lib.rs
View File

@ -6,7 +6,7 @@ use regex::Regex;
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
call_init!(init);

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

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

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

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

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

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

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

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

2
kinode/packages/terminal/net_diagnostics/src/lib.rs
View File

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

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

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

2
kinode/packages/terminal/peer/src/lib.rs
View File

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

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

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

2
kinode/packages/terminal/peers/src/lib.rs
View File

@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
// types copied from runtime networking core

30
kinode/packages/terminal/pkg/scripts.json
View File

@ -6,14 +6,16 @@
"request_capabilities": [
"terminal:terminal:sys"
],
"grant_capabilities": []
"grant_capabilities": [],
"wit_version": 0
},
"echo.wasm": {
"root": false,
"public": false,
"request_networking": false,
"request_capabilities": [],
"grant_capabilities": []
"grant_capabilities": [],
"wit_version": 0
},
"cat.wasm": {
"root": false,
@ -28,7 +30,8 @@
}
}
],
"grant_capabilities": []
"grant_capabilities": [],
"wit_version": 0
},
"hi.wasm": {
"root": false,
@ -39,12 +42,14 @@
],
"grant_capabilities": [
"net:distro:sys"
]
],
"wit_version": 0
},
"m.wasm": {
"root": true,
"public": true,
"request_networking": true
"request_networking": true,
"wit_version": 0
},
"namehash_to_name.wasm": {
"root": false,
@ -55,7 +60,8 @@
],
"grant_capabilities": [
"net:distro:sys"
]
],
"wit_version": 0
},
"net_diagnostics.wasm": {
"root": false,
@ -66,7 +72,8 @@
],
"grant_capabilities": [
"net:distro:sys"
]
],
"wit_version": 0
},
"peer.wasm": {
"root": false,
@ -77,7 +84,8 @@
],
"grant_capabilities": [
"net:distro:sys"
]
],
"wit_version": 0
},
"peers.wasm": {
"root": false,
@ -88,7 +96,8 @@
],
"grant_capabilities": [
"net:distro:sys"
]
],
"wit_version": 0
},
"top.wasm": {
"root": false,
@ -97,6 +106,7 @@
"request_capabilities": [
"kernel:distro:sys"
],
"grant_capabilities": []
"grant_capabilities": [],
"wit_version": 0
}
}

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

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

6
kinode/packages/terminal/terminal/src/lib.rs
View File

@ -10,7 +10,7 @@ use std::collections::{HashMap, HashSet};
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
#[derive(Debug, Serialize, Deserialize)]
@ -152,7 +152,7 @@ fn handle_run(our: &Address, process: &ProcessId, args: String) -> anyhow::Resul
return Err(anyhow::anyhow!("script not in scripts.json file"));
};
let wasm_path = if wasm_path.starts_with("/") {
wasm_path.clone()
wasm_path
} else {
format!("/{}", wasm_path)
};
@ -231,7 +231,7 @@ fn handle_run(our: &Address, process: &ProcessId, args: String) -> anyhow::Resul
.body(serde_json::to_vec(&kt::KernelCommand::InitializeProcess {
id: parsed_new_process_id.clone(),
wasm_bytes_handle: wasm_path.clone(),
wit_version: None, // update this with new versions if desired
wit_version: entry.wit_version,
on_exit: kt::OnExit::None,
initial_capabilities: HashSet::new(),
public: entry.public,

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

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

2
kinode/packages/terminal/top/src/lib.rs
View File

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

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

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

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

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

2
kinode/packages/tester/test_runner/src/lib.rs
View File

@ -11,7 +11,7 @@ use tester_types as tt;
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
fn make_vfs_address(our: &Address) -> anyhow::Result<Address> {

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

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

2
kinode/packages/tester/tester/src/lib.rs
View File

@ -11,7 +11,7 @@ use tester_types as tt;
wit_bindgen::generate!({
path: "target/wit",
world: "process",
world: "process-v0",
});
type Messages = IndexMap<kt::Message, tt::KernelMessage>;

21
kinode/src/main.rs
View File

@ -77,14 +77,19 @@ async fn main() {
);
// default eth providers/routers
let mut eth_provider_config: lib::eth::SavedConfigs =
match tokio::fs::read_to_string(format!("{}/.eth_providers", home_directory_path)).await {
Ok(contents) => {
println!("loaded saved eth providers\r");
serde_json::from_str(&contents).unwrap()
}
Err(_) => serde_json::from_str(DEFAULT_ETH_PROVIDERS).unwrap(),
};
let mut eth_provider_config: lib::eth::SavedConfigs = if let Ok(contents) =
tokio::fs::read_to_string(format!("{}/.eth_providers", home_directory_path)).await
{
if let Ok(contents) = serde_json::from_str(&contents) {
println!("loaded saved eth providers\r");
contents
} else {
println!("error loading saved eth providers, using default providers\r");
serde_json::from_str(DEFAULT_ETH_PROVIDERS).unwrap()
}
} else {
serde_json::from_str(DEFAULT_ETH_PROVIDERS).unwrap()
};
if let Some(rpc) = rpc {
eth_provider_config.insert(lib::eth::ProviderConfig {
chain_id: CHAIN_ID,

4
kinode/src/net/ws/mod.rs
View File

@ -981,7 +981,7 @@ async fn handle_local_message(
Identity {
name: log.name.clone(),
networking_key: log.public_key.clone(),
routing: if log.ips[0] == *"0.0.0.0" {
routing: if log.ips.is_empty() {
NodeRouting::Routers(log.routers)
} else {
NodeRouting::Direct {
@ -1002,7 +1002,7 @@ async fn handle_local_message(
Identity {
name: log.name.clone(),
networking_key: log.public_key.clone(),
routing: if log.ips[0] == *"0.0.0.0" {
routing: if log.ips.is_empty() {
NodeRouting::Routers(log.routers)
} else {
NodeRouting::Direct {

5
kinode/src/state.rs
View File

@ -589,6 +589,7 @@ async fn bootstrap(
std::collections::hash_map::Entry::Occupied(p) => {
let p = p.into_mut();
p.wasm_bytes_handle = wasm_bytes_handle.clone();
p.wit_version = package_metadata.properties.wit_version;
p.on_exit = entry.on_exit;
p.capabilities.extend(requested_caps);
p.public = public_process;
@ -717,8 +718,6 @@ async fn get_zipped_packages() -> Vec<(
Erc721Metadata,
zip::ZipArchive<std::io::Cursor<&'static [u8]>>,
)> {
// println!("fs: reading distro packages...\r");
let mut packages = Vec::new();
for (package_name, metadata_bytes, bytes) in BOOTSTRAPPED_PROCESSES.iter() {
@ -727,7 +726,7 @@ async fn get_zipped_packages() -> Vec<(
packages.push((metadata, zip));
} else {
println!(
"fs: metadata for package {} is not valid Erc721Metadata",
"fs: metadata for package {} is not valid Erc721Metadata\r",
package_name
);
}

5
lib/src/core.rs
View File

@ -1849,6 +1849,9 @@ pub struct KnsUpdate {
impl KnsUpdate {
pub fn get_protocol_port(&self, protocol: &str) -> u16 {
self.ports.get(protocol).cloned().unwrap_or(0)
match self.ports.get(protocol) {
Some(port) => *port,
None => 0,
}
}
}