From a42c63641092663fd41e1bb240d31e79f430c064 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 12 Feb 2024 20:51:02 -0800 Subject: [PATCH 1/3] bump wasm deps --- Cargo.lock | 286 ++++++++---------- kinode/Cargo.toml | 10 +- kinode/build.rs | 132 ++++---- .../packages/app_store/app_store/Cargo.toml | 4 +- kinode/packages/app_store/download/Cargo.toml | 4 +- .../packages/app_store/ft_worker/Cargo.toml | 4 +- kinode/packages/app_store/install/Cargo.toml | 4 +- .../packages/app_store/uninstall/Cargo.toml | 4 +- kinode/packages/chess/chess/Cargo.toml | 4 +- kinode/packages/homepage/homepage/Cargo.toml | 4 +- .../kns_indexer/kns_indexer/Cargo.toml | 4 +- kinode/packages/terminal/alias/Cargo.toml | 4 +- kinode/packages/terminal/cat/Cargo.toml | 4 +- kinode/packages/terminal/echo/Cargo.toml | 4 +- kinode/packages/terminal/hi/Cargo.toml | 4 +- kinode/packages/terminal/m/Cargo.toml | 4 +- kinode/packages/terminal/terminal/Cargo.toml | 4 +- kinode/packages/terminal/top/Cargo.toml | 4 +- kinode/packages/tester/test_runner/Cargo.toml | 4 +- kinode/packages/tester/tester/Cargo.toml | 4 +- kinode/src/kernel/process.rs | 3 +- kinode/wasi_snapshot_preview1.wasm | Bin 97017 -> 96761 bytes lib/Cargo.toml | 2 +- 23 files changed, 233 insertions(+), 268 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7285c74a..df8a83cbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ name = "alias" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -272,7 +272,7 @@ dependencies = [ "alloy-sol-types", "anyhow", "bincode", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "rand 0.8.5", "serde", "serde_json", @@ -809,7 +809,7 @@ name = "cat" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -871,7 +871,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "bincode", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "pleco", "serde", "serde_json", @@ -1096,18 +1096,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7e56668d2263f92b691cb9e4a2fcb186ca0384941fe420484322fa559c3329" +checksum = "7e7c0d51205b863591dd1e7aaa0fb69c2ea7bed48ffa63d6c4a848b07a35a732" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9ff61938bf11615f55b80361288c68865318025632ea73c65c0b44fa16283c" +checksum = "9ffb467cbc25543e4c20d2ad669bf8275598047b03c89652ad5fe2a0f47fc0e1" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1126,33 +1126,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50656bf19e3d4a153b404ff835b8b59e924cfa3682ebe0d3df408994f37983f6" +checksum = "bc7e74aed5c2b91e38d090653506afbd2cd3be1ff70593e2aa6bb82b3c6b77ff" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388041deeb26109f1ea73c1812ea26bfd406c94cbce0bb5230aa44277e43b209" +checksum = "9ff2dd24cce0775566da85770cb48aa58fef901cf2bff30275b42e7dbe62cbd5" [[package]] name = "cranelift-control" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39b7c512ffac527e5b5df9beae3d67ab85d07dca6d88942c16195439fedd1d3" +checksum = "e8bcf4d5c73bbca309edf3af2839b5218e5c74cfbf22b0ac492af8a1d11120d9" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb25f573701284fe2bcf88209d405342125df00764b396c923e11eafc94d892" +checksum = "286754159b1a685475d6a0b4710832f950d6f4846a817002e2c23ff001321a65" dependencies = [ "serde", "serde_derive", @@ -1160,9 +1160,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57374fd11d72cf9ffb85ff64506ed831440818318f58d09f45b4185e5e9c376" +checksum = "67150a1fef9857caba710f8c0c8223d640f02c0e5d1ebbfc75ed62912599cb6b" dependencies = [ "cranelift-codegen", "log", @@ -1172,15 +1172,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae769b235f6ea2f86623a3ff157cc04a4ff131dc9fe782c2ebd35f272043581e" +checksum = "eb7ceea70d3e0d7f69df7657f99de902e32016731c5a8d2788c1df0215f00952" [[package]] name = "cranelift-native" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc7bfb8f13a0526fe20db338711d9354729b861c336978380bb10f7f17dd207" +checksum = "707e5d9384ce4fa3c40af1abf4c3ec49857745cced5187593385f4a2c0b95445" dependencies = [ "cranelift-codegen", "libc", @@ -1189,9 +1189,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f41a4af931b756be05af0dd374ce200aae2d52cea16b0beb07e8b52732c35" +checksum = "d4d957e3ff2a14c2f974a66c22bfcedcd2bd0272af8dce4236869c3942f5a471" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1199,7 +1199,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-types", ] @@ -1611,7 +1611,7 @@ name = "download" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -1642,7 +1642,7 @@ name = "echo" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -2214,7 +2214,7 @@ version = "0.2.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "rand 0.8.5", "serde", "serde_json", @@ -2571,7 +2571,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" name = "hi" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -2610,7 +2610,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -2885,7 +2885,7 @@ name = "install" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -3139,6 +3139,7 @@ dependencies = [ "open", "public-ip", "rand 0.8.5", + "rayon", "reqwest", "ring 0.16.20", "rmp-serde", @@ -3173,8 +3174,8 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.5.9" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha#5e705086bbd10fde89e11d3e3671f6a618a875a7" +version = "0.6.0" +source = "git+https://github.com/kinode-dao/process_lib?rev=12bf9ee#12bf9eefeb9237db5e5165647fa91b437b05e169" dependencies = [ "alloy-rpc-types", "anyhow", @@ -3190,27 +3191,10 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "kinode_process_lib" -version = "0.5.9" -source = "git+https://github.com/uqbar-dao/process_lib.git?tag=v0.5.9-alpha#5e705086bbd10fde89e11d3e3671f6a618a875a7" -dependencies = [ - "anyhow", - "bincode", - "http 1.0.0", - "mime_guess", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "url", - "wit-bindgen", -] - [[package]] name = "kinode_process_lib" version = "0.6.0" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.6.0-alpha#4c49368e1945c041dfcabbe15734322012239d25" +source = "git+https://github.com/uqbar-dao/process_lib.git?rev=12bf9ee#12bf9eefeb9237db5e5165647fa91b437b05e169" dependencies = [ "anyhow", "bincode", @@ -3227,7 +3211,7 @@ dependencies = [ [[package]] name = "kit" version = "0.1.0" -source = "git+https://github.com/kinode-dao/kit?rev=0c43430#0c434306fdce55e11d3309959fc4a0fe6ae28def" +source = "git+https://github.com/kinode-dao/kit?rev=665025c#665025c06f495a826e8a4e0a23e3dce59dcb1832" dependencies = [ "anyhow", "base64 0.21.7", @@ -3236,7 +3220,7 @@ dependencies = [ "futures-util", "git2", "hex", - "kinode_process_lib 0.5.9 (git+https://github.com/uqbar-dao/process_lib.git?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/uqbar-dao/process_lib.git?rev=12bf9ee)", "nix", "regex", "reqwest", @@ -3262,7 +3246,7 @@ dependencies = [ "anyhow", "bincode", "hex", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "rmp-serde", "serde", "serde_json", @@ -3471,7 +3455,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "regex", "serde", "serde_json", @@ -5553,7 +5537,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.6.0", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "rand 0.8.5", "regex", "serde", @@ -5567,7 +5551,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "thiserror", @@ -5581,7 +5565,7 @@ dependencies = [ "anyhow", "bincode", "indexmap 2.2.2", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "thiserror", @@ -5822,7 +5806,7 @@ name = "top" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -6032,7 +6016,7 @@ name = "uninstall" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=12bf9ee)", "serde", "serde_json", "wit-bindgen", @@ -6200,9 +6184,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4328de5cf2a0debfc48216fe9c2747badc64957837641f5836cd8b3d48d73f0" +checksum = "025e842ba390587e523785ff58bd54fbbf1781b8d3072bc9aba4dc0b809f69da" dependencies = [ "anyhow", "async-trait", @@ -6218,14 +6202,14 @@ dependencies = [ "system-interface", "tracing", "wasi-common", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-common" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f6774ec9e464b7373f683bc57ff87fcca5fd26a7d6bdb7438fb2f56a545aa6" +checksum = "da4d4023cc65b3615590d38db0afb79234de09b3bb89cb0d8f83bdee9f5c28a8" dependencies = [ "anyhow", "bitflags 2.4.2", @@ -6238,7 +6222,7 @@ dependencies = [ "tracing", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6307,15 +6291,6 @@ version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" -[[package]] -name = "wasm-encoder" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822b645bf4f2446b949776ffca47e2af60b167209ffb70814ef8779d299cd421" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.38.1" @@ -6350,16 +6325,6 @@ dependencies = [ "wasmparser 0.121.0", ] -[[package]] -name = "wasmparser" -version = "0.116.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" -dependencies = [ - "indexmap 2.2.2", - "semver 1.0.21", -] - [[package]] name = "wasmparser" version = "0.118.1" @@ -6393,9 +6358,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642e12d108e800215263e3b95972977f473957923103029d7d617db701d67ba4" +checksum = "8acb6aa966be38f613954c3debe7ba6c7a02ffd0537432be438da0b038955cdf" dependencies = [ "anyhow", "async-trait", @@ -6410,14 +6375,13 @@ dependencies = [ "object", "once_cell", "paste", - "psm", "rayon", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -6428,23 +6392,23 @@ dependencies = [ "wasmtime-runtime", "wasmtime-winch", "wat", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beada8bb15df52503de0a4c58de4357bfd2f96d9a44a6e547bad11efdd988b47" +checksum = "c1495ef4d46aec14f967b672e946e391dd8a14a443cda3d5e0779ff67fb6e28d" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba5bf44d044d25892c03fb3534373936ee204141ff92bac8297787ac7f22318" +checksum = "e2de1b065bdbaca3df9e7e9f70eb129e326a99d971b16d666acd798d98d47635" dependencies = [ "anyhow", "base64 0.21.7", @@ -6456,15 +6420,15 @@ dependencies = [ "serde_derive", "sha2", "toml 0.5.11", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ccba556991465cca68d5a54769684bcf489fb532059da55105f851642d52c1" +checksum = "2f19bcff82f81ba0273c0b68f3909977b0dd54489bc86c630d8aad43dca92f3f" dependencies = [ "anyhow", "proc-macro2", @@ -6477,15 +6441,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05492a177a6006cb73f034d6e9a6fad6da55b23c4398835cb0012b5fa51ecf67" +checksum = "8af072b7ad5ac5583e1f9e4737ebf88923de564fb5d4ace0ca9b4b720bdf95a1" [[package]] name = "wasmtime-cranelift" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2e7532f1d6adbcc57e69bb6a7c503f0859076d07a9b4b6aabe8021ff8a05fd" +checksum = "df08a8bd9a68732577bee05ac685e4c247238b5e79ad9c062e2dfb4d04dca132" dependencies = [ "anyhow", "cfg-if", @@ -6500,7 +6464,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -6508,9 +6472,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c98d5378a856cbf058d36278627dfabf0ed68a888142958c7ae8e6af507dafa" +checksum = "404201c9e669083f189f01337b3ed0aa0eb081157fb4e170bbfe193df9497771" dependencies = [ "anyhow", "cranelift-codegen", @@ -6524,9 +6488,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d33a9f421da810a070cd56add9bc51f852bd66afbb8b920489d6242f15b70e" +checksum = "7e696b4911c9a69c3c2892ec05eb41bb15436d1a46d8830a755c40f5df47546a" dependencies = [ "anyhow", "cranelift-entity", @@ -6538,8 +6502,8 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -6547,9 +6511,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404741f4c6d7f4e043be2e8b466406a2aee289ccdba22bf9eba6399921121b97" +checksum = "4a39681c1f6f54d1bf7efe5dc829f8d7fc0e2ca12c346fd7a3efbf726e9681d2" dependencies = [ "anyhow", "cc", @@ -6557,14 +6521,14 @@ dependencies = [ "rustix", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0994a86d6dca5f7d9740d7f2bd0568be06d2014a550361dc1c397d289d81ef" +checksum = "2c56519882d936c680bd191d58ac04cff071a470eca2dcc664adcd60f986a731" dependencies = [ "addr2line", "anyhow", @@ -6584,14 +6548,14 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-debug" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0c4b74e606d1462d648631d5bc328e3d5b14e7f9d3ff93bc6db062fb8c5cd8" +checksum = "babc65e64ab0dd4e1ce65624db64e24ed0fbdebb16148729173fa0da9f70e53c" dependencies = [ "object", "once_cell", @@ -6601,20 +6565,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3090a69ba1476979e090aa7ed4bc759178bafdb65b22f98b9ba24fc6e7e578d5" +checksum = "d7ec5b11c12d9acb09612e7ce04c4c8aea3e8dc79b2591ffdead986a5ce8ec49" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b993ac8380385ed67bf71b51b9553edcf1ab0801b78a805a067de581b9a3e88a" +checksum = "28e1c31bbdf67cb86f149bcead5193749f23f77c93c5244ec9ac8d192f90966c" dependencies = [ "anyhow", "cc", @@ -6627,37 +6591,37 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand 0.8.5", + "psm", "rustix", "sptr", - "wasm-encoder 0.36.2", + "wasm-encoder 0.38.1", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-types" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5778112fcab2dc3d4371f4203ab8facf0c453dd94312b0a88dd662955e64e0" +checksum = "52e799cff634d30fd042db96b417d515e54f903b95f8c1e0ec60e8f604479485" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50f51f8d79bfd2aa8e9d9a0ae7c2d02b45fe412e62ff1b87c0c81b07c738231" +checksum = "e10fe166d4e4c95d5d80c5b47e1e12256af2099ac525ddb9a19b1aeb8896e5e1" dependencies = [ "proc-macro2", "quote", @@ -6666,9 +6630,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff3f4ad191a5e6d002bb5bffa3e2931a58984da9b30e57b48f353848748cf80" +checksum = "494f99111a165dcddc69aaa5fa23604f49dcfab479a869edd84581abd6ac569b" dependencies = [ "anyhow", "async-trait", @@ -6696,21 +6660,21 @@ dependencies = [ "wasi-common", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-winch" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d638e7c72447253485fe131523e7465ca318c0455c826eb4f5f612fb67b7de90" +checksum = "d3f5d76d399cb4423e6f178bc154a0e1c314711e28dabaa6e757e56628a083ec" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -6718,9 +6682,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" +checksum = "6bb3bc92c031cf4961135bffe055a69c1bd67c253dca20631478189bb05ec27b" dependencies = [ "anyhow", "heck", @@ -6730,9 +6694,9 @@ dependencies = [ [[package]] name = "wasmtime-wmemcheck" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6060bc082cc32d9a45587c7640e29e3c7b89ada82677ac25d87850aaccb368" +checksum = "5da08ab734954e16f57be38423b90c25a0b13420e51cbd0a2e37b86a468a988c" [[package]] name = "wast" @@ -6783,9 +6747,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "wiggle" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91028b241e692fdf30627ac10ba9d5ac378353ea4119b4f904ac95177057a44" +checksum = "cd5b200b5dd3d5d7cc4093166f4f916d2d2839296cf1b1757b9726635f6425c3" dependencies = [ "anyhow", "async-trait", @@ -6798,9 +6762,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e8b3d76531994513671b2ec3b29fd342bf041e2282945bb6c52eebe6aa9e7da" +checksum = "a4dc34a2bc1091599de005e9b854cd1a9ea35b16ca51cac2797274c1a2666e06" dependencies = [ "anyhow", "heck", @@ -6813,9 +6777,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "15.0.1" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c189fe00c67f61bb330827f2abab1af9b5925c7929535cd13a68d265ec20b02d" +checksum = "37ba3b37f402a7513b9ed7973a6e907074987b3afdcede98d3d79939b3e76f1b" dependencies = [ "proc-macro2", "quote", @@ -6856,9 +6820,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.13.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c792487f4dc42733d182a72e75d718b1a563cedcc1599ff0a9ed683c33e8bb7" +checksum = "8d921185084e134e897e0e202e129a422306d0f1391954ecf4928d36defa897d" dependencies = [ "anyhow", "cranelift-codegen", @@ -6866,7 +6830,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-environ", ] @@ -7042,8 +7006,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.2", "wit-bindgen-rust-macro", @@ -7051,8 +7015,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", @@ -7061,8 +7025,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", @@ -7073,8 +7037,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", @@ -7087,9 +7051,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.18.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a35a2a9992898c9d27f1664001860595a4bc99d32dd3599d547412e17d7e2" +checksum = "331de496d439010797c17637d8002712b9b69110f1669164c09dfa226ad277bb" dependencies = [ "anyhow", "bitflags 2.4.2", @@ -7098,9 +7062,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.38.1", + "wasm-encoder 0.41.0", "wasm-metadata", - "wasmparser 0.118.1", + "wasmparser 0.121.0", "wit-parser", ] diff --git a/kinode/Cargo.toml b/kinode/Cargo.toml index 7da207a90..dedc20fe6 100644 --- a/kinode/Cargo.toml +++ b/kinode/Cargo.toml @@ -14,10 +14,10 @@ path = "src/main.rs" [build-dependencies] anyhow = "1.0.71" -kit = { git = "https://github.com/kinode-dao/kit", rev = "0c43430" } -reqwest = { version = "0.11.22", features = ["blocking"] } +kit = { git = "https://github.com/kinode-dao/kit", rev = "665025c" } +rayon = "1.8.1" sha2 = "0.10" -tokio = { version = "1.28", features = ["macros"] } +tokio = "1.28" walkdir = "2.4" zip = "0.6" @@ -79,6 +79,6 @@ tokio-tungstenite = "0.20.1" url = "2.4.1" uuid = { version = "1.1.2", features = ["serde", "v4"] } warp = "0.3.5" -wasmtime = "15.0.1" -wasmtime-wasi = "15.0.1" +wasmtime = "17.0.1" +wasmtime-wasi = "17.0.1" zip = "0.6" diff --git a/kinode/build.rs b/kinode/build.rs index 0a051b6f2..a4b561eb4 100644 --- a/kinode/build.rs +++ b/kinode/build.rs @@ -1,90 +1,90 @@ +use rayon::prelude::*; use std::{ - fs, + fs::{self, File}, io::{Cursor, Read, Write}, + path::{Path, PathBuf}, }; +use zip::write::FileOptions; -#[tokio::main] -async fn main() -> anyhow::Result<()> { - if std::env::var("SKIP_BUILD_SCRIPT").is_ok() { - println!("Skipping build script"); - return Ok(()); - } - - let pwd = std::env::current_dir().unwrap(); - let parent_dir = pwd.parent().unwrap(); - - // Build wasm32-wasi apps, zip, and add to bootstrapped_processes.rs - let mut bootstrapped_processes = Vec::new(); - writeln!( - bootstrapped_processes, - "pub static BOOTSTRAPPED_PROCESSES: &[(&str, &[u8])] = &[", - ) - .unwrap(); - let packages_dir = format!("{}/packages", pwd.display()); - eprintln!("{packages_dir:?}"); - for entry in std::fs::read_dir(packages_dir).unwrap() { - let entry_path = entry.unwrap().path(); - let parent_pkg_path = format!("{}/pkg", entry_path.display()); - +// This function is assumed to be synchronous. Adjust as needed. +// Make sure it can be called in parallel without causing issues. +fn build_and_zip_package(entry_path: PathBuf, parent_pkg_path: &str) -> anyhow::Result<(String, Vec)> { + let rt = tokio::runtime::Runtime::new().unwrap(); + rt.block_on(async { kit::build::execute(&entry_path, false, false, false, true).await?; - // After processing all sub-apps, zip the parent's pkg/ directory let mut writer = Cursor::new(Vec::new()); + let options = FileOptions::default() + .compression_method(zip::CompressionMethod::Stored) + .unix_permissions(0o755); { - let options = zip::write::FileOptions::default() - .compression_method(zip::CompressionMethod::Stored) - .unix_permissions(0o755); let mut zip = zip::ZipWriter::new(&mut writer); - for sub_entry in walkdir::WalkDir::new(&parent_pkg_path) { - let sub_entry = sub_entry.unwrap(); + + for sub_entry in walkdir::WalkDir::new(parent_pkg_path) { + let sub_entry = sub_entry?; let path = sub_entry.path(); - let name = path - .strip_prefix(std::path::Path::new(&parent_pkg_path)) - .unwrap(); + let name = path.strip_prefix(Path::new(parent_pkg_path))?; - // Write a directory or file to the ZIP archive if path.is_file() { - zip.start_file(name.to_string_lossy().into_owned(), options) - .unwrap(); - let mut file = std::fs::File::open(path).unwrap(); + zip.start_file(name.to_string_lossy(), options)?; + let mut file = File::open(path)?; let mut buffer = Vec::new(); - file.read_to_end(&mut buffer).unwrap(); - zip.write_all(&buffer).unwrap(); + file.read_to_end(&mut buffer)?; + zip.write_all(&buffer)?; } else if !name.as_os_str().is_empty() { - zip.add_directory(name.to_string_lossy().into_owned(), options) - .unwrap(); + zip.add_directory(name.to_string_lossy(), options)?; } } - zip.finish().unwrap(); + zip.finish()?; } + let zip_contents = writer.into_inner(); - let zip_filename = format!("{}.zip", entry_path.file_name().unwrap().to_str().unwrap(),); - let zip_path = format!("{}/target/{}", parent_dir.display(), zip_filename); - if !std::path::Path::new(&zip_path).exists() { - fs::write(&zip_path, zip_contents)?; - } else { - let existing_zip_contents = fs::read(&zip_path)?; - if zip_contents != existing_zip_contents { - fs::write(&zip_path, zip_contents)?; - } - } + let zip_filename = format!("{}.zip", entry_path.file_name().unwrap().to_str().unwrap()); + Ok((zip_filename, zip_contents)) + }) +} - // Add zip bytes to bootstrapped_processes.rs - writeln!( - bootstrapped_processes, - " (\"{}\", include_bytes!(\"{}\")),", - zip_filename, zip_path, - ) - .unwrap(); - } - writeln!(bootstrapped_processes, "];").unwrap(); - let bootstrapped_processes_path = pwd.join("src/bootstrapped_processes.rs"); - if bootstrapped_processes_path.exists() { - let existing_bootstrapped_processes = fs::read(&bootstrapped_processes_path)?; - if bootstrapped_processes == existing_bootstrapped_processes { - return Ok(()); +fn main() -> anyhow::Result<()> { + let pwd = std::env::current_dir()?; + let parent_dir = pwd.parent().unwrap(); + let packages_dir = pwd.join("packages"); + + let entries: Vec<_> = fs::read_dir(packages_dir)? + .map(|entry| entry.unwrap().path()) + .collect(); + + let results: Vec)>> = entries.par_iter() + .map(|entry_path| { + let parent_pkg_path = entry_path.join("pkg"); + build_and_zip_package(entry_path.clone(), parent_pkg_path.to_str().unwrap()) + }) + .collect(); + + // Process results, e.g., write to `bootstrapped_processes.rs` + // This part remains sequential + let mut bootstrapped_processes = vec![]; + writeln!(bootstrapped_processes, "pub static BOOTSTRAPPED_PROCESSES: &[(&str, &[u8])] = &[")?; + + for result in results { + match result { + Ok((zip_filename, zip_contents)) => { + // Further processing, like saving ZIP files and updating bootstrapped_processes + let zip_path = format!("{}/target/{}", parent_dir.display(), zip_filename); + fs::write(&zip_path, &zip_contents)?; + + writeln!( + bootstrapped_processes, + " (\"{}\", include_bytes!(\"{}\")),", + zip_filename, zip_path, + )?; + }, + Err(e) => return Err(e), } } + + writeln!(bootstrapped_processes, "];")?; + let bootstrapped_processes_path = pwd.join("src/bootstrapped_processes.rs"); fs::write(&bootstrapped_processes_path, bootstrapped_processes)?; + Ok(()) } diff --git a/kinode/packages/app_store/app_store/Cargo.toml b/kinode/packages/app_store/app_store/Cargo.toml index f8e18d155..da1e1a3a0 100644 --- a/kinode/packages/app_store/app_store/Cargo.toml +++ b/kinode/packages/app_store/app_store/Cargo.toml @@ -10,7 +10,7 @@ alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "3b1c31 alloy-sol-types = "0.5.1" anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha", features = ["eth"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee", features = ["eth"] } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" @@ -18,7 +18,7 @@ sha2 = "0.10.8" sha3 = "0.10.8" url = "2.4.1" urlencoding = "2.1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } zip = { version = "0.6.6", default-features = false } [lib] diff --git a/kinode/packages/app_store/download/Cargo.toml b/kinode/packages/app_store/download/Cargo.toml index 0c0b563b5..07bb716df 100644 --- a/kinode/packages/app_store/download/Cargo.toml +++ b/kinode/packages/app_store/download/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/app_store/ft_worker/Cargo.toml b/kinode/packages/app_store/ft_worker/Cargo.toml index ace5763d1..3171678b8 100644 --- a/kinode/packages/app_store/ft_worker/Cargo.toml +++ b/kinode/packages/app_store/ft_worker/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/app_store/install/Cargo.toml b/kinode/packages/app_store/install/Cargo.toml index 40642155f..28f5e6e15 100644 --- a/kinode/packages/app_store/install/Cargo.toml +++ b/kinode/packages/app_store/install/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/app_store/uninstall/Cargo.toml b/kinode/packages/app_store/uninstall/Cargo.toml index e54c0b660..020dc4917 100644 --- a/kinode/packages/app_store/uninstall/Cargo.toml +++ b/kinode/packages/app_store/uninstall/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/chess/chess/Cargo.toml b/kinode/packages/chess/chess/Cargo.toml index 23f172a89..7150a9706 100644 --- a/kinode/packages/chess/chess/Cargo.toml +++ b/kinode/packages/chess/chess/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" anyhow = "1.0" base64 = "0.13" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } pleco = "0.5" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" url = "*" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/homepage/homepage/Cargo.toml b/kinode/packages/homepage/homepage/Cargo.toml index d402e6f87..bb9a8e409 100644 --- a/kinode/packages/homepage/homepage/Cargo.toml +++ b/kinode/packages/homepage/homepage/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/kns_indexer/kns_indexer/Cargo.toml b/kinode/packages/kns_indexer/kns_indexer/Cargo.toml index 24a7e1197..cdc18ed3e 100644 --- a/kinode/packages/kns_indexer/kns_indexer/Cargo.toml +++ b/kinode/packages/kns_indexer/kns_indexer/Cargo.toml @@ -11,11 +11,11 @@ alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "3b1c31 alloy-sol-types = "0.5.1" bincode = "1.3.3" hex = "0.4.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha", features = ["eth"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee", features = ["eth"] } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/alias/Cargo.toml b/kinode/packages/terminal/alias/Cargo.toml index 07ecbf3a9..7213f3e2a 100644 --- a/kinode/packages/terminal/alias/Cargo.toml +++ b/kinode/packages/terminal/alias/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/cat/Cargo.toml b/kinode/packages/terminal/cat/Cargo.toml index 6a2ba7f52..f52ebb846 100644 --- a/kinode/packages/terminal/cat/Cargo.toml +++ b/kinode/packages/terminal/cat/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/echo/Cargo.toml b/kinode/packages/terminal/echo/Cargo.toml index 9695d17c9..79c526172 100644 --- a/kinode/packages/terminal/echo/Cargo.toml +++ b/kinode/packages/terminal/echo/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/hi/Cargo.toml b/kinode/packages/terminal/hi/Cargo.toml index a683aa047..2fcb9145b 100644 --- a/kinode/packages/terminal/hi/Cargo.toml +++ b/kinode/packages/terminal/hi/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/m/Cargo.toml b/kinode/packages/terminal/m/Cargo.toml index adda2ca05..a0f3080a8 100644 --- a/kinode/packages/terminal/m/Cargo.toml +++ b/kinode/packages/terminal/m/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] anyhow = "1.0" clap = "4.4.18" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } regex = "1.10.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/terminal/Cargo.toml b/kinode/packages/terminal/terminal/Cargo.toml index 43871bdd3..1980a8004 100644 --- a/kinode/packages/terminal/terminal/Cargo.toml +++ b/kinode/packages/terminal/terminal/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.6.0-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } rand = "0.8" regex = "1.10.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/terminal/top/Cargo.toml b/kinode/packages/terminal/top/Cargo.toml index 53ed72368..ccf37c9b8 100644 --- a/kinode/packages/terminal/top/Cargo.toml +++ b/kinode/packages/terminal/top/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/tester/test_runner/Cargo.toml b/kinode/packages/tester/test_runner/Cargo.toml index 95b65d88e..13af06401 100644 --- a/kinode/packages/tester/test_runner/Cargo.toml +++ b/kinode/packages/tester/test_runner/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/packages/tester/tester/Cargo.toml b/kinode/packages/tester/tester/Cargo.toml index 35efeef3b..49e2095ee 100644 --- a/kinode/packages/tester/tester/Cargo.toml +++ b/kinode/packages/tester/tester/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" anyhow = "1.0" bincode = "1.3.3" indexmap = "2.1" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.5.9-alpha" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "12bf9ee" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "efcc759" } +wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" } [lib] crate-type = ["cdylib"] diff --git a/kinode/src/kernel/process.rs b/kinode/src/kernel/process.rs index 4759e2999..b15af3735 100644 --- a/kinode/src/kernel/process.rs +++ b/kinode/src/kernel/process.rs @@ -11,7 +11,8 @@ use std::sync::Arc; use tokio::task::JoinHandle; use wasmtime::component::*; use wasmtime::{Engine, Store}; -use wasmtime_wasi::preview2::{pipe::MemoryOutputPipe, Table, WasiCtx, WasiCtxBuilder, WasiView}; +use wasmtime::component::ResourceTable as Table; +use wasmtime_wasi::preview2::{pipe::MemoryOutputPipe, WasiCtx, WasiCtxBuilder, WasiView}; const STACK_TRACE_SIZE: usize = 5000; diff --git a/kinode/wasi_snapshot_preview1.wasm b/kinode/wasi_snapshot_preview1.wasm index c8320e0b387374ce478d17546a4a0a442748a8ba..4ee5bc1b8b76548afb70ad74b32c288434538bba 100644 GIT binary patch delta 25025 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%0A=*Mqt_q& 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 diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 24de5a927..f27eb4233 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" tokio = { version = "1.28" } -wasmtime = { version = "15.0.1", features = ["component-model"] } +wasmtime = { version = "17.0.1", features = ["component-model"] } From c7e47cbae04919d7c49c98b897c096f2b7e0a5df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 04:51:53 +0000 Subject: [PATCH 2/3] Format Rust code using rustfmt --- kinode/build.rs | 15 +++++++++++---- kinode/src/kernel/process.rs | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/kinode/build.rs b/kinode/build.rs index a4b561eb4..a1efcdaff 100644 --- a/kinode/build.rs +++ b/kinode/build.rs @@ -8,7 +8,10 @@ use zip::write::FileOptions; // This function is assumed to be synchronous. Adjust as needed. // Make sure it can be called in parallel without causing issues. -fn build_and_zip_package(entry_path: PathBuf, parent_pkg_path: &str) -> anyhow::Result<(String, Vec)> { +fn build_and_zip_package( + entry_path: PathBuf, + parent_pkg_path: &str, +) -> anyhow::Result<(String, Vec)> { let rt = tokio::runtime::Runtime::new().unwrap(); rt.block_on(async { kit::build::execute(&entry_path, false, false, false, true).await?; @@ -53,7 +56,8 @@ fn main() -> anyhow::Result<()> { .map(|entry| entry.unwrap().path()) .collect(); - let results: Vec)>> = entries.par_iter() + let results: Vec)>> = entries + .par_iter() .map(|entry_path| { let parent_pkg_path = entry_path.join("pkg"); build_and_zip_package(entry_path.clone(), parent_pkg_path.to_str().unwrap()) @@ -63,7 +67,10 @@ fn main() -> anyhow::Result<()> { // Process results, e.g., write to `bootstrapped_processes.rs` // This part remains sequential let mut bootstrapped_processes = vec![]; - writeln!(bootstrapped_processes, "pub static BOOTSTRAPPED_PROCESSES: &[(&str, &[u8])] = &[")?; + writeln!( + bootstrapped_processes, + "pub static BOOTSTRAPPED_PROCESSES: &[(&str, &[u8])] = &[" + )?; for result in results { match result { @@ -77,7 +84,7 @@ fn main() -> anyhow::Result<()> { " (\"{}\", include_bytes!(\"{}\")),", zip_filename, zip_path, )?; - }, + } Err(e) => return Err(e), } } diff --git a/kinode/src/kernel/process.rs b/kinode/src/kernel/process.rs index b15af3735..2d2cdd29b 100644 --- a/kinode/src/kernel/process.rs +++ b/kinode/src/kernel/process.rs @@ -9,9 +9,9 @@ use ring::signature::{self, KeyPair}; use std::collections::{HashMap, VecDeque}; use std::sync::Arc; use tokio::task::JoinHandle; +use wasmtime::component::ResourceTable as Table; use wasmtime::component::*; use wasmtime::{Engine, Store}; -use wasmtime::component::ResourceTable as Table; use wasmtime_wasi::preview2::{pipe::MemoryOutputPipe, WasiCtx, WasiCtxBuilder, WasiView}; const STACK_TRACE_SIZE: usize = 5000; From ac0d8e371fbd989238e83fd56290a5cdef1bc688 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Thu, 15 Feb 2024 15:50:48 -0800 Subject: [PATCH 3/3] bump `kit` version --- Cargo.lock | 68 +++++++++++++++++------------------------------ kinode/Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b7448f56..aaf5b4869 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -319,7 +319,7 @@ dependencies = [ "http 0.2.11", "serde_json", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "tracing", "ws_stream_wasm", ] @@ -609,6 +609,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "autocontext" +version = "0.1.0" +source = "git+https://github.com/hosted-fornet/autocontext?rev=ff00142#ff00142d852870f4fb4de580ddf7caa77302787f" +dependencies = [ + "anyhow", + "quote", + "syn 2.0.48", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -2594,7 +2604,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "url", "uuid", "walkdir", @@ -2631,8 +2641,12 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.6.0" -source = "git+https://github.com/uqbar-dao/process_lib.git?rev=12bf9ee#12bf9eefeb9237db5e5165647fa91b437b05e169" +source = "git+https://github.com/kinode-dao/process_lib?rev=3232423#323242399efdcdad02e7f31bb6a9cc5eec048610" dependencies = [ + "alloy-json-rpc", + "alloy-primitives", + "alloy-rpc-types", + "alloy-transport", "anyhow", "bincode", "http 1.0.0", @@ -2648,12 +2662,8 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.6.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=3232423#323242399efdcdad02e7f31bb6a9cc5eec048610" +source = "git+https://github.com/kinode-dao/process_lib.git?rev=9d185e1#9d185e1e264c93af53d004ba32520fd5d046e7e5" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-types", - "alloy-transport", "anyhow", "bincode", "http 1.0.0", @@ -2669,16 +2679,17 @@ dependencies = [ [[package]] name = "kit" version = "0.1.0" -source = "git+https://github.com/kinode-dao/kit?rev=665025c#665025c06f495a826e8a4e0a23e3dce59dcb1832" +source = "git+https://github.com/kinode-dao/kit?rev=f96cdaa#f96cdaa022ec8d0ff675bce3b92bd436236881ea" dependencies = [ "anyhow", + "autocontext", "base64 0.21.7", "clap", "dirs 5.0.1", "futures-util", "git2", "hex", - "kinode_process_lib 0.6.0 (git+https://github.com/uqbar-dao/process_lib.git?rev=12bf9ee)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib.git?rev=9d185e1)", "nix", "regex", "reqwest", @@ -2688,7 +2699,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite", "toml 0.8.10", "walkdir", "zip", @@ -4739,22 +4750,10 @@ dependencies = [ "rustls", "tokio", "tokio-rustls", - "tungstenite 0.20.1", + "tungstenite", "webpki-roots", ] -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.21.0", -] - [[package]] name = "tokio-util" version = "0.7.10" @@ -4976,25 +4975,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.0.0", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "typenum" version = "1.17.0" @@ -5222,7 +5202,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing", diff --git a/kinode/Cargo.toml b/kinode/Cargo.toml index 2a0299202..a713b7d60 100644 --- a/kinode/Cargo.toml +++ b/kinode/Cargo.toml @@ -14,7 +14,7 @@ path = "src/main.rs" [build-dependencies] anyhow = "1.0.71" -kit = { git = "https://github.com/kinode-dao/kit", rev = "665025c" } +kit = { git = "https://github.com/kinode-dao/kit", rev = "f96cdaa" } rayon = "1.8.1" sha2 = "0.10" tokio = "1.28"