From f054b62bdf60f3fab8fad0219a85173fccf371bc Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Wed, 13 Nov 2024 11:11:05 -0800 Subject: [PATCH 01/17] use app-store instead of app_store --- src/remove_package/mod.rs | 2 +- src/start_package/mod.rs | 4 ++-- src/view_api/mod.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remove_package/mod.rs b/src/remove_package/mod.rs index 4d689649..38c58afb 100644 --- a/src/remove_package/mod.rs +++ b/src/remove_package/mod.rs @@ -28,7 +28,7 @@ pub async fn execute( "Uninstall": {"package_name": package_name, "publisher_node": publisher}, }); let uninstall_request = inject_message::make_message( - "main:app_store:sys", + "main:app-store:sys", Some(15), &body.to_string(), None, diff --git a/src/start_package/mod.rs b/src/start_package/mod.rs index 0c699b91..7718c33b 100644 --- a/src/start_package/mod.rs +++ b/src/start_package/mod.rs @@ -27,7 +27,7 @@ fn new_package( }); inject_message::make_message( - "main:app_store:sys", + "main:app-store:sys", Some(15), &message.to_string(), node, @@ -72,7 +72,7 @@ fn install( }); inject_message::make_message( - "main:app_store:sys", + "main:app-store:sys", Some(15), &body.to_string(), node, diff --git a/src/view_api/mod.rs b/src/view_api/mod.rs index d61e8f91..1e6c0e35 100644 --- a/src/view_api/mod.rs +++ b/src/view_api/mod.rs @@ -14,7 +14,7 @@ fn make_app_store_message( message: &serde_json::Value, ) -> Result { inject_message::make_message( - &format!("{process_name}:app_store:sys"), + &format!("{process_name}:app-store:sys"), Some(5), &message.to_string(), node, From d0b9dfb05b9e6694bc66e8ff17a76b3d05d34677 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 2 Dec 2024 16:19:24 -0800 Subject: [PATCH 02/17] improve robustness of runtime build --- src/boot_fake_node/mod.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index ba651c32..bba8030d 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -79,7 +79,12 @@ pub fn extract_zip(archive_path: &Path) -> Result<()> { pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> Result<()> { info!("Compiling Kinode runtime..."); - let mut args = vec!["+nightly", "build", "-p", "kinode", "--color=always"]; + // build the packages + let args = vec!["run", "-p", "build-packages", "--", "--features", "simulation-mode"]; + build::run_command(Command::new("cargo").args(&args).current_dir(path), false)?; + + // build the runtime + let mut args = vec!["build", "-p", "kinode", "--color=always"]; if release { args.push("--release"); } @@ -87,7 +92,13 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> args.extend_from_slice(&["--features", "simulation-mode"]); } - build::run_command(Command::new("cargo").args(&args).current_dir(path), false)?; + build::run_command( + Command::new("cargo") + .env("PATH_TO_PACKAGES_ZIP", "target/packages-simulation-mode.zip") + .args(&args) + .current_dir(path), + false, + )?; info!("Done compiling Kinode runtime."); Ok(()) From 657aca2cc1399c2844d62c36f3f37ee20ae1c19c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 00:19:52 +0000 Subject: [PATCH 03/17] Format Rust code using rustfmt --- src/boot_fake_node/mod.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index bba8030d..2a1c1599 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -80,7 +80,14 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> info!("Compiling Kinode runtime..."); // build the packages - let args = vec!["run", "-p", "build-packages", "--", "--features", "simulation-mode"]; + let args = vec![ + "run", + "-p", + "build-packages", + "--", + "--features", + "simulation-mode", + ]; build::run_command(Command::new("cargo").args(&args).current_dir(path), false)?; // build the runtime @@ -94,7 +101,10 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> build::run_command( Command::new("cargo") - .env("PATH_TO_PACKAGES_ZIP", "target/packages-simulation-mode.zip") + .env( + "PATH_TO_PACKAGES_ZIP", + "target/packages-simulation-mode.zip", + ) .args(&args) .current_dir(path), false, From 23ee39938ffd37adaa3b601cc0026036340960c2 Mon Sep 17 00:00:00 2001 From: dr-frmr Date: Mon, 9 Dec 2024 16:37:13 -0500 Subject: [PATCH 04/17] update to support wit 1.0 --- src/build/mod.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build/mod.rs b/src/build/mod.rs index 1d19e8cc..24432c40 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -39,6 +39,8 @@ const KINODE_WIT_0_7_0_URL: &str = "https://raw.githubusercontent.com/kinode-dao/kinode-wit/aa2c8b11c9171b949d1991c32f58591c0e881f85/kinode.wit"; const KINODE_WIT_0_8_0_URL: &str = "https://raw.githubusercontent.com/kinode-dao/kinode-wit/v0.8/kinode.wit"; +const KINODE_WIT_1_0_0_URL: &str = + "https://raw.githubusercontent.com/kinode-dao/kinode-wit/v1.0.0/kinode.wit"; const WASI_VERSION: &str = "19.0.1"; // TODO: un-hardcode const DEFAULT_WORLD_0_7_0: &str = "process"; const DEFAULT_WORLD_0_8_0: &str = "process-v0"; @@ -1071,7 +1073,8 @@ async fn build_wit_dir( } let wit_url = match wit_version { None => KINODE_WIT_0_7_0_URL, - Some(0) | _ => KINODE_WIT_0_8_0_URL, + Some(0) => KINODE_WIT_0_8_0_URL, + Some(1) | _ => KINODE_WIT_1_0_0_URL, }; download_file(wit_url, &wit_dir.join("kinode.wit")).await?; for (file_name, contents) in apis { From 4629a4ac4744b2c6b7257258d002769fec39fe45 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Wed, 11 Dec 2024 13:46:53 -0800 Subject: [PATCH 05/17] update Cargo.toml metadata & license --- Cargo.toml | 5 +++++ LICENSE | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 61f57576..f1475d35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,12 @@ [package] name = "kit" +authors = ["Sybil Technologies AG"] version = "0.8.3" edition = "2021" +description = "Development toolkit for Kinode" +homepage = "https://kinode.org" +repository = "https://github.com/kinode-dao/kit" +license = "Apache-2.0" [build-dependencies] anyhow = "1.0" diff --git a/LICENSE b/LICENSE index 6c5d1d1a..a3fe352b 100644 --- a/LICENSE +++ b/LICENSE @@ -175,7 +175,7 @@ END OF TERMS AND CONDITIONS - Copyright 2024 Unzentrum DAO + Copyright 2024 Sybil Technologies AG Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 946a933b8bc3528acd5c1f8b61eee4f84539f648 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Thu, 12 Dec 2024 13:47:11 -0800 Subject: [PATCH 06/17] bump wit-bindgen to 0.36 and use wit v1 --- Cargo.toml | 4 ++-- .../javascript/no-ui/chat/api/chat:template.os-v0.wit | 2 +- src/new/templates/javascript/no-ui/chat/send/Cargo.toml | 4 ++-- .../chat/test/chat_test/api/chat_test:template.os-v0.wit | 2 +- .../javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml | 4 ++-- .../javascript/no-ui/chat/test/chat_test/metadata.json | 2 +- .../echo/test/echo_test/api/echo_test:template.os-v0.wit | 2 +- .../javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml | 4 ++-- .../javascript/no-ui/echo/test/echo_test/metadata.json | 2 +- .../test/fibonacci_test/api/fibonacci_test:template.os-v0.wit | 2 +- .../fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml | 4 ++-- .../no-ui/fibonacci/test/fibonacci_test/metadata.json | 2 +- .../templates/python/no-ui/chat/api/chat:template.os-v0.wit | 2 +- .../chat/test/chat_test/api/chat_test:template.os-v0.wit | 2 +- .../python/no-ui/chat/test/chat_test/chat_test/Cargo.toml | 4 ++-- .../templates/python/no-ui/chat/test/chat_test/metadata.json | 2 +- .../echo/test/echo_test/api/echo_test:template.os-v0.wit | 2 +- .../python/no-ui/echo/test/echo_test/echo_test/Cargo.toml | 4 ++-- .../templates/python/no-ui/echo/test/echo_test/metadata.json | 2 +- .../test/fibonacci_test/api/fibonacci_test:template.os-v0.wit | 2 +- .../fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml | 4 ++-- .../python/no-ui/fibonacci/test/fibonacci_test/metadata.json | 2 +- src/new/templates/rust/no-ui/blank/blank/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/blank/metadata.json | 2 +- src/new/templates/rust/no-ui/chat/api/chat:template.os-v0.wit | 2 +- src/new/templates/rust/no-ui/chat/chat/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/chat/metadata.json | 2 +- src/new/templates/rust/no-ui/chat/send/Cargo.toml | 4 ++-- .../chat/test/chat-test/api/chat_test:template.os-v0.wit | 2 +- .../rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml | 4 ++-- .../templates/rust/no-ui/chat/test/chat-test/metadata.json | 2 +- src/new/templates/rust/no-ui/echo/echo/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/echo/metadata.json | 2 +- .../echo/test/echo-test/api/echo_test:template.os-v0.wit | 2 +- .../rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml | 4 ++-- .../templates/rust/no-ui/echo/test/echo-test/metadata.json | 2 +- .../rust/no-ui/fibonacci/api/fibonacci:template.os-v0.wit | 2 +- src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/fibonacci/metadata.json | 2 +- src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml | 4 ++-- .../test/fibonacci-test/api/fibonacci_test:template.os-v0.wit | 2 +- .../fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml | 4 ++-- .../rust/no-ui/fibonacci/test/fibonacci-test/metadata.json | 2 +- .../no-ui/file-transfer/api/file-transfer:template.os-v0.wit | 2 +- .../templates/rust/no-ui/file-transfer/download/Cargo.toml | 4 ++-- .../no-ui/file-transfer/file-transfer-worker-api/Cargo.toml | 4 ++-- .../rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml | 4 ++-- .../rust/no-ui/file-transfer/file-transfer/Cargo.toml | 4 ++-- .../templates/rust/no-ui/file-transfer/list-files/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/file-transfer/metadata.json | 2 +- .../api/file-transfer-test:template.os-v0.wit | 2 +- .../test/file-transfer-test/file-transfer-test/Cargo.toml | 4 ++-- .../no-ui/file-transfer/test/file-transfer-test/metadata.json | 2 +- src/new/templates/rust/ui/chat/chat/Cargo.toml | 4 ++-- src/new/templates/rust/ui/chat/metadata.json | 2 +- 55 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1475d35..baf2d6e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ color-eyre = { version = "0.6", features = ["capture-spantrace"] } dirs = "5.0" fs-err = "2.11" hex = "0.4" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "9ac9e51" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "2a526c8" } nix = { version = "0.27", features = ["process", "signal", "term"] } regex = "1" reqwest = { version = "0.12", features = ["json"] } @@ -65,7 +65,7 @@ tracing-appender = "0.2" tracing-error = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "std"] } walkdir = "2.4" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" zip = "0.6" [workspace] diff --git a/src/new/templates/javascript/no-ui/chat/api/chat:template.os-v0.wit b/src/new/templates/javascript/no-ui/chat/api/chat:template.os-v0.wit index 9adc12ec..5ec0cff8 100644 --- a/src/new/templates/javascript/no-ui/chat/api/chat:template.os-v0.wit +++ b/src/new/templates/javascript/no-ui/chat/api/chat:template.os-v0.wit @@ -23,5 +23,5 @@ interface chat { world chat-template-dot-os-v0 { import chat; - include process; + include process-v1; } diff --git a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml index 5dcbe593..0e3ebecf 100644 --- a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml @@ -6,10 +6,10 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "84b3d84" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/javascript/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit b/src/new/templates/javascript/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit index c87f01eb..731256ee 100644 --- a/src/new/templates/javascript/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit +++ b/src/new/templates/javascript/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit @@ -1,5 +1,5 @@ world chat-test-template-dot-os-v0 { import chat; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml index 7c5126db..f52bfb69 100644 --- a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/javascript/no-ui/chat/test/chat_test/metadata.json b/src/new/templates/javascript/no-ui/chat/test/chat_test/metadata.json index 8161d7d6..fdfbc660 100644 --- a/src/new/templates/javascript/no-ui/chat/test/chat_test/metadata.json +++ b/src/new/templates/javascript/no-ui/chat/test/chat_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "chat:template.os", "tester:sys" diff --git a/src/new/templates/javascript/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit b/src/new/templates/javascript/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit index c4b22457..cd80f8ab 100644 --- a/src/new/templates/javascript/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit +++ b/src/new/templates/javascript/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit @@ -1,4 +1,4 @@ world echo-test-template-dot-os-v0 { import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml index f0207b23..4d7a87ae 100644 --- a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/javascript/no-ui/echo/test/echo_test/metadata.json b/src/new/templates/javascript/no-ui/echo/test/echo_test/metadata.json index 11c67227..5bcde9f5 100644 --- a/src/new/templates/javascript/no-ui/echo/test/echo_test/metadata.json +++ b/src/new/templates/javascript/no-ui/echo/test/echo_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "tester:sys" ] diff --git a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit index bef06257..53c1405a 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit +++ b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit @@ -1,5 +1,5 @@ world fibonacci-test-template-dot-os-v0 { import fibonacci; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 5485e2e1..2dfba20a 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/metadata.json b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/metadata.json index daeaff69..0aa1c076 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/metadata.json +++ b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "fibonacci:template.os", "tester:sys" diff --git a/src/new/templates/python/no-ui/chat/api/chat:template.os-v0.wit b/src/new/templates/python/no-ui/chat/api/chat:template.os-v0.wit index 9adc12ec..5ec0cff8 100644 --- a/src/new/templates/python/no-ui/chat/api/chat:template.os-v0.wit +++ b/src/new/templates/python/no-ui/chat/api/chat:template.os-v0.wit @@ -23,5 +23,5 @@ interface chat { world chat-template-dot-os-v0 { import chat; - include process; + include process-v1; } diff --git a/src/new/templates/python/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit b/src/new/templates/python/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit index c87f01eb..731256ee 100644 --- a/src/new/templates/python/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit +++ b/src/new/templates/python/no-ui/chat/test/chat_test/api/chat_test:template.os-v0.wit @@ -1,5 +1,5 @@ world chat-test-template-dot-os-v0 { import chat; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml index 7c5126db..f52bfb69 100644 --- a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/python/no-ui/chat/test/chat_test/metadata.json b/src/new/templates/python/no-ui/chat/test/chat_test/metadata.json index 8161d7d6..fdfbc660 100644 --- a/src/new/templates/python/no-ui/chat/test/chat_test/metadata.json +++ b/src/new/templates/python/no-ui/chat/test/chat_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "chat:template.os", "tester:sys" diff --git a/src/new/templates/python/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit b/src/new/templates/python/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit index c4b22457..cd80f8ab 100644 --- a/src/new/templates/python/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit +++ b/src/new/templates/python/no-ui/echo/test/echo_test/api/echo_test:template.os-v0.wit @@ -1,4 +1,4 @@ world echo-test-template-dot-os-v0 { import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml index f0207b23..4d7a87ae 100644 --- a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/python/no-ui/echo/test/echo_test/metadata.json b/src/new/templates/python/no-ui/echo/test/echo_test/metadata.json index 11c67227..5bcde9f5 100644 --- a/src/new/templates/python/no-ui/echo/test/echo_test/metadata.json +++ b/src/new/templates/python/no-ui/echo/test/echo_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "tester:sys" ] diff --git a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit index bef06257..53c1405a 100644 --- a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit +++ b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/api/fibonacci_test:template.os-v0.wit @@ -1,5 +1,5 @@ world fibonacci-test-template-dot-os-v0 { import fibonacci; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 5485e2e1..2dfba20a 100644 --- a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/metadata.json b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/metadata.json index daeaff69..0aa1c076 100644 --- a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/metadata.json +++ b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "fibonacci:template.os", "tester:sys" diff --git a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml index 93af21c3..adba17ef 100644 --- a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml +++ b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" publish = false [dependencies] -kinode_process_lib = "0.9.2" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/blank/metadata.json b/src/new/templates/rust/no-ui/blank/metadata.json index 013b3109..4c4ba6d8 100644 --- a/src/new/templates/rust/no-ui/blank/metadata.json +++ b/src/new/templates/rust/no-ui/blank/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/rust/no-ui/chat/api/chat:template.os-v0.wit b/src/new/templates/rust/no-ui/chat/api/chat:template.os-v0.wit index d883229b..5ec0cff8 100644 --- a/src/new/templates/rust/no-ui/chat/api/chat:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/chat/api/chat:template.os-v0.wit @@ -23,5 +23,5 @@ interface chat { world chat-template-dot-os-v0 { import chat; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml index aabd451e..46f9696d 100644 --- a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { version = "0.9.6", features = ["logging"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/chat/metadata.json b/src/new/templates/rust/no-ui/chat/metadata.json index 267211d6..8f9795c5 100644 --- a/src/new/templates/rust/no-ui/chat/metadata.json +++ b/src/new/templates/rust/no-ui/chat/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/rust/no-ui/chat/send/Cargo.toml b/src/new/templates/rust/no-ui/chat/send/Cargo.toml index 7055c900..0e3ebecf 100644 --- a/src/new/templates/rust/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/send/Cargo.toml @@ -6,10 +6,10 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.6" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/chat/test/chat-test/api/chat_test:template.os-v0.wit b/src/new/templates/rust/no-ui/chat/test/chat-test/api/chat_test:template.os-v0.wit index c87f01eb..731256ee 100644 --- a/src/new/templates/rust/no-ui/chat/test/chat-test/api/chat_test:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/chat/test/chat-test/api/chat_test:template.os-v0.wit @@ -1,5 +1,5 @@ world chat-test-template-dot-os-v0 { import chat; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml index 1c280c2c..443ce8d9 100644 --- a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = "0.9.2" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/chat/test/chat-test/metadata.json b/src/new/templates/rust/no-ui/chat/test/chat-test/metadata.json index 0d0d5a63..23c66111 100644 --- a/src/new/templates/rust/no-ui/chat/test/chat-test/metadata.json +++ b/src/new/templates/rust/no-ui/chat/test/chat-test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "chat:template.os", "tester:sys" diff --git a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml index 540c5530..c8661be2 100644 --- a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { version = "0.9.6", features = ["logging"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/echo/metadata.json b/src/new/templates/rust/no-ui/echo/metadata.json index 1c6395fe..354570c0 100644 --- a/src/new/templates/rust/no-ui/echo/metadata.json +++ b/src/new/templates/rust/no-ui/echo/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/rust/no-ui/echo/test/echo-test/api/echo_test:template.os-v0.wit b/src/new/templates/rust/no-ui/echo/test/echo-test/api/echo_test:template.os-v0.wit index c4b22457..cd80f8ab 100644 --- a/src/new/templates/rust/no-ui/echo/test/echo-test/api/echo_test:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/echo/test/echo-test/api/echo_test:template.os-v0.wit @@ -1,4 +1,4 @@ world echo-test-template-dot-os-v0 { import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml index d50a734c..460b5d76 100644 --- a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = "0.9.2" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/echo/test/echo-test/metadata.json b/src/new/templates/rust/no-ui/echo/test/echo-test/metadata.json index 1e78c119..7caeb0e4 100644 --- a/src/new/templates/rust/no-ui/echo/test/echo-test/metadata.json +++ b/src/new/templates/rust/no-ui/echo/test/echo-test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "tester:sys" ] diff --git a/src/new/templates/rust/no-ui/fibonacci/api/fibonacci:template.os-v0.wit b/src/new/templates/rust/no-ui/fibonacci/api/fibonacci:template.os-v0.wit index c1bf5012..4d8f6ac1 100644 --- a/src/new/templates/rust/no-ui/fibonacci/api/fibonacci:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/fibonacci/api/fibonacci:template.os-v0.wit @@ -12,5 +12,5 @@ interface fibonacci { world fibonacci-template-dot-os-v0 { import fibonacci; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml index a8ace65e..1a68f78b 100644 --- a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { version = "0.9.6", features = ["logging"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/fibonacci/metadata.json b/src/new/templates/rust/no-ui/fibonacci/metadata.json index 7f1b5264..14aec060 100644 --- a/src/new/templates/rust/no-ui/fibonacci/metadata.json +++ b/src/new/templates/rust/no-ui/fibonacci/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml index 46e5cd04..9a680a73 100644 --- a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml @@ -6,10 +6,10 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.6" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/api/fibonacci_test:template.os-v0.wit b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/api/fibonacci_test:template.os-v0.wit index bef06257..53c1405a 100644 --- a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/api/fibonacci_test:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/api/fibonacci_test:template.os-v0.wit @@ -1,5 +1,5 @@ world fibonacci-test-template-dot-os-v0 { import fibonacci; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml index 6c0545af..72829a7a 100644 --- a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.2" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/metadata.json b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/metadata.json index ac9d24c4..b985f761 100644 --- a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/metadata.json +++ b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "fibonacci:template.os", "tester:sys" diff --git a/src/new/templates/rust/no-ui/file-transfer/api/file-transfer:template.os-v0.wit b/src/new/templates/rust/no-ui/file-transfer/api/file-transfer:template.os-v0.wit index 3f5a3ed2..bcacddfc 100644 --- a/src/new/templates/rust/no-ui/file-transfer/api/file-transfer:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/file-transfer/api/file-transfer:template.os-v0.wit @@ -75,5 +75,5 @@ world file-transfer-worker-api-v0 { world file-transfer-template-dot-os-v0 { import file-transfer; import file-transfer-worker; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml index 11b7a6a7..770af5cd 100644 --- a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.6" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml index 9c945335..985ea365 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.6" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml index 58fdcaf1..0f8dbf5c 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { version = "0.9.6", features = ["logging"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml index 25514d57..8c3c3eea 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { version = "0.9.6", features = ["logging"] } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml index e296d065..10607023 100644 --- a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml @@ -6,11 +6,11 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = "0.9.6" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/metadata.json b/src/new/templates/rust/no-ui/file-transfer/metadata.json index 359b738c..44e7295f 100644 --- a/src/new/templates/rust/no-ui/file-transfer/metadata.json +++ b/src/new/templates/rust/no-ui/file-transfer/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "file-transfer:template.os" ] diff --git a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/api/file-transfer-test:template.os-v0.wit b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/api/file-transfer-test:template.os-v0.wit index 99b62ce1..ce6ea67d 100644 --- a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/api/file-transfer-test:template.os-v0.wit +++ b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/api/file-transfer-test:template.os-v0.wit @@ -1,5 +1,5 @@ world file-transfer-test-template-dot-os-v0 { import file-transfer; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml index 38908c67..b9d5cc24 100644 --- a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml @@ -7,13 +7,13 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = "0.9.2" +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/metadata.json b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/metadata.json index 18e8694b..92bfe2c0 100644 --- a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/metadata.json +++ b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "file-transfer:template.os", "tester:sys" diff --git a/src/new/templates/rust/ui/chat/chat/Cargo.toml b/src/new/templates/rust/ui/chat/chat/Cargo.toml index 42cb0fee..92155c77 100644 --- a/src/new/templates/rust/ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/ui/chat/chat/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.0" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wit-bindgen = "0.24.0" +wit-bindgen = "0.36.0" [lib] crate-type = ["cdylib"] diff --git a/src/new/templates/rust/ui/chat/metadata.json b/src/new/templates/rust/ui/chat/metadata.json index 267211d6..8f9795c5 100644 --- a/src/new/templates/rust/ui/chat/metadata.json +++ b/src/new/templates/rust/ui/chat/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [] }, "external_url": "", From 55725fd448c04beae5f8b3fd225c0e0badc597ce Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Thu, 12 Dec 2024 16:45:15 -0800 Subject: [PATCH 07/17] update templates --- src/new/templates/javascript/no-ui/chat/pkg/manifest.json | 2 +- src/new/templates/javascript/no-ui/echo/pkg/manifest.json | 2 +- .../javascript/no-ui/fibonacci/pkg/manifest.json | 2 +- src/new/templates/python/no-ui/chat/pkg/manifest.json | 2 +- src/new/templates/python/no-ui/echo/pkg/manifest.json | 2 +- .../templates/python/no-ui/fibonacci/pkg/manifest.json | 2 +- src/new/templates/rust/no-ui/blank/blank/src/lib.rs | 2 +- src/new/templates/rust/no-ui/chat/pkg/manifest.json | 2 +- src/new/templates/rust/no-ui/echo/echo/src/lib.rs | 2 +- src/new/templates/rust/no-ui/echo/pkg/manifest.json | 2 +- src/new/templates/rust/no-ui/fibonacci/pkg/manifest.json | 2 +- .../templates/rust/no-ui/file-transfer/pkg/manifest.json | 2 +- src/new/templates/rust/ui/chat/chat/src/lib.rs | 8 ++------ src/new/templates/rust/ui/chat/pkg/manifest.json | 2 +- 14 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/new/templates/javascript/no-ui/chat/pkg/manifest.json b/src/new/templates/javascript/no-ui/chat/pkg/manifest.json index 3da591df..00b8b966 100644 --- a/src/new/templates/javascript/no-ui/chat/pkg/manifest.json +++ b/src/new/templates/javascript/no-ui/chat/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/javascript/no-ui/echo/pkg/manifest.json b/src/new/templates/javascript/no-ui/echo/pkg/manifest.json index 7fc7826e..a367fe77 100644 --- a/src/new/templates/javascript/no-ui/echo/pkg/manifest.json +++ b/src/new/templates/javascript/no-ui/echo/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/javascript/no-ui/fibonacci/pkg/manifest.json b/src/new/templates/javascript/no-ui/fibonacci/pkg/manifest.json index b621d87d..b070b39f 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/pkg/manifest.json +++ b/src/new/templates/javascript/no-ui/fibonacci/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/python/no-ui/chat/pkg/manifest.json b/src/new/templates/python/no-ui/chat/pkg/manifest.json index 3da591df..00b8b966 100644 --- a/src/new/templates/python/no-ui/chat/pkg/manifest.json +++ b/src/new/templates/python/no-ui/chat/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/python/no-ui/echo/pkg/manifest.json b/src/new/templates/python/no-ui/echo/pkg/manifest.json index 7fc7826e..a367fe77 100644 --- a/src/new/templates/python/no-ui/echo/pkg/manifest.json +++ b/src/new/templates/python/no-ui/echo/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/python/no-ui/fibonacci/pkg/manifest.json b/src/new/templates/python/no-ui/fibonacci/pkg/manifest.json index b621d87d..b070b39f 100644 --- a/src/new/templates/python/no-ui/fibonacci/pkg/manifest.json +++ b/src/new/templates/python/no-ui/fibonacci/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [], "public": true diff --git a/src/new/templates/rust/no-ui/blank/blank/src/lib.rs b/src/new/templates/rust/no-ui/blank/blank/src/lib.rs index 55852914..05a38ccc 100644 --- a/src/new/templates/rust/no-ui/blank/blank/src/lib.rs +++ b/src/new/templates/rust/no-ui/blank/blank/src/lib.rs @@ -2,7 +2,7 @@ use kinode_process_lib::{await_message, call_init, println, Address}; wit_bindgen::generate!({ path: "target/wit", - world: "process-v0", + world: "process-v1", }); call_init!(init); diff --git a/src/new/templates/rust/no-ui/chat/pkg/manifest.json b/src/new/templates/rust/no-ui/chat/pkg/manifest.json index 0e55daa8..51a73ac0 100644 --- a/src/new/templates/rust/no-ui/chat/pkg/manifest.json +++ b/src/new/templates/rust/no-ui/chat/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [], diff --git a/src/new/templates/rust/no-ui/echo/echo/src/lib.rs b/src/new/templates/rust/no-ui/echo/echo/src/lib.rs index 7455a10d..41ddd305 100644 --- a/src/new/templates/rust/no-ui/echo/echo/src/lib.rs +++ b/src/new/templates/rust/no-ui/echo/echo/src/lib.rs @@ -3,7 +3,7 @@ use kinode_process_lib::{await_message, call_init, println, Address, Message, Re wit_bindgen::generate!({ path: "target/wit", - world: "process-v0", + world: "process-v1", }); fn handle_message(message: &Message) -> anyhow::Result<()> { diff --git a/src/new/templates/rust/no-ui/echo/pkg/manifest.json b/src/new/templates/rust/no-ui/echo/pkg/manifest.json index 94fced60..396a6eff 100644 --- a/src/new/templates/rust/no-ui/echo/pkg/manifest.json +++ b/src/new/templates/rust/no-ui/echo/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [], diff --git a/src/new/templates/rust/no-ui/fibonacci/pkg/manifest.json b/src/new/templates/rust/no-ui/fibonacci/pkg/manifest.json index 7ac53d13..8aa9b5e1 100644 --- a/src/new/templates/rust/no-ui/fibonacci/pkg/manifest.json +++ b/src/new/templates/rust/no-ui/fibonacci/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [], diff --git a/src/new/templates/rust/no-ui/file-transfer/pkg/manifest.json b/src/new/templates/rust/no-ui/file-transfer/pkg/manifest.json index f5385b24..68d17308 100644 --- a/src/new/templates/rust/no-ui/file-transfer/pkg/manifest.json +++ b/src/new/templates/rust/no-ui/file-transfer/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [], diff --git a/src/new/templates/rust/ui/chat/chat/src/lib.rs b/src/new/templates/rust/ui/chat/chat/src/lib.rs index 687b0520..aecc7c39 100644 --- a/src/new/templates/rust/ui/chat/chat/src/lib.rs +++ b/src/new/templates/rust/ui/chat/chat/src/lib.rs @@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize}; wit_bindgen::generate!({ path: "target/wit", - world: "process-v0", + world: "process-v1", }); #[derive(Debug, Serialize, Deserialize)] @@ -204,11 +204,7 @@ fn handle_chat_request( }; // Send a WebSocket message to the http server in order to update the UI - send_ws_push( - channel_id.clone(), - WsMessageType::Text, - blob, - ); + send_ws_push(channel_id.clone(), WsMessageType::Text, blob); } ChatRequest::History => { // If this is an HTTP request, send a response to the http server diff --git a/src/new/templates/rust/ui/chat/pkg/manifest.json b/src/new/templates/rust/ui/chat/pkg/manifest.json index 0e55daa8..51a73ac0 100644 --- a/src/new/templates/rust/ui/chat/pkg/manifest.json +++ b/src/new/templates/rust/ui/chat/pkg/manifest.json @@ -5,7 +5,7 @@ "on_exit": "Restart", "request_networking": true, "request_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [], From 484260e1a89bc0d5ad0108f2a2ef2c5d7d337caf Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Thu, 12 Dec 2024 17:07:37 -0800 Subject: [PATCH 08/17] workflow: pull down latest Kinode core --- .github/workflows/build_and_test.yml | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index be2df596..0bda803c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -77,27 +77,26 @@ jobs: - name: Unzip the build output run: unzip /tmp/kit-release/kit-x86_64-unknown-linux-gnu.zip - #- name: Get latest release from kinode-dao/kit - # id: get-latest-kinode-release - # uses: actions/github-script@v6 - # with: - # script: | - # const repo = { - # owner: 'kinode-dao', - # repo: 'kinode', - # }; - # const release = await github.rest.repos.getLatestRelease(repo); - # const asset = release.data.assets.find(asset => asset.name.match(/kinode-x86_64-unknown-linux-gnu\.zip/)); - # if (!asset) { - # throw new Error('Asset not found'); - # } - # return asset.browser_download_url; - # result-encoding: string + - name: Get latest release from kinode-dao/kinode + id: get-latest-kinode-release + uses: actions/github-script@v6 + with: + script: | + const repo = { + owner: 'kinode-dao', + repo: 'kinode', + }; + const release = await github.rest.repos.getLatestRelease(repo); + const asset = release.data.assets.find(asset => asset.name.match(/kinode-x86_64-unknown-linux-gnu\.zip/)); + if (!asset) { + throw new Error('Asset not found'); + } + return asset.browser_download_url; + result-encoding: string - name: Download the Kinode release - run: wget -q https://files.yael.solutions/240906/kinode-x86_64-unknown-linux-gnu-simulation-mode.zip -O kinode.zip - #run: wget -q ${DOWNLOAD_URL} -O kinode.zip - #env: - # DOWNLOAD_URL: ${{ steps.get-latest-kinode-release.outputs.result }} + run: wget -q ${DOWNLOAD_URL} -O kinode.zip + env: + DOWNLOAD_URL: ${{ steps.get-latest-kinode-release.outputs.result }} - name: Unzip the Kinode release run: unzip kinode.zip From 15240feba7311d752700a62bb35356f03adbd1fd Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Mon, 16 Dec 2024 17:22:16 -0800 Subject: [PATCH 09/17] use 0.27.0 wasi_snapshot_preview --- Cargo.lock | 138 ++++++++++++++++++++++++----------------------- src/build/mod.rs | 2 +- 2 files changed, 71 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8211a7cf..ed255944 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -326,7 +326,7 @@ checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -470,7 +470,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -482,12 +482,12 @@ dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", - "heck 0.5.0", + "heck", "indexmap", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", "syn-solidity", "tiny-keccak", ] @@ -501,11 +501,11 @@ dependencies = [ "alloy-json-abi", "const-hex", "dunce", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.90", "syn-solidity", ] @@ -803,7 +803,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -814,7 +814,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -842,7 +842,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1359,7 +1359,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1656,7 +1656,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -1786,15 +1786,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.5.0" @@ -2129,8 +2120,8 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.9.2" -source = "git+https://github.com/kinode-dao/process_lib.git?rev=9ac9e51#9ac9e513c0228f2dcfe8999ed4ca2c38246ee3db" +version = "0.10.0" +source = "git+https://github.com/kinode-dao/process_lib.git?rev=2a526c8#2a526c8ab827db27e51b1475f46c2765afed77ef" dependencies = [ "alloy", "alloy-primitives", @@ -2486,7 +2477,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -2527,7 +2518,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -2678,7 +2669,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -2724,6 +2715,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn 2.0.90", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -2770,9 +2771,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -3342,7 +3343,7 @@ checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -3531,11 +3532,11 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -3557,9 +3558,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -3575,7 +3576,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -3644,7 +3645,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -3746,7 +3747,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -3916,7 +3917,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -4081,12 +4082,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - [[package]] name = "unicode-xid" version = "0.2.5" @@ -4206,7 +4201,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -4240,7 +4235,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4253,18 +4248,19 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-encoder" -version = "0.202.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a" +checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" dependencies = [ "leb128", + "wasmparser", ] [[package]] name = "wasm-metadata" -version = "0.202.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094aea3cb90e09f16ee25a4c0e324b3e8c934e7fd838bfa039aef5352f44a917" +checksum = "3f3e5f5920c5abfc45573c89b07b38efdaae1515ef86f83dad12d60e50ecd62b" dependencies = [ "anyhow", "indexmap", @@ -4278,11 +4274,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.202.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413" +checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" dependencies = [ + "ahash", "bitflags 2.6.0", + "hashbrown", "indexmap", "semver 1.0.23", ] @@ -4544,9 +4542,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.24.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4e7653763780be47e38f479e9aa83c768aa6a3b2ed086dc2826fdbbb7e7f5" +checksum = "6a2b3e15cd6068f233926e7d8c7c588b2ec4fb7cc7bf3824115e7c7e2a8485a3" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -4554,32 +4552,35 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.24.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b67e11c950041849a10828c7600ea62a4077c01e8af72e8593253575428f91b" +checksum = "b632a5a0fa2409489bd49c9e6d99fcc61bb3d4ce9d1907d44662e75a28c71172" dependencies = [ "anyhow", + "heck", "wit-parser", ] [[package]] name = "wit-bindgen-rt" -version = "0.24.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0780cf7046630ed70f689a098cd8d56c5c3b22f2a7379bbdb088879963ff96" +checksum = "7947d0131c7c9da3f01dfde0ab8bd4c4cf3c5bd49b6dba0ae640f1fa752572ea" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.24.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30acbe8fb708c3a830a33c4cb705df82659bf831b492ec6ca1a17a369cfeeafb" +checksum = "4329de4186ee30e2ef30a0533f9b3c123c019a237a7c82d692807bf1b3ee2697" dependencies = [ "anyhow", - "heck 0.4.1", + "heck", "indexmap", + "prettyplease", + "syn 2.0.90", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -4587,23 +4588,24 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.24.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b1b06eae85feaecdf9f2854f7cac124e00d5a6e5014bfb02eb1ecdeb5f265b9" +checksum = "177fb7ee1484d113b4792cc480b1ba57664bbc951b42a4beebe573502135b1fc" dependencies = [ "anyhow", + "prettyplease", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", "wit-bindgen-core", "wit-bindgen-rust", ] [[package]] name = "wit-component" -version = "0.202.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c836b1fd9932de0431c1758d8be08212071b6bba0151f7bac826dbc4312a2a9" +checksum = "73ccedf54cc65f287da268d64d2bf4f7530d2cfb2296ffbe3ad5f65567e4cf53" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -4620,9 +4622,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.202.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc" +checksum = "5b7117ce3adc0b4354b46dc1cf3190b00b333e65243d244c613ffcc58bdec84d" dependencies = [ "anyhow", "id-arena", @@ -4682,7 +4684,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] @@ -4702,7 +4704,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.90", ] [[package]] diff --git a/src/build/mod.rs b/src/build/mod.rs index 24432c40..487faac2 100644 --- a/src/build/mod.rs +++ b/src/build/mod.rs @@ -41,7 +41,7 @@ const KINODE_WIT_0_8_0_URL: &str = "https://raw.githubusercontent.com/kinode-dao/kinode-wit/v0.8/kinode.wit"; const KINODE_WIT_1_0_0_URL: &str = "https://raw.githubusercontent.com/kinode-dao/kinode-wit/v1.0.0/kinode.wit"; -const WASI_VERSION: &str = "19.0.1"; // TODO: un-hardcode +const WASI_VERSION: &str = "27.0.0"; // TODO: un-hardcode const DEFAULT_WORLD_0_7_0: &str = "process"; const DEFAULT_WORLD_0_8_0: &str = "process-v0"; const KINODE_PROCESS_LIB_CRATE_NAME: &str = "kinode_process_lib"; From 9670a063739b4a681a0f71d5d648f594816d200c Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 17 Dec 2024 10:57:29 -0800 Subject: [PATCH 10/17] allow building non-simulation mode packages --- src/boot_fake_node/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index 2a1c1599..91015c41 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -80,14 +80,14 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> info!("Compiling Kinode runtime..."); // build the packages - let args = vec![ + let mut args = vec![ "run", "-p", "build-packages", - "--", - "--features", - "simulation-mode", ]; + if is_simulation_mode { + args.extend_from_slice(&["--", "--features", "simulation-mode"]); + } build::run_command(Command::new("cargo").args(&args).current_dir(path), false)?; // build the runtime From b30653698e2e4e882bc6a89abb49e8e19b7165f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:58:02 +0000 Subject: [PATCH 11/17] Format Rust code using rustfmt --- src/boot_fake_node/mod.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index 91015c41..13df4782 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -80,11 +80,7 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> info!("Compiling Kinode runtime..."); // build the packages - let mut args = vec![ - "run", - "-p", - "build-packages", - ]; + let mut args = vec!["run", "-p", "build-packages"]; if is_simulation_mode { args.extend_from_slice(&["--", "--features", "simulation-mode"]); } From ad9a3dfe95dc8c97149284fe69d21435f8aeaa1b Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 17 Dec 2024 11:11:20 -0800 Subject: [PATCH 12/17] allow building non-simulation mode packages for real --- src/boot_fake_node/mod.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index 13df4782..3d64971b 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -95,16 +95,17 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> args.extend_from_slice(&["--features", "simulation-mode"]); } - build::run_command( - Command::new("cargo") - .env( - "PATH_TO_PACKAGES_ZIP", - "target/packages-simulation-mode.zip", - ) - .args(&args) - .current_dir(path), - false, - )?; + let mut command = Command::new("cargo"); + command + .args(&args) + .current_dir(path); + if is_simulation_mode { + command.env( + "PATH_TO_PACKAGES_ZIP", + "target/packages-simulation-mode.zip", + ); + } + build::run_command(&mut command, false)?; info!("Done compiling Kinode runtime."); Ok(()) From 80042ba0b795e20a73a9a8ef6212def3a2fca579 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 19:11:54 +0000 Subject: [PATCH 13/17] Format Rust code using rustfmt --- src/boot_fake_node/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index 3d64971b..ca0cfc36 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -96,9 +96,7 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> } let mut command = Command::new("cargo"); - command - .args(&args) - .current_dir(path); + command.args(&args).current_dir(path); if is_simulation_mode { command.env( "PATH_TO_PACKAGES_ZIP", From 166d7ea75a21d5fc43854ec2c7877a10cf076b93 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 17 Dec 2024 15:44:30 -0800 Subject: [PATCH 14/17] bump alloy version --- Cargo.lock | 992 +++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 6 +- src/main.rs | 2 +- src/publish/mod.rs | 2 +- 4 files changed, 830 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed255944..190384d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,6 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -67,24 +68,42 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ba1c79677c9ce51c8d45e20845b05e6fb070ea2c863fba03ad6af2c778474bd" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.1.4", + "alloy-core 0.7.7", + "alloy-eips 0.1.4", + "alloy-genesis 0.1.4", + "alloy-json-rpc 0.1.4", + "alloy-provider 0.1.4", + "alloy-rpc-client 0.1.4", + "alloy-rpc-types 0.1.4", + "alloy-serde 0.1.4", + "alloy-transport-http 0.1.4", +] + +[[package]] +name = "alloy" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e1758e5d759c0114140152ae72032eafcfdd7b599e995ebbc8eeafa2b4c977" +dependencies = [ + "alloy-consensus 0.8.1", "alloy-contract", - "alloy-core", - "alloy-eips", - "alloy-genesis", - "alloy-json-rpc", - "alloy-network", - "alloy-provider", + "alloy-core 0.8.15", + "alloy-eips 0.8.1", + "alloy-genesis 0.8.1", + "alloy-json-rpc 0.8.1", + "alloy-network 0.8.1", + "alloy-provider 0.8.1", "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-serde", - "alloy-signer", + "alloy-rpc-client 0.8.1", + "alloy-rpc-types 0.8.1", + "alloy-serde 0.8.1", + "alloy-signer 0.8.1", "alloy-signer-ledger", "alloy-signer-local", "alloy-signer-trezor", - "alloy-transport", - "alloy-transport-http", + "alloy-transport 0.8.1", + "alloy-transport-http 0.8.1", "alloy-transport-ws", ] @@ -104,32 +123,64 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" dependencies = [ - "alloy-eips", - "alloy-primitives", + "alloy-eips 0.1.4", + "alloy-primitives 0.7.7", + "alloy-rlp", + "alloy-serde 0.1.4", + "c-kzg", + "serde", +] + +[[package]] +name = "alloy-consensus" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a205d0cbb7bfdf9f4fd4b0ec842bc4c5f926e8c14ec3072d3fd75dd363baf1e0" +dependencies = [ + "alloy-eips 0.8.1", + "alloy-primitives 0.8.15", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.1", + "alloy-trie", + "auto_impl", "c-kzg", + "derive_more 1.0.0", + "serde", +] + +[[package]] +name = "alloy-consensus-any" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993c34090a3f281cb746fd1604520cf21f8407ffbeb006aaa34c0556bffa718e" +dependencies = [ + "alloy-consensus 0.8.1", + "alloy-eips 0.8.1", + "alloy-primitives 0.8.15", + "alloy-rlp", + "alloy-serde 0.8.1", "serde", ] [[package]] name = "alloy-contract" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dc6957ff706f9e5f6fd42f52a93e4bce476b726c92d077b348de28c4a76730c" +checksum = "aec7945dff98ba68489aa6da455bf66f6c0fee8157df06747fbae7cb03c368e2" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network", - "alloy-primitives", - "alloy-provider", + "alloy-dyn-abi 0.8.15", + "alloy-json-abi 0.8.15", + "alloy-network 0.8.1", + "alloy-network-primitives", + "alloy-primitives 0.8.15", + "alloy-provider 0.8.1", "alloy-pubsub", - "alloy-rpc-types-eth", - "alloy-sol-types", - "alloy-transport", + "alloy-rpc-types-eth 0.8.1", + "alloy-sol-types 0.8.15", + "alloy-transport 0.8.1", "futures", "futures-util", - "thiserror", + "thiserror 2.0.7", ] [[package]] @@ -138,10 +189,23 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-dyn-abi 0.7.7", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-types 0.7.7", +] + +[[package]] +name = "alloy-core" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c618bd382f0bc2ac26a7e4bfae01c9b015ca8f21b37ca40059ae35a7e62b3dc6" +dependencies = [ + "alloy-dyn-abi 0.8.15", + "alloy-json-abi 0.8.15", + "alloy-primitives 0.8.15", + "alloy-rlp", + "alloy-sol-types 0.8.15", ] [[package]] @@ -150,10 +214,27 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", + "alloy-sol-types 0.7.7", + "const-hex", + "itoa", + "serde", + "serde_json", + "winnow 0.6.18", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41056bde53ae10ffbbf11618efbe1e0290859e5eab0fe9ef82ebdb62f12a866f" +dependencies = [ + "alloy-json-abi 0.8.15", + "alloy-primitives 0.8.15", + "alloy-sol-type-parser 0.8.15", + "alloy-sol-types 0.8.15", "const-hex", "itoa", "serde", @@ -161,16 +242,57 @@ dependencies = [ "winnow 0.6.18", ] +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-rlp", + "derive_more 1.0.0", + "serde", +] + [[package]] name = "alloy-eips" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", + "alloy-rlp", + "alloy-serde 0.1.4", + "c-kzg", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-eips" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1d9907c29ce622946759bf4fd3418166bfeae76c1c544b8081c7be3acd9b4be" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives 0.8.15", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.1", "c-kzg", + "derive_more 1.0.0", "once_cell", "serde", "sha2", @@ -182,8 +304,20 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca15afde1b6d15e3fc1c97421262b1bbb37aee45752e3c8b6d6f13f776554ff" dependencies = [ - "alloy-primitives", - "alloy-serde", + "alloy-primitives 0.7.7", + "alloy-serde 0.1.4", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f13f7405a8eb8021258994ed1beab490c3e509ebbe2c18e1c24ae10749d56b" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-serde 0.8.1", + "alloy-trie", "serde", ] @@ -193,8 +327,20 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" dependencies = [ - "alloy-primitives", - "alloy-sol-type-parser", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c357da577dfb56998d01f574d81ad7a1958d248740a7981b205d69d65a7da404" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-sol-type-parser 0.8.15", "serde", "serde_json", ] @@ -205,10 +351,24 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d6f34930b7e3e2744bcc79056c217f00cb2abb33bc5d4ff88da7623c5bb078b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", + "serde", + "serde_json", + "thiserror 1.0.63", + "tracing", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a786ce6bc7539dc30cabac6b7875644247c9e7d780e71a9f254d42ebdc013c" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-sol-types 0.8.15", "serde", "serde_json", - "thiserror", + "thiserror 2.0.7", "tracing", ] @@ -218,18 +378,56 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f6895fc31b48fa12306ef9b4f78b7764f8bd6d7d91cdb0a40e233704a0f23f" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "alloy-signer", - "alloy-sol-types", + "alloy-consensus 0.1.4", + "alloy-eips 0.1.4", + "alloy-json-rpc 0.1.4", + "alloy-primitives 0.7.7", + "alloy-rpc-types-eth 0.1.4", + "alloy-serde 0.1.4", + "alloy-signer 0.1.4", + "alloy-sol-types 0.7.7", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror 1.0.63", +] + +[[package]] +name = "alloy-network" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99051f82f77159d5bee06108f33cffee02849e2861fc500bf74213aa2ae8a26e" +dependencies = [ + "alloy-consensus 0.8.1", + "alloy-consensus-any", + "alloy-eips 0.8.1", + "alloy-json-rpc 0.8.1", + "alloy-network-primitives", + "alloy-primitives 0.8.15", + "alloy-rpc-types-any", + "alloy-rpc-types-eth 0.8.1", + "alloy-serde 0.8.1", + "alloy-signer 0.8.1", + "alloy-sol-types 0.8.15", "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror", + "serde", + "serde_json", + "thiserror 2.0.7", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2aff127863f8279921397be8af0ac3f05a8757d5c4c972b491c278518fa07c7" +dependencies = [ + "alloy-consensus 0.8.1", + "alloy-eips 0.8.1", + "alloy-primitives 0.8.15", + "alloy-serde 0.8.1", + "serde", ] [[package]] @@ -242,15 +440,43 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 0.99.18", + "hex-literal", + "itoa", + "k256", + "keccak-asm", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] +name = "alloy-primitives" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "foldhash", + "hashbrown 0.15.2", "hex-literal", + "indexmap", "itoa", "k256", "keccak-asm", + "paste", "proptest", "rand", "ruint", + "rustc-hash", "serde", + "sha3", "tiny-keccak", ] @@ -261,57 +487,94 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c538bfa893d07e27cb4f3c1ab5f451592b7c526d511d62b576a2ce59e146e4a" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-primitives", + "alloy-consensus 0.1.4", + "alloy-eips 0.1.4", + "alloy-json-rpc 0.1.4", + "alloy-network 0.1.4", + "alloy-primitives 0.7.7", + "alloy-rpc-client 0.1.4", + "alloy-rpc-types-eth 0.1.4", + "alloy-transport 0.1.4", + "alloy-transport-http 0.1.4", + "async-stream", + "async-trait", + "auto_impl", + "dashmap 5.5.3", + "futures", + "futures-utils-wasm", + "lru", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "alloy-provider" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0280a4f68e0cefde9449ee989a248230efbe3f95255299d2a7a92009e154629d" +dependencies = [ + "alloy-chains", + "alloy-consensus 0.8.1", + "alloy-eips 0.8.1", + "alloy-json-rpc 0.8.1", + "alloy-network 0.8.1", + "alloy-network-primitives", + "alloy-primitives 0.8.15", "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types-eth", - "alloy-transport", - "alloy-transport-http", + "alloy-rpc-client 0.8.1", + "alloy-rpc-types-eth 0.8.1", + "alloy-transport 0.8.1", + "alloy-transport-http 0.8.1", "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 6.1.0", "futures", "futures-utils-wasm", "lru", + "parking_lot", "pin-project", "reqwest", + "schnellru", "serde", "serde_json", + "thiserror 2.0.7", "tokio", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-pubsub" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7341322d9bc0e49f6e9fd9f2eb8e30f73806f2dd12cbb3d6bab2694c921f87" +checksum = "9475dc1a835bd8bb77275b6bccf8e177e7e669ba81277ce6bea0016ce994fafe" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-transport", + "alloy-json-rpc 0.8.1", + "alloy-primitives 0.8.15", + "alloy-transport 0.8.1", "bimap", "futures", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.2", "tracing", ] [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "f542548a609dca89fcd72b3b9f355928cf844d4363c5eed9c5273a3dd225e097" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -320,9 +583,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "5a833d97bf8a5f0f878daf2c8451fff7de7f9de38baa5a45d936ec718d81255a" dependencies = [ "proc-macro2", "quote", @@ -335,11 +598,32 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ba31bae67773fd5a60020bea900231f8396202b7feca4d0c70c6b59308ab4a8" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", + "alloy-json-rpc 0.1.4", + "alloy-transport 0.1.4", + "alloy-transport-http 0.1.4", + "futures", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tracing", + "url", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6fc8b0f68619cfab3a2e15dca7b80ab266f78430bb4353dec546528e04b7449" +dependencies = [ + "alloy-json-rpc 0.8.1", + "alloy-primitives 0.8.15", "alloy-pubsub", - "alloy-transport", - "alloy-transport-http", + "alloy-transport 0.8.1", + "alloy-transport-http 0.8.1", "alloy-transport-ws", "futures", "pin-project", @@ -348,9 +632,10 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.2", "tracing", "url", + "wasmtimer", ] [[package]] @@ -359,8 +644,31 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "184a7a42c7ba9141cc9e76368356168c282c3bc3d9e5d78f3556bdfe39343447" dependencies = [ - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.1.4", + "alloy-serde 0.1.4", +] + +[[package]] +name = "alloy-rpc-types" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986f23fe42ac95832901a24b93c20f7ed2b9644394c02b86222801230da60041" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-rpc-types-eth 0.8.1", + "alloy-serde 0.8.1", + "serde", +] + +[[package]] +name = "alloy-rpc-types-any" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e3aa433d3657b42e98e257ee6fa201f5c853245648a33da8fbb7497a5008bf" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth 0.8.1", + "alloy-serde 0.8.1", ] [[package]] @@ -369,16 +677,36 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", + "alloy-consensus 0.1.4", + "alloy-eips 0.1.4", + "alloy-primitives 0.7.7", + "alloy-rlp", + "alloy-serde 0.1.4", + "alloy-sol-types 0.7.7", + "itertools 0.13.0", + "serde", + "serde_json", + "thiserror 1.0.63", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0643cc497a71941f526454fe4fecb47e9307d3a7b6c05f70718a0341643bcc79" +dependencies = [ + "alloy-consensus 0.8.1", + "alloy-consensus-any", + "alloy-eips 0.8.1", + "alloy-network-primitives", + "alloy-primitives 0.8.15", "alloy-rlp", - "alloy-serde", - "alloy-sol-types", + "alloy-serde 0.8.1", + "alloy-sol-types 0.8.15", + "derive_more 1.0.0", "itertools 0.13.0", "serde", "serde_json", - "thiserror", ] [[package]] @@ -387,7 +715,18 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61b049d7ecc66a29f107970dae493d0908e366048f7484a1ca9b02c85f9b2b" +dependencies = [ + "alloy-primitives 0.8.15", "serde", "serde_json", ] @@ -398,63 +737,76 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b33753c09fa1ad85e5b092b8dc2372f1e337a42e84b9b4cff9fede75ba4adb32" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror 1.0.63", +] + +[[package]] +name = "alloy-signer" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93461b0e79c2ddd791fec5f369ab5c2686a33bbb03530144972edf5248f8a2c7" +dependencies = [ + "alloy-primitives 0.8.15", "async-trait", "auto_impl", "elliptic-curve", "k256", - "thiserror", + "thiserror 2.0.7", ] [[package]] name = "alloy-signer-ledger" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575e4c924b23132234c75bd1f8f3871c1bc12ba462f76af9b59249515a38253e" +checksum = "df1ddc0349b2445b9d7821b4d361759b29b72a1ee48fb2601fa47532fbe1ee51" dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", + "alloy-consensus 0.8.1", + "alloy-network 0.8.1", + "alloy-primitives 0.8.15", + "alloy-signer 0.8.1", "async-trait", "coins-ledger", "futures-util", "semver 1.0.23", - "thiserror", + "thiserror 2.0.7", "tracing", ] [[package]] name = "alloy-signer-local" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc9c26fe6c6f1bad818c9a976de9044dd12e1f75f1f156a801ee3e8148c1b6" +checksum = "6f08ec1bfa433f9e9f7c5af05af07e5cf86d27d93170de76b760e63b925f1c9c" dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", + "alloy-consensus 0.8.1", + "alloy-network 0.8.1", + "alloy-primitives 0.8.15", + "alloy-signer 0.8.1", "async-trait", - "elliptic-curve", "eth-keystore", "k256", "rand", - "thiserror", + "thiserror 2.0.7", ] [[package]] name = "alloy-signer-trezor" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd82e86e4a6604fd11f84b170638d16dcdac9db6c2b5f5b91a3941b7e7af7f94" +checksum = "e9c93d03376fd16c960d022954d2ccefbdb82357324b323bc1690823fda7906d" dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-signer", + "alloy-consensus 0.8.1", + "alloy-network 0.8.1", + "alloy-primitives 0.8.15", + "alloy-signer 0.8.1", "async-trait", "semver 1.0.23", - "thiserror", + "thiserror 2.0.7", "tracing", "trezor-client", ] @@ -465,22 +817,35 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", + "alloy-sol-macro-expander 0.7.7", + "alloy-sol-macro-input 0.7.7", "proc-macro-error", "proc-macro2", "quote", "syn 2.0.90", ] +[[package]] +name = "alloy-sol-macro" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" +dependencies = [ + "alloy-sol-macro-expander 0.8.15", + "alloy-sol-macro-input 0.8.15", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "alloy-sol-macro-expander" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" dependencies = [ - "alloy-json-abi", - "alloy-sol-macro-input", + "alloy-sol-macro-input 0.7.7", "const-hex", "heck", "indexmap", @@ -488,7 +853,26 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "syn-solidity", + "syn-solidity 0.7.7", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" +dependencies = [ + "alloy-json-abi 0.8.15", + "alloy-sol-macro-input 0.8.15", + "const-hex", + "heck", + "indexmap", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.90", + "syn-solidity 0.8.15", "tiny-keccak", ] @@ -498,7 +882,22 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" dependencies = [ - "alloy-json-abi", + "const-hex", + "dunce", + "heck", + "proc-macro2", + "quote", + "syn 2.0.90", + "syn-solidity 0.7.7", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" +dependencies = [ + "alloy-json-abi 0.8.15", "const-hex", "dunce", "heck", @@ -506,7 +905,7 @@ dependencies = [ "quote", "serde_json", "syn 2.0.90", - "syn-solidity", + "syn-solidity 0.8.15", ] [[package]] @@ -519,15 +918,37 @@ dependencies = [ "winnow 0.6.18", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73" +dependencies = [ + "serde", + "winnow 0.6.18", +] + [[package]] name = "alloy-sol-types" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-macro", + "alloy-primitives 0.7.7", + "alloy-sol-macro 0.7.7", + "const-hex", + "serde", +] + +[[package]] +name = "alloy-sol-types" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" +dependencies = [ + "alloy-json-abi 0.8.15", + "alloy-primitives 0.8.15", + "alloy-sol-macro 0.8.15", "const-hex", "serde", ] @@ -538,17 +959,37 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01b51a291f949f755e6165c3ed562883175c97423703703355f4faa4b7d0a57c" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.1.4", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror 1.0.63", + "tokio", + "tower 0.4.13", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf656f983e14812df65b5aee37e7b37535f68a848295e6ed736b2054a405cb7" +dependencies = [ + "alloy-json-rpc 0.8.1", "base64 0.22.1", "futures-util", "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.7", "tokio", - "tower", + "tower 0.5.2", "tracing", "url", + "wasmtimer", ] [[package]] @@ -557,23 +998,38 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d65871f9f1cafe1ed25cde2f1303be83e6473e995a2d56c275ae4fcce6119c" dependencies = [ - "alloy-json-rpc", - "alloy-transport", + "alloy-json-rpc 0.1.4", + "alloy-transport 0.1.4", + "reqwest", + "serde_json", + "tower 0.4.13", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec938d51a47b7953b1c0fd8ddeb89a29eb113cd4908dfc4e01c7893b252d669f" +dependencies = [ + "alloy-json-rpc 0.8.1", + "alloy-transport 0.8.1", "reqwest", "serde_json", - "tower", + "tower 0.5.2", "tracing", "url", ] [[package]] name = "alloy-transport-ws" -version = "0.1.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec83fd052684556c78c54df111433493267234d82321c2236560c752f595f20" +checksum = "9fabdf2d18c0c87b6cfcf6a067f1d5a7db378f103faeb16130d6d174c73d006b" dependencies = [ "alloy-pubsub", - "alloy-transport", + "alloy-transport 0.8.1", "futures", "http", "rustls", @@ -584,6 +1040,22 @@ dependencies = [ "ws_stream_wasm", ] +[[package]] +name = "alloy-trie" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5fd8fea044cc9a8c8a50bb6f28e31f0385d820f116c5b98f6f4e55d6e5590b" +dependencies = [ + "alloy-primitives 0.8.15", + "alloy-rlp", + "arrayvec", + "derive_more 1.0.0", + "nybbles", + "serde", + "smallvec", + "tracing", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -783,6 +1255,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "async-stream" @@ -1056,7 +1531,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -1129,9 +1604,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "coins-ledger" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ef757aa936b45f3e5d39c344047f65ef7d25a50067246a498021a816d074b" +checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" dependencies = [ "async-trait", "byteorder", @@ -1143,7 +1618,7 @@ dependencies = [ "log", "nix 0.26.4", "once_cell", - "thiserror", + "thiserror 1.0.63", "tokio", "tracing", "wasm-bindgen", @@ -1185,9 +1660,9 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "const-hex" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if", "cpufeatures", @@ -1307,7 +1782,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1362,6 +1851,27 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1492,7 +2002,7 @@ dependencies = [ "serde_json", "sha2", "sha3", - "thiserror", + "thiserror 1.0.63", "uuid", ] @@ -1561,6 +2071,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1776,6 +2292,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -1786,6 +2308,16 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", + "serde", +] + [[package]] name = "heck" version = "0.5.0" @@ -1942,7 +2474,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2014,12 +2546,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", "serde", ] @@ -2123,10 +2655,10 @@ name = "kinode_process_lib" version = "0.10.0" source = "git+https://github.com/kinode-dao/process_lib.git?rev=2a526c8#2a526c8ab827db27e51b1475f46c2765afed77ef" dependencies = [ - "alloy", - "alloy-primitives", - "alloy-sol-macro", - "alloy-sol-types", + "alloy 0.1.4", + "alloy-primitives 0.7.7", + "alloy-sol-macro 0.7.7", + "alloy-sol-types 0.7.7", "anyhow", "bincode", "http", @@ -2135,7 +2667,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "thiserror", + "thiserror 1.0.63", "url", "wit-bindgen", ] @@ -2144,9 +2676,9 @@ dependencies = [ name = "kit" version = "0.8.3" dependencies = [ - "alloy", - "alloy-sol-macro", - "alloy-sol-types", + "alloy 0.8.1", + "alloy-sol-macro 0.8.15", + "alloy-sol-types 0.8.15", "anyhow", "base64 0.21.7", "cargo_metadata", @@ -2291,7 +2823,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -2480,6 +3012,19 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "nybbles" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95f06be0417d97f81fe4e5c86d7d01b392655a9cac9c19a848aa033e18937b23" +dependencies = [ + "alloy-rlp", + "const-hex", + "proptest", + "serde", + "smallvec", +] + [[package]] name = "object" version = "0.32.2" @@ -2583,6 +3128,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + [[package]] name = "parking_lot_core" version = "0.9.10" @@ -2638,7 +3193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.63", "ucd-trie", ] @@ -2769,6 +3324,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "proc-macro2" version = "1.0.92" @@ -2806,7 +3383,7 @@ checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" dependencies = [ "once_cell", "protobuf-support", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -2815,7 +3392,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" dependencies = [ - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -2848,6 +3425,7 @@ dependencies = [ "libc", "rand_chacha", "rand_core", + "serde", ] [[package]] @@ -2895,7 +3473,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -3109,6 +3687,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -3238,6 +3822,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "schnellru" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3469,6 +4064,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -3579,6 +4177,18 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "syn-solidity" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -3634,7 +4244,16 @@ version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.63", +] + +[[package]] +name = "thiserror" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +dependencies = [ + "thiserror-impl 2.0.7", ] [[package]] @@ -3648,6 +4267,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "thiserror-impl" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -3785,9 +4415,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", @@ -3873,6 +4503,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -3904,7 +4548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.63", "time", "tracing-subscriber", ] @@ -3984,15 +4628,15 @@ dependencies = [ [[package]] name = "trezor-client" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f62c95b37f6c769bd65a0d0beb8b2b003e72998003b896a616a6777c645c05ed" +checksum = "10636211ab89c96ed2824adc5ec0d081e1080aeacc24c37abb318dcb31dcc779" dependencies = [ "byteorder", "hex", "protobuf", "rusb", - "thiserror", + "thiserror 1.0.63", "tracing", ] @@ -4004,9 +4648,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes", @@ -4018,7 +4662,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.63", "utf-8", ] @@ -4280,11 +4924,25 @@ checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "semver 1.0.23", ] +[[package]] +name = "wasmtimer" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "slab", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.70" @@ -4651,7 +5309,7 @@ dependencies = [ "pharos", "rustc_version 0.4.0", "send_wrapper", - "thiserror", + "thiserror 1.0.63", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", diff --git a/Cargo.toml b/Cargo.toml index baf2d6e4..ff3e79a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ anyhow = "1.0" git2 = "0.18" [dependencies] -alloy = { version = "0.1.3", features = [ +alloy = { version = "0.8.1", features = [ "consensus", "contract", "json-rpc", @@ -32,8 +32,8 @@ alloy = { version = "0.1.3", features = [ "signer-local", "signer-trezor", ] } -alloy-sol-macro = "0.7.6" -alloy-sol-types = "0.7.6" +alloy-sol-macro = "0.8.15" +alloy-sol-types = "0.8.15" base64 = "0.21" cargo_metadata = "0.18" chrono = "0.4" diff --git a/src/main.rs b/src/main.rs index b3a7dcfe..0a28e59e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -378,7 +378,7 @@ async fn execute( let rpc_uri = matches.get_one::("RPC_URI").unwrap(); let real = matches.get_one::("REAL").unwrap(); let unpublish = matches.get_one::("UNPUBLISH").unwrap(); - let gas_limit = matches.get_one::("GAS_LIMIT").unwrap(); + let gas_limit = matches.get_one::("GAS_LIMIT").unwrap(); let max_priority_fee = matches .get_one::("MAX_PRIORITY_FEE_PER_GAS") .and_then(|mpf| Some(mpf.clone())); diff --git a/src/publish/mod.rs b/src/publish/mod.rs index 3b1d07ba..7355ab20 100644 --- a/src/publish/mod.rs +++ b/src/publish/mod.rs @@ -314,7 +314,7 @@ pub async fn execute( rpc_uri: &str, real: &bool, unpublish: &bool, - gas_limit: u128, + gas_limit: u64, max_priority_fee_per_gas: Option, max_fee_per_gas: Option, ) -> Result<()> { From 9a13bc7cc2958531b0260349b11657c03a91f9c7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 23:45:05 +0000 Subject: [PATCH 15/17] Format Rust code using rustfmt --- src/boot_fake_node/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/boot_fake_node/mod.rs b/src/boot_fake_node/mod.rs index 3d64971b..ca0cfc36 100644 --- a/src/boot_fake_node/mod.rs +++ b/src/boot_fake_node/mod.rs @@ -96,9 +96,7 @@ pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> } let mut command = Command::new("cargo"); - command - .args(&args) - .current_dir(path); + command.args(&args).current_dir(path); if is_simulation_mode { command.env( "PATH_TO_PACKAGES_ZIP", From 3ac6d935b66144de420c423be7bb679185696762 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Thu, 19 Dec 2024 11:40:41 -0800 Subject: [PATCH 16/17] update process_lib & process_macros deps --- Cargo.toml | 2 +- src/new/templates/javascript/no-ui/chat/send/Cargo.toml | 2 +- .../javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml | 4 ++-- .../javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml | 4 ++-- .../fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml | 4 ++-- .../python/no-ui/chat/test/chat_test/chat_test/Cargo.toml | 4 ++-- .../python/no-ui/echo/test/echo_test/echo_test/Cargo.toml | 4 ++-- .../fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/blank/blank/Cargo.toml | 2 +- src/new/templates/rust/no-ui/chat/chat/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/chat/send/Cargo.toml | 2 +- .../rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/echo/echo/Cargo.toml | 4 ++-- .../rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml | 4 ++-- src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml | 2 +- .../fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml | 4 ++-- .../templates/rust/no-ui/file-transfer/download/Cargo.toml | 4 ++-- .../no-ui/file-transfer/file-transfer-worker-api/Cargo.toml | 4 ++-- .../rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml | 4 ++-- .../rust/no-ui/file-transfer/file-transfer/Cargo.toml | 4 ++-- .../templates/rust/no-ui/file-transfer/list-files/Cargo.toml | 4 ++-- .../test/file-transfer-test/file-transfer-test/Cargo.toml | 4 ++-- src/new/templates/rust/ui/chat/chat/Cargo.toml | 2 +- 24 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ff3e79a6..88a37072 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ color-eyre = { version = "0.6", features = ["capture-spantrace"] } dirs = "5.0" fs-err = "2.11" hex = "0.4" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "75d3f10" } nix = { version = "0.27", features = ["process", "signal", "term"] } regex = "1" reqwest = { version = "0.12", features = ["json"] } diff --git a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml index 0e3ebecf..98b300f8 100644 --- a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml index f52bfb69..3409c1b2 100644 --- a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml index 4d7a87ae..1412a8a4 100644 --- a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 2dfba20a..1b0383e6 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml index f52bfb69..3409c1b2 100644 --- a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml index 4d7a87ae..1412a8a4 100644 --- a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 2dfba20a..1b0383e6 100644 --- a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml index adba17ef..917114f2 100644 --- a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml +++ b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml index 46f9696d..cc13a20e 100644 --- a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/chat/send/Cargo.toml b/src/new/templates/rust/no-ui/chat/send/Cargo.toml index 0e3ebecf..98b300f8 100644 --- a/src/new/templates/rust/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/send/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml index 443ce8d9..b137b216 100644 --- a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml index c8661be2..2116ec26 100644 --- a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml index 460b5d76..43a15838 100644 --- a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml index 1a68f78b..4fbf9f0f 100644 --- a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml index 9a680a73..f5a42209 100644 --- a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml index 72829a7a..f39f0b97 100644 --- a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml index 770af5cd..23428af5 100644 --- a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml index 985ea365..d7b5902a 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml index 0f8dbf5c..2cdf5203 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml index 8c3c3eea..50d884b1 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8", features = ["logging"] } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml index 10607023..92f349ca 100644 --- a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml index b9d5cc24..257d5e51 100644 --- a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml @@ -7,8 +7,8 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } -process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/ui/chat/chat/Cargo.toml b/src/new/templates/rust/ui/chat/chat/Cargo.toml index 92155c77..bd87e499 100644 --- a/src/new/templates/rust/ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/ui/chat/chat/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "2a526c8" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" From 07f92e29d56cd5789f44874ce34d1164d0fa067e Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Fri, 27 Dec 2024 17:36:53 -0800 Subject: [PATCH 17/17] bump versions; fix compiler warnings --- Cargo.lock | 5 +-- Cargo.toml | 2 +- src/build/rewrite.rs | 34 ++++++++----------- .../javascript/no-ui/chat/metadata.json | 1 + .../javascript/no-ui/chat/send/Cargo.toml | 2 +- .../chat/test/chat_test/chat_test/Cargo.toml | 2 +- .../javascript/no-ui/echo/metadata.json | 1 + .../echo/test/echo_test/echo_test/Cargo.toml | 2 +- .../javascript/no-ui/fibonacci/metadata.json | 1 + .../fibonacci_test/fibonacci_test/Cargo.toml | 2 +- .../templates/python/no-ui/chat/metadata.json | 1 + .../chat/test/chat_test/chat_test/Cargo.toml | 2 +- .../templates/python/no-ui/echo/metadata.json | 1 + .../echo/test/echo_test/echo_test/Cargo.toml | 2 +- .../python/no-ui/fibonacci/metadata.json | 1 + .../fibonacci_test/fibonacci_test/Cargo.toml | 2 +- .../rust/no-ui/blank/blank/Cargo.toml | 2 +- .../templates/rust/no-ui/chat/chat/Cargo.toml | 2 +- .../rust/no-ui/chat/pkg/scripts.json | 2 +- .../templates/rust/no-ui/chat/send/Cargo.toml | 2 +- .../chat/test/chat-test/chat-test/Cargo.toml | 2 +- .../templates/rust/no-ui/echo/echo/Cargo.toml | 2 +- .../echo/test/echo-test/echo-test/Cargo.toml | 2 +- .../rust/no-ui/fibonacci/fibonacci/Cargo.toml | 2 +- .../rust/no-ui/fibonacci/number/Cargo.toml | 2 +- .../rust/no-ui/fibonacci/pkg/scripts.json | 2 +- .../fibonacci-test/fibonacci-test/Cargo.toml | 2 +- .../no-ui/file-transfer/download/Cargo.toml | 2 +- .../file-transfer-worker-api/Cargo.toml | 2 +- .../file-transfer-worker/Cargo.toml | 2 +- .../file-transfer/file-transfer/Cargo.toml | 2 +- .../no-ui/file-transfer/list-files/Cargo.toml | 2 +- .../rust/no-ui/file-transfer/pkg/scripts.json | 4 +-- .../file-transfer-test/Cargo.toml | 2 +- .../rust/ui/chat/api/chat:template.os-v0.wit | 2 +- .../templates/rust/ui/chat/chat/Cargo.toml | 2 +- .../api/chat_test:template.os-v0.wit | 2 +- .../chat/test/chat-test/chat-test/Cargo.toml | 2 +- .../rust/ui/chat/test/chat-test/metadata.json | 2 +- 39 files changed, 55 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4f2210f..fbaee9d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2257,8 +2257,9 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib.git?rev=75d3f10#75d3f108c1bd40410263fd50b5c383f5f5f7df2a" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46830129ca3814865519615f1d4e4c1e9894c9df50be38a6c8069572e9cc1530" dependencies = [ "alloy", "alloy-primitives", diff --git a/Cargo.toml b/Cargo.toml index a588de42..e98ba996 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ color-eyre = { version = "0.6", features = ["capture-spantrace"] } dirs = "5.0" fs-err = "2.11" hex = "0.4" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib.git", rev = "75d3f10" } +kinode_process_lib = "0.10.1" nix = { version = "0.27", features = ["process", "signal", "term"] } proc-macro2 = "1.0" regex = "1" diff --git a/src/build/rewrite.rs b/src/build/rewrite.rs index e43c4508..df6dc251 100644 --- a/src/build/rewrite.rs +++ b/src/build/rewrite.rs @@ -4,11 +4,7 @@ use std::path::{Path, PathBuf}; use color_eyre::{eyre::eyre, Result}; use fs_err as fs; use regex::Regex; -use syn::{ - __private::ToTokens, - parse_str, - visit::{self, Visit}, -}; +use syn::{__private::ToTokens, parse_str}; use toml_edit; use tracing::{debug, instrument}; @@ -97,8 +93,6 @@ enum SpawnParseError { #[error("Spawn parse failed due to malformed closure: no opening paren `(`")] NoOpeningParen, #[error("Spawn parse failed due to malformed closure: no opening bracket `[`")] - NoOpeningBracket, - #[error("Spawn parse failed due to malformed closure: unclosed brace `{{`")] UnclosedBrace, #[error("Spawn parse failed due to malformed closure: unclosed paren `(`")] UnclosedParen, @@ -584,17 +578,17 @@ fn generate_worker_process( ) -> Result { let mut needed_fns = HashSet::new(); - // Get return type if it's a function call - let return_type = match &spawn_match.spawn_type { - SpawnType::FnCall { name, .. } => { - if let Some(fn_info) = functions.get(name) { - fn_info.signature.ret.clone() - } else { - None - } - } - SpawnType::Closure { .. } => None, // Closures don't have return types in our context - }; + //// Get return type if it's a function call + //let return_type = match &spawn_match.spawn_type { + // SpawnType::FnCall { name, .. } => { + // if let Some(fn_info) = functions.get(name) { + // fn_info.signature.ret.clone() + // } else { + // None + // } + // } + // SpawnType::Closure { .. } => None, // Closures don't have return types in our context + //}; // Get list of functions we need to copy match &spawn_match.spawn_type { @@ -734,7 +728,7 @@ fn rewrite_rust_file( let parsed_signature = parse_fn_signature(args)?; (args_name, parsed_signature) } - SpawnType::FnCall { name, args } => { + SpawnType::FnCall { name, args: _ } => { let fn_info = functions .get(name) .ok_or_else(|| eyre!("Function {name} not found in parent"))?; @@ -776,7 +770,7 @@ fn rewrite_rust_file( // Create replacement spawn code with appropriate args instantiation let args_instance = match &spawn_match.spawn_type { - SpawnType::Closure { args, .. } => { + SpawnType::Closure { .. } => { // For closures, use the argument names directly generate_args_struct_instance(&args_name, &parsed_signature.args) } diff --git a/src/new/templates/javascript/no-ui/chat/metadata.json b/src/new/templates/javascript/no-ui/chat/metadata.json index 2a864fd5..8f9795c5 100644 --- a/src/new/templates/javascript/no-ui/chat/metadata.json +++ b/src/new/templates/javascript/no-ui/chat/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml index 98b300f8..3cb6e1bc 100644 --- a/src/new/templates/javascript/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/send/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml index 3409c1b2..2e7d4ceb 100644 --- a/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/javascript/no-ui/echo/metadata.json b/src/new/templates/javascript/no-ui/echo/metadata.json index 232e5343..354570c0 100644 --- a/src/new/templates/javascript/no-ui/echo/metadata.json +++ b/src/new/templates/javascript/no-ui/echo/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml index 1412a8a4..29a72277 100644 --- a/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/javascript/no-ui/fibonacci/metadata.json b/src/new/templates/javascript/no-ui/fibonacci/metadata.json index b5157157..14aec060 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/metadata.json +++ b/src/new/templates/javascript/no-ui/fibonacci/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 1b0383e6..fe6da631 100644 --- a/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/javascript/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/python/no-ui/chat/metadata.json b/src/new/templates/python/no-ui/chat/metadata.json index 2a864fd5..8f9795c5 100644 --- a/src/new/templates/python/no-ui/chat/metadata.json +++ b/src/new/templates/python/no-ui/chat/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml index 3409c1b2..2e7d4ceb 100644 --- a/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml +++ b/src/new/templates/python/no-ui/chat/test/chat_test/chat_test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/python/no-ui/echo/metadata.json b/src/new/templates/python/no-ui/echo/metadata.json index 232e5343..354570c0 100644 --- a/src/new/templates/python/no-ui/echo/metadata.json +++ b/src/new/templates/python/no-ui/echo/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml index 1412a8a4..29a72277 100644 --- a/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml +++ b/src/new/templates/python/no-ui/echo/test/echo_test/echo_test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/python/no-ui/fibonacci/metadata.json b/src/new/templates/python/no-ui/fibonacci/metadata.json index b5157157..14aec060 100644 --- a/src/new/templates/python/no-ui/fibonacci/metadata.json +++ b/src/new/templates/python/no-ui/fibonacci/metadata.json @@ -10,6 +10,7 @@ "code_hashes": { "0.1.0": "" }, + "wit_version": 1, "dependencies": [] }, "external_url": "", diff --git a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml index 1b0383e6..fe6da631 100644 --- a/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml +++ b/src/new/templates/python/no-ui/fibonacci/test/fibonacci_test/fibonacci_test/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml index 917114f2..e5bdf3e5 100644 --- a/src/new/templates/rust/no-ui/blank/blank/Cargo.toml +++ b/src/new/templates/rust/no-ui/blank/blank/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml index cc13a20e..17a7c4a0 100644 --- a/src/new/templates/rust/no-ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/chat/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/chat/pkg/scripts.json b/src/new/templates/rust/no-ui/chat/pkg/scripts.json index 1c1e9fbe..8186ad93 100644 --- a/src/new/templates/rust/no-ui/chat/pkg/scripts.json +++ b/src/new/templates/rust/no-ui/chat/pkg/scripts.json @@ -7,6 +7,6 @@ "grant_capabilities": [ "chat:chat:template.os" ], - "wit_version": 0 + "wit_version": 1 } } diff --git a/src/new/templates/rust/no-ui/chat/send/Cargo.toml b/src/new/templates/rust/no-ui/chat/send/Cargo.toml index 98b300f8..3cb6e1bc 100644 --- a/src/new/templates/rust/no-ui/chat/send/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/send/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml index b137b216..7ce4b3cd 100644 --- a/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/chat/test/chat-test/chat-test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml index 2116ec26..dbd1330b 100644 --- a/src/new/templates/rust/no-ui/echo/echo/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/echo/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml index 43a15838..213470e0 100644 --- a/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/echo/test/echo-test/echo-test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml index 4fbf9f0f..052dfce1 100644 --- a/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/fibonacci/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml index f5a42209..6e88a53f 100644 --- a/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.36.0" diff --git a/src/new/templates/rust/no-ui/fibonacci/pkg/scripts.json b/src/new/templates/rust/no-ui/fibonacci/pkg/scripts.json index 28a7d99b..c784bb55 100644 --- a/src/new/templates/rust/no-ui/fibonacci/pkg/scripts.json +++ b/src/new/templates/rust/no-ui/fibonacci/pkg/scripts.json @@ -7,6 +7,6 @@ "grant_capabilities": [ "fibonacci:fibonacci:template.os" ], - "wit_version": 0 + "wit_version": 1 } } diff --git a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml index f39f0b97..42d52c25 100644 --- a/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/fibonacci/test/fibonacci-test/fibonacci-test/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml index 23428af5..d262f26d 100644 --- a/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/download/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml index d7b5902a..040a9cfe 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker-api/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml index 2cdf5203..1c6c759a 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer-worker/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml index 3e384b65..ef8a8a5e 100644 --- a/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/file-transfer/Cargo.toml @@ -9,7 +9,7 @@ test = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml index 92f349ca..6ec051df 100644 --- a/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/list-files/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/no-ui/file-transfer/pkg/scripts.json b/src/new/templates/rust/no-ui/file-transfer/pkg/scripts.json index 80906bfc..159d34a9 100644 --- a/src/new/templates/rust/no-ui/file-transfer/pkg/scripts.json +++ b/src/new/templates/rust/no-ui/file-transfer/pkg/scripts.json @@ -7,7 +7,7 @@ "grant_capabilities": [ "file-transfer:file-transfer:template.os" ], - "wit_version": 0 + "wit_version": 1 }, "list-files.wasm": { "root": false, @@ -17,6 +17,6 @@ "grant_capabilities": [ "file-transfer:file-transfer:template.os" ], - "wit_version": 0 + "wit_version": 1 } } diff --git a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml index 8792f17b..a78bf440 100644 --- a/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml +++ b/src/new/templates/rust/no-ui/file-transfer/test/file-transfer-test/file-transfer-test/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10" } +kinode_process_lib = "0.10.1" process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/ui/chat/api/chat:template.os-v0.wit b/src/new/templates/rust/ui/chat/api/chat:template.os-v0.wit index d883229b..5ec0cff8 100644 --- a/src/new/templates/rust/ui/chat/api/chat:template.os-v0.wit +++ b/src/new/templates/rust/ui/chat/api/chat:template.os-v0.wit @@ -23,5 +23,5 @@ interface chat { world chat-template-dot-os-v0 { import chat; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/ui/chat/chat/Cargo.toml b/src/new/templates/rust/ui/chat/chat/Cargo.toml index d9f3d06d..b22d3b47 100644 --- a/src/new/templates/rust/ui/chat/chat/Cargo.toml +++ b/src/new/templates/rust/ui/chat/chat/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "75d3f10", features = ["logging"] } +kinode_process_lib = { version = "0.10.1", features = ["logging"] } process_macros = "0.1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/new/templates/rust/ui/chat/test/chat-test/api/chat_test:template.os-v0.wit b/src/new/templates/rust/ui/chat/test/chat-test/api/chat_test:template.os-v0.wit index c87f01eb..731256ee 100644 --- a/src/new/templates/rust/ui/chat/test/chat-test/api/chat_test:template.os-v0.wit +++ b/src/new/templates/rust/ui/chat/test/chat-test/api/chat_test:template.os-v0.wit @@ -1,5 +1,5 @@ world chat-test-template-dot-os-v0 { import chat; import tester; - include process-v0; + include process-v1; } diff --git a/src/new/templates/rust/ui/chat/test/chat-test/chat-test/Cargo.toml b/src/new/templates/rust/ui/chat/test/chat-test/chat-test/Cargo.toml index 1c280c2c..75bd2693 100644 --- a/src/new/templates/rust/ui/chat/test/chat-test/chat-test/Cargo.toml +++ b/src/new/templates/rust/ui/chat/test/chat-test/chat-test/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] anyhow = "1.0" bincode = "1.3" -kinode_process_lib = "0.9.2" +kinode_process_lib = "0.10.1" process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rmp-serde = "1.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/new/templates/rust/ui/chat/test/chat-test/metadata.json b/src/new/templates/rust/ui/chat/test/chat-test/metadata.json index 0d0d5a63..23c66111 100644 --- a/src/new/templates/rust/ui/chat/test/chat-test/metadata.json +++ b/src/new/templates/rust/ui/chat/test/chat-test/metadata.json @@ -10,7 +10,7 @@ "code_hashes": { "0.1.0": "" }, - "wit_version": 0, + "wit_version": 1, "dependencies": [ "chat:template.os", "tester:sys"