diff --git a/Cargo.lock b/Cargo.lock index 94ce7252..33b542f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -756,7 +756,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.6.0" -source = "git+https://github.com/uqbar-dao/process_lib.git?rev=7f409e4#7f409e4e4f72c277b5a2eddbeebe7e9719db33dc" +source = "git+https://github.com/kinode-dao/process_lib.git?rev=9d185e1#9d185e1e264c93af53d004ba32520fd5d046e7e5" dependencies = [ "anyhow", "bincode", @@ -1890,18 +1890,18 @@ checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-encoder" -version = "0.38.0" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b09bc5df933a3dabbdb72ae4b6b71be8ae07f58774d5aa41bd20adcd41a235a" +checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.13" +version = "0.10.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b4a14bbedb07737809c00843d1f2f88ba0b8950c114283e0387e30b1b6ee558" +checksum = "18ebaa7bd0f9e7a5e5dd29b9a998acf21c4abed74265524dd7e85934597bfb10" dependencies = [ "anyhow", "indexmap 2.1.0", @@ -1915,10 +1915,11 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.118.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbb91574de0011ded32b14db12777e7dd5e9ea2f9d7317a1ab51a9495c75924" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ + "bitflags 2.4.1", "indexmap 2.1.0", "semver", ] @@ -2051,8 +2052,8 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.16.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=efcc759#efcc7592cf3277bcb9be1034e48569c6d822b322" +version = "0.17.0" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=21a46c7#21a46c774532da99384f7a1877c1fcfb7a4c72d3" dependencies = [ "bitflags 2.4.1", "wit-bindgen-rust-macro", @@ -2060,8 +2061,8 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.16.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=efcc759#efcc7592cf3277bcb9be1034e48569c6d822b322" +version = "0.17.0" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=21a46c7#21a46c774532da99384f7a1877c1fcfb7a4c72d3" dependencies = [ "anyhow", "wit-component", @@ -2070,8 +2071,8 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" -version = "0.16.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=efcc759#efcc7592cf3277bcb9be1034e48569c6d822b322" +version = "0.17.0" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=21a46c7#21a46c774532da99384f7a1877c1fcfb7a4c72d3" dependencies = [ "anyhow", "heck", @@ -2082,8 +2083,8 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.16.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=efcc759#efcc7592cf3277bcb9be1034e48569c6d822b322" +version = "0.17.0" +source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=21a46c7#21a46c774532da99384f7a1877c1fcfb7a4c72d3" dependencies = [ "anyhow", "proc-macro2", @@ -2096,9 +2097,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.18.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a35a2a9992898c9d27f1664001860595a4bc99d32dd3599d547412e17d7e2" +checksum = "a4436190e87b4e539807bcdcf5b817e79d2e29e16bc5ddb6445413fe3d1f5716" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -2115,9 +2116,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15df6b7b28ce94b8be39d8df5cb21a08a4f3b9f33b631aedb4aa5776f785ead3" +checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", diff --git a/Cargo.toml b/Cargo.toml index ddff0721..89f86374 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ clap = { version = "4.4", features = ["cargo", "string"] } dirs = "5.0" futures-util = "0.3" hex = "0.4" -kinode_process_lib = { git = "https://github.com/uqbar-dao/process_lib.git", rev = "7f409e4" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "9d185e1" } nix = { version = "0.27", features = ["process", "signal", "term"] } regex = "1.0" reqwest = { version = "0.11", features = ["json"] } diff --git a/src/build/mod.rs b/src/build/mod.rs index c8647c59..8d7df4b7 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -13,6 +13,7 @@ const JAVASCRIPT_SRC_PATH: &str = "src/lib.js"; const PYTHON_SRC_PATH: &str = "src/lib.py"; const RUST_SRC_PATH: &str = "src/lib.rs"; const KINODE_WIT_URL: &str = "https://raw.githubusercontent.com/kinode-dao/kinode-wit/v0.7.0-alpha/kinode.wit"; +const WASI_VERSION: &str = "17.0.1"; // TODO: un-hardcode pub const CACHE_DIR: &str = "/tmp/kinode-kit-cache"; #[derive(Debug, Clone, Serialize, Deserialize)] @@ -175,10 +176,9 @@ async fn compile_rust_wasm_process( // Check and download wasi_snapshot_preview1.wasm if it does not exist let wasi_snapshot_file = process_dir.join("wasi_snapshot_preview1.wasm"); - let wasi_version = "15.0.1"; // TODO: un-hardcode let wasi_snapshot_url = format!( "https://github.com/bytecodealliance/wasmtime/releases/download/v{}/wasi_snapshot_preview1.reactor.wasm", - wasi_version, + WASI_VERSION, ); download_file(&wasi_snapshot_url, &wasi_snapshot_file).await?; diff --git a/src/setup/mod.rs b/src/setup/mod.rs index f47dacff..4c1ea37a 100644 --- a/src/setup/mod.rs +++ b/src/setup/mod.rs @@ -13,7 +13,7 @@ const REQUIRED_NPM_MAJOR: u32 = 9; const MINIMUM_NPM_MINOR: u32 = 0; pub const REQUIRED_PY_MAJOR: u32 = 3; pub const MINIMUM_PY_MINOR: u32 = 10; -pub const REQUIRED_PY_PACKAGE: &str = "componentize-py==0.7.1"; +pub const REQUIRED_PY_PACKAGE: &str = "componentize-py==0.11.0"; #[derive(Clone)] pub enum Dependency {