From 4b5bef83e22a52394b1c5411c2a22d296225eee1 Mon Sep 17 00:00:00 2001 From: zed tan Date: Tue, 12 Sep 2023 16:19:14 +0200 Subject: [PATCH 01/21] [#253] clean up INSTALL.md - Added `Install` section to group debian and rpm installs. - Re-added `
`s -- they're used to break the `_Explanation:_` blocks to the next line. My personal preference is to _not_ use `
`s in docs, but i didn't want to change too many things here. - Shortened titles `Add the repo to a Debian ...` and `... Fedora ...` to keep it super concise and decoupled from actual steps - Some formatting best-practices - newlines between markdown blocks - indent code blocks that belong to bullet points to make sure that they are syntatically grouped (i.e. correct markdown 'DOM' hierarchy) - sudo: - Removed `sudo` explanations. `apt/dnf/yum` will not run without, no need to explain. - added `sudo` to RPM instruction code blocks (just those two) for consistency, and also you can't run dnf/yum without root anyway. - Made generic "Fedora based" instructions. Actually YUM/DNF-based, keeping it simple for now. Also name-dropped common distros for SEO/CTRL+F convenience - Removed certain `Explanation` blocks for concision. Some are repeated, and some step titles are already self-explanatory --- INSTALL.md | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 9e77462a..d3a104fd 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -4,9 +4,11 @@ These network support nodes are heavier than the node a user would establish on their phone in the form of a chat or social media application. A cloud based virtual private server (VPS), such as Digital Ocean Droplets or AWS EC2, with high bandwidth, processing resources, and uptime availability is crucial for building the fast, secure, and private routing that Veilid is built to provide. -### Add the repo to a Debian based system and install a Veilid node +## Install -This is a multi-step process. +### Debian + +Follow the steps here to add the repo to a Debian based system and install Veilid. **Step 1**: Add the GPG keys to your operating systems keyring. *Explanation*: The `wget` command downloads the public key, and the `sudo gpg` command adds the public key to the keyring. @@ -15,52 +17,59 @@ This is a multi-step process. wget -O- https://packages.veilid.net/gpg/veilid-packages-key.public | sudo gpg --dearmor -o /usr/share/keyrings/veilid-packages-keyring.gpg ``` -**Step 2**: Identify your architecture +**Step 2**: Identify your architecture
*Explanation*: The following command will tell you what type of CPU your system is running ```shell dpkg --print-architecture ``` -**Step 3**: Add Veilid to your list of available software. -*Explanation*: Using the command in **Step 2** you will need to run **one** of the following: +**Step 3**: Add Veilid to your list of available software.
+*Explanation*: Use the result of your command in **Step 2** and run **one** of the following: - For **AMD64** based systems run this command: -```shell -echo "deb [arch=amd64 signed-by=/usr/share/keyrings/veilid-packages-keyring.gpg] https://packages.veilid.net/apt stable main" | sudo tee /etc/apt/sources.list.d/veilid.list 1>/dev/null -``` + ```shell + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/veilid-packages-keyring.gpg] https://packages.veilid.net/apt stable main" | sudo tee /etc/apt/sources.list.d/veilid.list 1>/dev/null + ``` - For **ARM64** based systems run this command: -```shell -echo "deb [arch=arm64 signed-by=/usr/share/keyrings/veilid-packages-keyring.gpg] https://packages.veilid.net/apt stable main" | sudo tee /etc/apt/sources.list.d/veilid.list 1>/dev/null -``` + ```shell + echo "deb [arch=arm64 signed-by=/usr/share/keyrings/veilid-packages-keyring.gpg] https://packages.veilid.net/apt stable main" | sudo tee /etc/apt/sources.list.d/veilid.list 1>/dev/null + ``` *Explanation*: Each of the above commands will create a new file called `veilid.list` in the `/etc/apt/sources.list.d/`. This file contains instructions that tell the operating system where to download Veilid. -**Step 4**: Refresh the package manager. -*Explanation*: This tells the `apt` package manager to rebuild the list of available software using the files in `/etc/apt/sources.list.d/` directory. This is invoked with "sudo" to grant superuser permission to make the changes. +**Step 4**: Refresh the package manager.
+*Explanation*: This tells the `apt` package manager to rebuild the list of available software using the files in `/etc/apt/sources.list.d/` directory. ```shell sudo apt update ``` **Step 5**: Install Veilid. -*Explanation*: With the package manager updated, it is now possible to install Veilid! This is invoked with "sudo" to grant superuser permission to make the changes. ```shell sudo apt install veilid-server veilid-cli ``` -### Add the repo to a Fedora based system and install a Veilid node +### RPM-based + +Follow the steps here to add the repo to +RPM-based systems (CentOS, Rocky Linux, AlmaLinux, Fedora, etc.) +and install Veilid. **Step 1**: Add Veilid to your list of available software. -*Explanation*: With the package manager updated, it is now possible to install Veilid! ```shell -yum-config-manager --add-repo https://packages.veilid.net/rpm/veilid-rpm-repo.repo +sudo yum-config-manager --add-repo https://packages.veilid.net/rpm/veilid-rpm-repo.repo +``` +**Step 2**: Install Veilid. + +```shell +sudo dnf install veilid-server veilid-cli ``` **Step 2**: Install Veilid. From a3e3ab8ab5b3267cee8e1c5cd634605e61305caa Mon Sep 17 00:00:00 2001 From: zed tan Date: Mon, 11 Sep 2023 22:21:40 +0200 Subject: [PATCH 02/21] [#253] add instructions to run veilid node Added instructions to: - Run a veilid node with systemd - add instructions for getting veilid to start at boot - Manually run a veilid node, because users may use platforms without systemd available. Changes: - Changed title to include run - Added `systemctl start ...` instructions - Added heavily caveated instructions to run veilid-server manually --- INSTALL.md | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index d3a104fd..e30ef149 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -# Install a Veilid Node +# Install and run a Veilid Node ## Server Grade Headless Nodes @@ -72,9 +72,31 @@ sudo yum-config-manager --add-repo https://packages.veilid.net/rpm/veilid-rpm-re sudo dnf install veilid-server veilid-cli ``` -**Step 2**: Install Veilid. -*Explanation*: With the package manager updated, it is now possible to install Veilid! +## Start headless node + +To start a headless Veilid node, run as root: ```shell -dnf install veilid-server veilid-cli +systemctl start veilid-server.service ``` + +To have your Veilid node start at boot: + +```shell +systemctl enable --now veilid-server.service +``` + +> **Not recommended:** +> In cases where you must run `veilid-server` +> without `systemd` (e.g., systems that use OpenRC, or containers), +> you _must_ run the `veilid-server` +> as the `veilid` user. +> Do this manually by running as root: +> +> ```shell +> # Force-allow login by setting shell +> usermod -s /bin/bash veilid +> # Run veilid-server as veilid user +> # Note that by default, veilid user is still passwordless. +> sudo -u veilid veilid-server +> ``` From 61a77461647b3e9e5ec073ae739982e304512d6c Mon Sep 17 00:00:00 2001 From: Rivka Segan <15526879-rivkasegan@users.noreply.gitlab.com> Date: Fri, 15 Sep 2023 18:24:25 +0000 Subject: [PATCH 03/21] =?UTF-8?q?Require=20Cap=E2=80=99n=20Proto=201.0.1?= =?UTF-8?q?=20on=20Windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes the Windows instructions to specify capnproto-c++-win32-1.0.1. Previously, users may have been trying to use Veilid with 0.10.4, especially in the common case of using the winget package manager. Also, the suggested Protocol Buffers version is updated to 24.3, and a note is added about rustup behavior on Windows machines that have never previously been used for development. --- DEVELOPMENT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index d84303bc..5b738d24 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -148,11 +148,11 @@ For a simple installation allowing Rust development, follow these steps: Install Git from -Install Rust from +Install Rust from (this may prompt you to run the Visual Studio Installer, and reboot, before proceeding). -Ensure that protoc.exe is in a directory in your path. For example, it can be obtained from +Ensure that protoc.exe is in a directory in your path. For example, it can be obtained from -Ensure that capnp.exe is in a directory in your path. For example, it can be obtained from +Ensure that capnp.exe (for Cap’n Proto 1.0.1) is in a directory in your path. For example, it can be obtained from the distribution. Please note that the Windows Package Manager Community Repository (i.e., winget) as of 2023-09-15 has version 0.10.4, which is not sufficient. Start a Command Prompt window. From 34b4419859997c612d3e51075a302941e38ef550 Mon Sep 17 00:00:00 2001 From: zed tan Date: Fri, 15 Sep 2023 22:38:32 +0200 Subject: [PATCH 04/21] [#253] implement feedback for INSTALL.md - re-add one missing `
` - add `sudo` to `systemctl` commands - removed quoted/admonished section for running veilid-server directly - instead, made 'With systemd' and 'Without systemd' sub-sections, with instructions - removed extraneous instructions to `usermod` to allow login for `veilid` user --- INSTALL.md | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e30ef149..cc574352 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,7 +10,7 @@ These network support nodes are heavier than the node a user would establish on Follow the steps here to add the repo to a Debian based system and install Veilid. -**Step 1**: Add the GPG keys to your operating systems keyring. +**Step 1**: Add the GPG keys to your operating systems keyring.
*Explanation*: The `wget` command downloads the public key, and the `sudo gpg` command adds the public key to the keyring. ```shell @@ -74,29 +74,26 @@ sudo dnf install veilid-server veilid-cli ## Start headless node -To start a headless Veilid node, run as root: +### With systemd + +To start a headless Veilid node, run: ```shell -systemctl start veilid-server.service +sudo systemctl start veilid-server.service ``` -To have your Veilid node start at boot: +To have your headless Veilid node start at boot: ```shell -systemctl enable --now veilid-server.service +sudo systemctl enable --now veilid-server.service ``` -> **Not recommended:** -> In cases where you must run `veilid-server` -> without `systemd` (e.g., systems that use OpenRC, or containers), -> you _must_ run the `veilid-server` -> as the `veilid` user. -> Do this manually by running as root: -> -> ```shell -> # Force-allow login by setting shell -> usermod -s /bin/bash veilid -> # Run veilid-server as veilid user -> # Note that by default, veilid user is still passwordless. -> sudo -u veilid veilid-server -> ``` +### Without systemd + +`veilid-server` must be run as the `veilid` user. + +To start your headless Veilid node without systemd, run: + +```shell +sudo -u veilid veilid-server +``` From c01be8f62d8510f622f31e89b7d260a69c97f4dc Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Fri, 15 Sep 2023 11:45:12 -0400 Subject: [PATCH 05/21] capnp and protoc versioning --- .capnp_version | 1 + .earthlyignore | 4 - .protoc_version | 1 + Cargo.lock | 17 +++- Earthfile | 4 +- dev-setup/setup_windows.bat | 4 +- scripts/earthly/install_capnproto.sh | 9 +- scripts/earthly/install_protoc.sh | 21 +++- veilid-core/Cargo.toml | 4 +- veilid-core/build.rs | 98 +++++++++++++++++++ .../src/rpc_processor/coders/dial_info.rs | 18 +++- 11 files changed, 155 insertions(+), 26 deletions(-) create mode 100644 .capnp_version create mode 100644 .protoc_version diff --git a/.capnp_version b/.capnp_version new file mode 100644 index 00000000..7f207341 --- /dev/null +++ b/.capnp_version @@ -0,0 +1 @@ +1.0.1 \ No newline at end of file diff --git a/.earthlyignore b/.earthlyignore index 3523db04..c5e19354 100644 --- a/.earthlyignore +++ b/.earthlyignore @@ -1,8 +1,4 @@ .vscode .git -external/keyring-manager/android_test/.gradle -external/keyring-manager/android_test/app/build -external/keyring-manager/android_test/build -external/keyring-manager/android_test/local.properties target veilid-core/pkg diff --git a/.protoc_version b/.protoc_version new file mode 100644 index 00000000..ed18113a --- /dev/null +++ b/.protoc_version @@ -0,0 +1 @@ +24.3 \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 1883fa09..076c129f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -829,15 +829,18 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "capnp" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e65021d89250bbfe7c2791789ced2c4bdc21b0e8bb59c64f3fd6145a5fd678" +checksum = "9eddbd729bd9742aa22d29e871a42ffea7f216a4ddbfdaf09ea88150ef2e7f76" +dependencies = [ + "embedded-io", +] [[package]] name = "capnpc" -version = "0.17.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbc3763fb3e6635188e9cc51ee11a26f8777c553ca377430818dbebaaf6042b" +checksum = "5067f3c8ee94d993d03150153e9a57a6ff330127b1c1ad76475051e1cef79c2d" dependencies = [ "capnp", ] @@ -1635,6 +1638,12 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "embedded-io" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060" + [[package]] name = "enum-as-inner" version = "0.5.1" diff --git a/Earthfile b/Earthfile index c5d30cc6..5c1353cd 100644 --- a/Earthfile +++ b/Earthfile @@ -74,14 +74,14 @@ deps-linux: # Code + Linux deps code-linux: FROM +deps-linux - COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid + COPY --dir .cargo .capnp_version .protoc_version files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid RUN cat /veilid/scripts/earthly/cargo-linux/config.toml >> /veilid/.cargo/config.toml WORKDIR /veilid # Code + Linux + Android deps code-android: FROM +deps-android - COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid + COPY --dir .cargo .capnp_version .protoc_version files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid RUN cat /veilid/scripts/earthly/cargo-linux/config.toml >> /veilid/.cargo/config.toml RUN cat /veilid/scripts/earthly/cargo-android/config.toml >> /veilid/.cargo/config.toml WORKDIR /veilid diff --git a/dev-setup/setup_windows.bat b/dev-setup/setup_windows.bat index 6f0f3916..456ab3c7 100644 --- a/dev-setup/setup_windows.bat +++ b/dev-setup/setup_windows.bat @@ -21,8 +21,8 @@ IF NOT DEFINED PROTOC_FOUND ( FOR %%X IN (capnp.exe) DO (SET CAPNP_FOUND=%%~$PATH:X) IF NOT DEFINED CAPNP_FOUND ( - echo capnproto compiler ^(capnp^) is required but it's not installed. Install capnp 0.10.4 or higher. Ensure it is in your path. Aborting. - echo capnp is available here: https://capnproto.org/capnproto-c++-win32-0.10.4.zip + echo capnproto compiler ^(capnp^) is required but it's not installed. Install capnp 1.0.1 or higher. Ensure it is in your path. Aborting. + echo capnp is available here: https://capnproto.org/capnproto-c++-win32-1.0.1.zip goto end ) diff --git a/scripts/earthly/install_capnproto.sh b/scripts/earthly/install_capnproto.sh index 033dced7..8bb78283 100755 --- a/scripts/earthly/install_capnproto.sh +++ b/scripts/earthly/install_capnproto.sh @@ -1,9 +1,12 @@ #!/bin/bash +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +CAPNPROTO_VERSION=$(cat "$SCRIPTDIR/../../.capnp_version") + mkdir /tmp/capnproto-install pushd /tmp/capnproto-install -curl -O https://capnproto.org/capnproto-c++-0.10.4.tar.gz -tar zxf capnproto-c++-0.10.4.tar.gz -cd capnproto-c++-0.10.4 +curl -O https://capnproto.org/capnproto-c++-${CAPNPROTO_VERSION}.tar.gz +tar zxf capnproto-c++-${CAPNPROTO_VERSION}.tar.gz +cd capnproto-c++-${CAPNPROTO_VERSION} ./configure --without-openssl make -j$1 check if [ "$EUID" -ne 0 ]; then diff --git a/scripts/earthly/install_protoc.sh b/scripts/earthly/install_protoc.sh index 272008f5..d2ee75ad 100755 --- a/scripts/earthly/install_protoc.sh +++ b/scripts/earthly/install_protoc.sh @@ -1,13 +1,24 @@ #!/bin/bash -VERSION=23.3 +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +PROTOC_VERSION=$(cat "$SCRIPTDIR/../../.protoc_version") + +UNAME_M=$(uname -m) +if [[ "$UNAME_M" == "x86_64" ]]; then + PROTOC_ARCH=x86_64 +elif [[ "$UNAME_M" == "aarch64" ]]; then + PROTOC_ARCH=aarch_64 +else + echo Unsupported build architecture + exit 1 +fi mkdir /tmp/protoc-install pushd /tmp/protoc-install -curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v$VERSION/protoc-$VERSION-linux-x86_64.zip -unzip protoc-$VERSION-linux-x86_64.zip +curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-$PROTOC_ARCH.zip +unzip protoc-$PROTOC_VERSION-linux-$PROTOC_ARCH.zip if [ "$EUID" -ne 0 ]; then if command -v checkinstall &> /dev/null; then - sudo checkinstall --pkgversion=$VERSION -y cp -r bin include /usr/local/ + sudo checkinstall --pkgversion=$PROTOC_VERSION -y cp -r bin include /usr/local/ cp *.deb ~ else sudo cp -r bin include /usr/local/ @@ -16,7 +27,7 @@ if [ "$EUID" -ne 0 ]; then sudo rm -rf /tmp/protoc-install else if command -v checkinstall &> /dev/null; then - checkinstall --pkgversion=$VERSION -y cp -r bin include /usr/local/ + checkinstall --pkgversion=$PROTOC_VERSION -y cp -r bin include /usr/local/ cp *.deb ~ else cp -r bin include /usr/local/ diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index 96f2d9aa..d1ff28cd 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -129,7 +129,7 @@ trust-dns-resolver = { version = "0.22.0", optional = true } enum-as-inner = "=0.5.1" # temporary fix for trust-dns-resolver v0.22.0 # Serialization -capnp = { version = "0.17.2", default_features = false } +capnp = { version = "0.18.1", default_features = false } serde = { version = "1.0.183", features = ["derive"] } serde_json = { version = "1.0.105" } serde-big-array = "0.5.1" @@ -282,7 +282,7 @@ wasm-logger = "0.2.0" ### BUILD OPTIONS [build-dependencies] -capnpc = "0.17.2" +capnpc = "0.18.0" [package.metadata.wasm-pack.profile.release] wasm-opt = ["-O", "--enable-mutable-globals"] diff --git a/veilid-core/build.rs b/veilid-core/build.rs index 8c2b8364..6f4fe446 100644 --- a/veilid-core/build.rs +++ b/veilid-core/build.rs @@ -1,4 +1,102 @@ +use std::path::PathBuf; +use std::process::{Command, Stdio}; + +fn get_workspace_dir() -> PathBuf { + PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("..") + .canonicalize() + .expect("want workspace dir") +} +fn get_desired_capnp_version_string() -> String { + std::fs::read_to_string(get_workspace_dir().join(".capnp_version")) + .expect("should find .capnp_version file") + .trim() + .to_owned() +} + +fn get_capnp_version_string() -> String { + let output = Command::new("capnpc") + .arg("--version") + .stdout(Stdio::piped()) + .output() + .expect("capnpc was not in the PATH"); + let s = String::from_utf8(output.stdout) + .expect("'capnpc --version' output was not a valid string") + .trim() + .to_owned(); + + if !s.starts_with("Cap'n Proto version ") { + panic!("invalid capnpc version string: {}", s); + } + s[20..].to_owned() +} + +fn get_desired_protoc_version_string() -> String { + std::fs::read_to_string(get_workspace_dir().join(".protoc_version")) + .expect("should find .protoc_version file") + .trim() + .to_owned() +} + +fn get_protoc_version_string() -> String { + let output = Command::new("protoc") + .arg("--version") + .stdout(Stdio::piped()) + .output() + .expect("protoc was not in the PATH"); + let s = String::from_utf8(output.stdout) + .expect("'protoc --version' output was not a valid string") + .trim() + .to_owned(); + + if !s.starts_with("libprotoc ") { + panic!("invalid protoc version string: {}", s); + } + s[10..].to_owned() +} + fn main() { + let desired_capnp_version_string = get_desired_capnp_version_string(); + let capnp_version_string = get_capnp_version_string(); + let desired_protoc_version_string = get_desired_protoc_version_string(); + let protoc_version_string = get_protoc_version_string(); + + // Check capnp version + let desired_capnp_major_version = + usize::from_str_radix(desired_capnp_version_string.split_once(".").unwrap().0, 10) + .expect("should be valid int"); + + if usize::from_str_radix(capnp_version_string.split_once(".").unwrap().0, 10) + .expect("should be valid int") + != desired_capnp_major_version + { + panic!( + "capnproto version should be major version 1, preferably {} but is {}", + desired_capnp_version_string, capnp_version_string + ); + } else if capnp_version_string != desired_capnp_version_string { + println!( + "capnproto version may be untested: {}", + capnp_version_string + ); + } + + // Check protoc version + let desired_protoc_major_version = + usize::from_str_radix(desired_protoc_version_string.split_once(".").unwrap().0, 10) + .expect("should be valid int"); + if usize::from_str_radix(protoc_version_string.split_once(".").unwrap().0, 10) + .expect("should be valid int") + < desired_protoc_major_version + { + panic!( + "capnproto version should be at least major version {} but is {}", + desired_protoc_major_version, protoc_version_string + ); + } else if protoc_version_string != desired_protoc_version_string { + println!("protoc version may be untested: {}", protoc_version_string); + } + ::capnpc::CompilerCommand::new() .file("proto/veilid.capnp") .run() diff --git a/veilid-core/src/rpc_processor/coders/dial_info.rs b/veilid-core/src/rpc_processor/coders/dial_info.rs index 400075b8..94d3c9ae 100644 --- a/veilid-core/src/rpc_processor/coders/dial_info.rs +++ b/veilid-core/src/rpc_processor/coders/dial_info.rs @@ -32,8 +32,13 @@ pub fn decode_dial_info(reader: &veilid_capnp::dial_info::Reader) -> Result { let wss = wss.map_err(RPCError::protocol)?; @@ -44,8 +49,13 @@ pub fn decode_dial_info(reader: &veilid_capnp::dial_info::Reader) -> Result Date: Fri, 15 Sep 2023 11:58:34 -0400 Subject: [PATCH 06/21] oops --- veilid-core/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veilid-core/build.rs b/veilid-core/build.rs index 6f4fe446..5b8f7f8a 100644 --- a/veilid-core/build.rs +++ b/veilid-core/build.rs @@ -90,7 +90,7 @@ fn main() { < desired_protoc_major_version { panic!( - "capnproto version should be at least major version {} but is {}", + "protoc version should be at least major version {} but is {}", desired_protoc_major_version, protoc_version_string ); } else if protoc_version_string != desired_protoc_version_string { From c13135d389de0fbd6644f5e957e7985ab474507a Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 15 Sep 2023 14:04:20 -0400 Subject: [PATCH 07/21] newer capnp protoc and earthfile --- Earthfile | 32 ++++++++++++++++++++++------ scripts/earthly/install_capnproto.sh | 6 +++++- scripts/earthly/install_protoc.sh | 6 +++++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index 5c1353cd..4c047c9e 100644 --- a/Earthfile +++ b/Earthfile @@ -2,7 +2,7 @@ VERSION 0.6 # Start with older Ubuntu to ensure GLIBC symbol versioning support for older linux # Ensure we are using an amd64 platform because some of these targets use cross-platform tooling -FROM ubuntu:16.04 +FROM ubuntu:18.04 # Install build prerequisites deps-base: @@ -12,14 +12,16 @@ deps-base: # Install Cap'n Proto deps-capnp: FROM +deps-base + COPY .capnp_version / COPY scripts/earthly/install_capnproto.sh / - RUN /bin/bash /install_capnproto.sh 1; rm /install_capnproto.sh + RUN /bin/bash /install_capnproto.sh 1; rm /install_capnproto.sh .capnp_version # Install protoc deps-protoc: FROM +deps-capnp + COPY .protoc_version / COPY scripts/earthly/install_protoc.sh / - RUN /bin/bash /install_protoc.sh; rm /install_protoc.sh + RUN /bin/bash /install_protoc.sh; rm /install_protoc.sh .protoc_version # Install Rust deps-rust: @@ -45,9 +47,6 @@ deps-rust: # Install Linux cross-platform tooling deps-cross: FROM +deps-rust - # TODO: gcc-aarch64-linux-gnu is not in the packages for ubuntu 16.04 - # RUN apt-get install -y gcc-aarch64-linux-gnu curl unzip - # RUN apt-get install -y gcc-4.8-arm64-cross RUN curl https://ziglang.org/builds/zig-linux-x86_64-0.11.0-dev.3978+711b4e93e.tar.xz | tar -C /usr/local -xJf - RUN mv /usr/local/zig-linux-x86_64-0.11.0-dev.3978+711b4e93e /usr/local/zig ENV PATH=$PATH:/usr/local/zig @@ -216,6 +215,27 @@ package-linux-arm64-deb: # save artifacts SAVE ARTIFACT --keep-ts /dpkg/out/*.deb AS LOCAL ./target/packages/ +package-linux-arm64-rpm: + FROM --platform arm64 rockylinux:8 + RUN yum install -y createrepo rpm-build rpm-sign yum-utils rpmdevtools + RUN rpmdev-setuptree + ################################# + ### RPMBUILD .RPM FILES + ################################# + RUN mkdir -p /veilid/target + COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid + COPY +build-linux-arm64/aarch64-unknown-linux-gnu /veilid/target/aarch64-unknown-linux-gnu + RUN mkdir -p /rpm-work-dir/veilid-server + # veilid-server + RUN veilid/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh aarch64 aarch64-unknown-linux-gnu + #SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/aarch64/*.rpm AS LOCAL ./target/packages/ + # veilid-cli + RUN veilid/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh aarch64 aarch64-unknown-linux-gnu + # save artifacts + SAVE ARTIFACT --keep-ts /root/rpmbuild/RPMS/aarch64/*.rpm AS LOCAL ./target/packages/ + + + package-linux-amd64: BUILD +package-linux-amd64-deb BUILD +package-linux-amd64-rpm diff --git a/scripts/earthly/install_capnproto.sh b/scripts/earthly/install_capnproto.sh index 8bb78283..61544d6b 100755 --- a/scripts/earthly/install_capnproto.sh +++ b/scripts/earthly/install_capnproto.sh @@ -1,6 +1,10 @@ #!/bin/bash SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -CAPNPROTO_VERSION=$(cat "$SCRIPTDIR/../../.capnp_version") +if [ -f ".capnp_version" ]; then + CAPNPROTO_VERSION=$(cat ".capnp_version") +else + CAPNPROTO_VERSION=$(cat "$SCRIPTDIR/../../.capnp_version") +fi mkdir /tmp/capnproto-install pushd /tmp/capnproto-install diff --git a/scripts/earthly/install_protoc.sh b/scripts/earthly/install_protoc.sh index d2ee75ad..04cb461e 100755 --- a/scripts/earthly/install_protoc.sh +++ b/scripts/earthly/install_protoc.sh @@ -1,6 +1,10 @@ #!/bin/bash SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PROTOC_VERSION=$(cat "$SCRIPTDIR/../../.protoc_version") +if [ -f ".protoc_version" ]; then + PROTOC_VERSION=$(cat ".protoc_version") +else + PROTOC_VERSION=$(cat "$SCRIPTDIR/../../.protoc_version") +fi UNAME_M=$(uname -m) if [[ "$UNAME_M" == "x86_64" ]]; then From 0c5b89a15e76c372f88b9203e7c61f7467c94ce7 Mon Sep 17 00:00:00 2001 From: John Smith Date: Fri, 15 Sep 2023 16:31:28 -0400 Subject: [PATCH 08/21] arch for rpm build --- package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index 48f941c3..8bbb55aa 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -10,4 +10,4 @@ cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec CARGO_ARCH $CARGO_ARCH # build the rpm -rpmbuild --target "x86_64" -bb /root/rpmbuild/SPECS/veilid-server.spec \ No newline at end of file +rpmbuild --target "$ARCH" -bb /root/rpmbuild/SPECS/veilid-server.spec \ No newline at end of file From 3a4c211e85962c7effedf4a7568dd5f71e0579dc Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 11:26:07 -0400 Subject: [PATCH 09/21] resolve work --- veilid-core/src/routing_table/bucket_entry.rs | 13 +++--- veilid-core/src/rpc_processor/mod.rs | 26 ++++++++---- veilid-core/src/veilid_api/debug.rs | 41 +++++++++++++++++++ 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/veilid-core/src/routing_table/bucket_entry.rs b/veilid-core/src/routing_table/bucket_entry.rs index 6d2ae45b..0d6fd71b 100644 --- a/veilid-core/src/routing_table/bucket_entry.rs +++ b/veilid-core/src/routing_table/bucket_entry.rs @@ -649,9 +649,10 @@ impl BucketEntryInner { return false; } - // if we have seen the node consistently for longer that UNRELIABLE_PING_SPAN_SECS match self.peer_stats.rpc_stats.first_consecutive_seen_ts { + // If we have not seen seen a node consecutively, it can't be reliable None => false, + // If we have seen the node consistently for longer than UNRELIABLE_PING_SPAN_SECS then it is reliable Some(ts) => { cur_ts.saturating_sub(ts) >= TimestampDuration::new(UNRELIABLE_PING_SPAN_SECS as u64 * 1000000u64) } @@ -662,11 +663,13 @@ impl BucketEntryInner { if self.peer_stats.rpc_stats.failed_to_send >= NEVER_REACHED_PING_COUNT { return true; } - // if we have not heard from the node at all for the duration of the unreliable ping span - // a node is not dead if we haven't heard from it yet, - // but we give it NEVER_REACHED_PING_COUNT chances to ping before we say it's dead + match self.peer_stats.rpc_stats.last_seen_ts { - None => self.peer_stats.rpc_stats.recent_lost_answers < NEVER_REACHED_PING_COUNT, + // a node is not dead if we haven't heard from it yet, + // but we give it NEVER_REACHED_PING_COUNT chances to ping before we say it's dead + None => self.peer_stats.rpc_stats.recent_lost_answers >= NEVER_REACHED_PING_COUNT, + + // return dead if we have not heard from the node at all for the duration of the unreliable ping span Some(ts) => { cur_ts.saturating_sub(ts) >= TimestampDuration::new(UNRELIABLE_PING_SPAN_SECS as u64 * 1000000u64) } diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs index 38a38ed8..63510ab0 100644 --- a/veilid-core/src/rpc_processor/mod.rs +++ b/veilid-core/src/rpc_processor/mod.rs @@ -453,7 +453,7 @@ impl RPCProcessor { ////////////////////////////////////////////////////////////////////// - /// Search the DHT for a single node closest to a key and add it to the routing table and return the node reference + /// Search the DHT for a single node and add it to the routing table and return the node reference /// If no node was found in the timeout, this returns None async fn search_dht_single_key( &self, @@ -491,14 +491,20 @@ impl RPCProcessor { }; // Routine to call to check if we're done at each step - let check_done = |closest_nodes: &[NodeRef]| { - // If the node we want to locate is one of the closest nodes, return it immediately - if let Some(out) = closest_nodes - .iter() - .find(|x| x.node_ids().contains(&node_id)) - { - return Some(out.clone()); + let check_done = |_:&[NodeRef]| { + let Ok(Some(nr)) = routing_table + .lookup_node_ref(node_id) else { + return None; + }; + + // ensure we have some dial info for the entry already, + // and that the node is still alive + // if not, we should keep looking for better info + if !matches!(nr.state(get_aligned_timestamp()),BucketEntryState::Dead) && + nr.has_any_dial_info() { + return Some(nr); } + None }; @@ -534,8 +540,10 @@ impl RPCProcessor { .map_err(RPCError::internal)? { // ensure we have some dial info for the entry already, + // and that the node is still alive // if not, we should do the find_node anyway - if nr.has_any_dial_info() { + if !matches!(nr.state(get_aligned_timestamp()),BucketEntryState::Dead) && + nr.has_any_dial_info() { return Ok(Some(nr)); } } diff --git a/veilid-core/src/veilid_api/debug.rs b/veilid-core/src/veilid_api/debug.rs index 2ef953de..e0d05661 100644 --- a/veilid-core/src/veilid_api/debug.rs +++ b/veilid-core/src/veilid_api/debug.rs @@ -871,6 +871,47 @@ impl VeilidAPI { Ok(format!("{:#?}", cm)) } + async fn debug_resolve(&self, args: String) -> VeilidAPIResult { + let netman = self.network_manager()?; + let routing_table = netman.routing_table(); + + let args: Vec = args.split_whitespace().map(|s| s.to_owned()).collect(); + + let dest = async_get_debug_argument_at( + &args, + 0, + "debug_resolve", + "destination", + get_destination(routing_table.clone()), + ) + .await?; + + match &dest { + Destination::Direct { + target, + safety_selection: _, + } => Ok(format!( + "Destination: {:#?}\nTarget Entry:\n{}\n", + &dest, + routing_table.debug_info_entry(target.clone()) + )), + Destination::Relay { + relay, + target, + safety_selection: _, + } => Ok(format!( + "Destination: {:#?}\nTarget Entry:\n{}\nRelay Entry:\n{}\n", + &dest, + routing_table.clone().debug_info_entry(target.clone()), + routing_table.debug_info_entry(relay.clone()) + )), + Destination::PrivateRoute { + private_route: _, + safety_selection: _, + } => Ok(format!("Destination: {:#?}", &dest)), + } + } + async fn debug_ping(&self, args: String) -> VeilidAPIResult { let netman = self.network_manager()?; let routing_table = netman.routing_table(); From ad47e400ed1bcf899e42f624c2c32567b3af6497 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 12:23:56 -0400 Subject: [PATCH 10/21] build fixes --- veilid-cli/Cargo.toml | 2 +- veilid-core/Cargo.toml | 4 ++-- veilid-core/build.rs | 35 ++++++++++++++++++++++++++--------- veilid-wasm/Cargo.toml | 2 +- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index 11b6e51b..a3b39d02 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -54,7 +54,7 @@ flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] } thiserror = "^1" crossbeam-channel = "^0" hex = "^0" -veilid-tools = { version = "0.2.0", path = "../veilid-tools" } +veilid-tools = { version = "0.2.1", path = "../veilid-tools" } json = "^0" stop-token = { version = "^0", default-features = false } diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index d1ff28cd..18492796 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -59,7 +59,7 @@ network-result-extra = ["veilid-tools/network-result-extra"] [dependencies] # Tools -veilid-tools = { version = "0.2.0", path = "../veilid-tools", features = [ +veilid-tools = { version = "0.2.1", path = "../veilid-tools", features = [ "tracing", ], default-features = false } paste = "1.0.14" @@ -182,7 +182,7 @@ socket2 = { version = "0.5.3", features = ["all"] } # Dependencies for WASM builds only [target.'cfg(target_arch = "wasm32")'.dependencies] -veilid-tools = { version = "0.2.0", path = "../veilid-tools", default-features = false, features = [ +veilid-tools = { version = "0.2.1", path = "../veilid-tools", default-features = false, features = [ "rt-wasm-bindgen", ] } diff --git a/veilid-core/build.rs b/veilid-core/build.rs index 5b8f7f8a..ff3592c6 100644 --- a/veilid-core/build.rs +++ b/veilid-core/build.rs @@ -1,15 +1,27 @@ use std::path::PathBuf; use std::process::{Command, Stdio}; -fn get_workspace_dir() -> PathBuf { - PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("..") - .canonicalize() - .expect("want workspace dir") +fn search_file, P: AsRef>(start: T, name: P) -> Option { + let start_path = PathBuf::from(start.as_ref()).canonicalize().ok(); + let mut path = start_path.as_ref().map(|x| x.as_path()); + while let Some(some_path) = path { + let file_path = some_path.join(name.as_ref()); + if file_path.exists() { + return Some(file_path.to_owned()); + } + path = some_path.parent(); + } + None } + fn get_desired_capnp_version_string() -> String { - std::fs::read_to_string(get_workspace_dir().join(".capnp_version")) - .expect("should find .capnp_version file") + let capnp_path = search_file(env!("CARGO_MANIFEST_DIR"), ".capnp_version") + .expect("should find .capnp_version file"); + std::fs::read_to_string(&capnp_path) + .expect(&format!( + "can't read .capnp_version file here: {:?}", + capnp_path + )) .trim() .to_owned() } @@ -32,8 +44,13 @@ fn get_capnp_version_string() -> String { } fn get_desired_protoc_version_string() -> String { - std::fs::read_to_string(get_workspace_dir().join(".protoc_version")) - .expect("should find .protoc_version file") + let protoc_path = search_file(env!("CARGO_MANIFEST_DIR"), ".protoc_version") + .expect("should find .protoc_version file"); + std::fs::read_to_string(&protoc_path) + .expect(&format!( + "can't read .protoc_version file here: {:?}", + protoc_path + )) .trim() .to_owned() } diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index 059cfd70..2abb4c45 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -15,7 +15,7 @@ default = ["veilid-core/default-wasm"] crypto-test = ["veilid-core/crypto-test"] [dependencies] -veilid-core = { version = "0.2.0", path = "../veilid-core", default-features = false } +veilid-core = { version = "0.2.1", path = "../veilid-core", default-features = false } tracing = { version = "^0", features = ["log", "attributes"] } tracing-wasm = "^0" From 177bccbe120e3bafdef13ecc1412475c8d99afea Mon Sep 17 00:00:00 2001 From: John Smith Date: Sat, 16 Sep 2023 13:07:12 -0400 Subject: [PATCH 11/21] windows build fix --- veilid-core/build.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/veilid-core/build.rs b/veilid-core/build.rs index ff3592c6..97d82650 100644 --- a/veilid-core/build.rs +++ b/veilid-core/build.rs @@ -27,18 +27,18 @@ fn get_desired_capnp_version_string() -> String { } fn get_capnp_version_string() -> String { - let output = Command::new("capnpc") + let output = Command::new("capnp") .arg("--version") .stdout(Stdio::piped()) .output() - .expect("capnpc was not in the PATH"); + .expect("capnp was not in the PATH"); let s = String::from_utf8(output.stdout) - .expect("'capnpc --version' output was not a valid string") + .expect("'capnp --version' output was not a valid string") .trim() .to_owned(); if !s.starts_with("Cap'n Proto version ") { - panic!("invalid capnpc version string: {}", s); + panic!("invalid capnp version string: {}", s); } s[20..].to_owned() } From d877d82104a2b5aec1a14f84bb54ec3c0fbbbc6f Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 13:21:42 -0400 Subject: [PATCH 12/21] add cargo edit --- dev-setup/setup_linux.sh | 2 +- dev-setup/setup_macos.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-setup/setup_linux.sh b/dev-setup/setup_linux.sh index d5b21ace..019169de 100755 --- a/dev-setup/setup_linux.sh +++ b/dev-setup/setup_linux.sh @@ -114,7 +114,7 @@ fi rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android wasm32-unknown-unknown # install cargo packages -cargo install wasm-bindgen-cli wasm-pack +cargo install wasm-bindgen-cli wasm-pack cargo-edit # install pip packages pip3 install --upgrade bumpversion diff --git a/dev-setup/setup_macos.sh b/dev-setup/setup_macos.sh index d9f40013..a0ea6c9d 100755 --- a/dev-setup/setup_macos.sh +++ b/dev-setup/setup_macos.sh @@ -139,7 +139,7 @@ esac rustup target add aarch64-apple-darwin aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android # install cargo packages -cargo install wasm-bindgen-cli wasm-pack +cargo install wasm-bindgen-cli wasm-pack cargo-edit # install pip packages pip3 install --upgrade bumpversion From 7f3f7c91663c92ee9c015f295f6eb95e545280b0 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 13:52:32 -0400 Subject: [PATCH 13/21] clean up cargo.toml --- Cargo.lock | 254 ++++++++++++++++----------------- veilid-core/Cargo.toml | 10 +- veilid-flutter/rust/Cargo.toml | 2 +- veilid-server/Cargo.toml | 2 +- veilid-tools/Cargo.toml | 2 +- 5 files changed, 131 insertions(+), 139 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 076c129f..4ad66551 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71441b1911974f09ca413fc93fb2e3bfc60f4a284fdc7fd51e5a81b6afc61727" +checksum = "c258c1a017ecaccfb34c8fa46ecbb2f5402584e31082c12b5caf0be82ac5ac44" dependencies = [ "atomic", ] @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -430,7 +430,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -461,7 +461,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -570,7 +570,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.4.0", + "bytes 1.5.0", "futures-util", "http", "http-body", @@ -596,7 +596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.4.0", + "bytes 1.5.0", "futures-util", "http", "http-body", @@ -635,9 +635,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -683,7 +683,7 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex 1.1.0", + "shlex 1.2.0", "which", ] @@ -730,7 +730,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -799,15 +799,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -823,9 +823,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "capnp" @@ -916,15 +916,14 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -977,9 +976,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", "clap_derive", @@ -1007,7 +1006,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1067,7 +1066,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "memchr", ] @@ -1320,7 +1319,7 @@ dependencies = [ "flexi_logger", "lazy_static", "log", - "time 0.3.28", + "time", "unicode-width", ] @@ -1365,9 +1364,9 @@ dependencies = [ "owning_ref", "serde_json", "serde_yaml", - "time 0.3.28", + "time", "tokio", - "toml 0.7.6", + "toml 0.7.8", "unicode-segmentation", "unicode-width", "xi-unicode", @@ -1384,9 +1383,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -1407,7 +1406,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1463,7 +1462,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1485,7 +1484,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1658,22 +1657,22 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.6.1" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705d8de4776df900a4a0b2384f8b0ab42f775e93b083b42f8ce71bdc32a47e3" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1716,7 +1715,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -1843,9 +1842,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "fixedbitset" @@ -1878,7 +1877,7 @@ dependencies = [ "regex", "rustversion", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -1935,7 +1934,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -2010,7 +2009,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -2207,7 +2206,7 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "fnv", "futures-core", "futures-sink", @@ -2335,6 +2334,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -2352,7 +2360,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "fnv", "itoa", ] @@ -2363,7 +2371,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "http", "pin-project-lite", ] @@ -2392,7 +2400,7 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", @@ -2573,7 +2581,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys 0.48.0", "winreg", @@ -2754,9 +2762,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -2805,9 +2813,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -3079,7 +3087,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures", "log", "netlink-packet-core", @@ -3095,7 +3103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "async-io", - "bytes 1.4.0", + "bytes 1.5.0", "futures", "libc", "log", @@ -3642,7 +3650,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -3713,7 +3721,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -3827,9 +3835,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -3840,7 +3848,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "prost-derive", ] @@ -3850,7 +3858,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "heck", "itertools", "lazy_static", @@ -4199,14 +4207,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys 0.48.0", ] @@ -4228,7 +4236,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] @@ -4409,7 +4417,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -4431,14 +4439,14 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4453,7 +4461,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -4525,7 +4533,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -4599,9 +4607,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -4668,7 +4676,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.28", + "time", ] [[package]] @@ -4708,9 +4716,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4802,9 +4810,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "59bf04c28bee9043ed9ea1e41afc0552288d3aba9c6efdd78903b802926f4879" dependencies = [ "proc-macro2", "quote", @@ -4840,7 +4848,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -4889,7 +4897,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -4913,17 +4921,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.28" @@ -4976,14 +4973,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", - "bytes 1.4.0", + "bytes 1.5.0", "libc", "mio", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5007,7 +5004,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -5027,7 +5024,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-core", "futures-io", "futures-sink", @@ -5047,9 +5044,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -5068,9 +5065,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -5089,7 +5086,7 @@ dependencies = [ "async-trait", "axum", "base64 0.13.1", - "bytes 1.4.0", + "bytes 1.5.0", "futures-core", "futures-util", "h2", @@ -5119,8 +5116,8 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.3", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "futures-core", "futures-util", "h2", @@ -5204,7 +5201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.28", + "time", "tracing-subscriber", ] @@ -5216,7 +5213,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -5414,7 +5411,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] @@ -5443,7 +5440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" dependencies = [ "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "data-encoding", "http", "httparse", @@ -5457,9 +5454,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5475,9 +5472,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5589,7 +5586,7 @@ dependencies = [ "async-std", "async-tungstenite 0.8.0", "cfg-if 1.0.0", - "clap 4.4.2", + "clap 4.4.3", "config", "crossbeam-channel", "cursive", @@ -5689,7 +5686,7 @@ dependencies = [ "serial_test 2.0.0", "shell-words", "simplelog", - "socket2 0.5.3", + "socket2 0.5.4", "static_assertions", "stop-token", "thiserror", @@ -5784,7 +5781,7 @@ dependencies = [ "async-tungstenite 0.23.0", "backtrace", "cfg-if 1.0.0", - "clap 4.4.2", + "clap 4.4.3", "color-eyre", "config", "console-subscriber", @@ -5924,9 +5921,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5947,12 +5944,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5982,7 +5973,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", "wasm-bindgen-shared", ] @@ -6016,7 +6007,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6134,13 +6125,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.13", ] [[package]] @@ -6456,9 +6448,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" [[package]] name = "xmltree" @@ -6530,7 +6522,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.35", ] [[package]] diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index 18492796..c4d5d338 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -92,7 +92,7 @@ hashlink = { package = "veilid-hashlink", version = "0.1.0", features = [ ] } # System -futures-util = { version = "0.3.28", default_features = false, features = [ +futures-util = { version = "0.3.28", default-features = false, features = [ "alloc", ] } flume = { version = "0.11.0", features = ["async"] } @@ -101,19 +101,19 @@ lock_api = "0.4.10" stop-token = { version = "0.7.0", default-features = false } # Crypto -ed25519-dalek = { version = "2.0.0", default_features = false, features = [ +ed25519-dalek = { version = "2.0.0", default-features = false, features = [ "alloc", "rand_core", "digest", "zeroize", ] } -x25519-dalek = { version = "2.0.0", default_features = false, features = [ +x25519-dalek = { version = "2.0.0", default-features = false, features = [ "alloc", "static_secrets", "zeroize", "precomputed-tables", ] } -curve25519-dalek = { version = "4.0.0", default_features = false, features = [ +curve25519-dalek = { version = "4.0.0", default-features = false, features = [ "alloc", "zeroize", "precomputed-tables", @@ -129,7 +129,7 @@ trust-dns-resolver = { version = "0.22.0", optional = true } enum-as-inner = "=0.5.1" # temporary fix for trust-dns-resolver v0.22.0 # Serialization -capnp = { version = "0.18.1", default_features = false } +capnp = { version = "0.18.1", default-features = false } serde = { version = "1.0.183", features = ["derive"] } serde_json = { version = "1.0.105" } serde-big-array = "0.5.1" diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index 5cdfcdc3..df806257 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -38,7 +38,7 @@ parking_lot = "^0" backtrace = "^0" serde_json = "^1" serde = "^1" -futures-util = { version = "^0", default_features = false, features = [ +futures-util = { version = "^0", default-features = false, features = [ "alloc", ] } cfg-if = "^1" diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index e579f8ee..66ea0b0c 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -61,7 +61,7 @@ serde = "^1" serde_derive = "^1" serde_yaml = "^0" json = "^0" -futures-util = { version = "^0", default_features = false, features = [ +futures-util = { version = "^0", default-features = false, features = [ "alloc", ] } url = "^2" diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 2778aa8c..e9333b9e 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -41,7 +41,7 @@ eyre = "0.6.8" static_assertions = "1.1.0" cfg-if = "1.0.0" thiserror = "1.0.47" -futures-util = { version = "0.3.28", default_features = false, features = [ +futures-util = { version = "0.3.28", default-features = false, features = [ "alloc", ] } parking_lot = "0.12.1" From e7f581e6c30c43d92a53bc91ea1e3b1f89060e71 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:02:35 -0400 Subject: [PATCH 14/21] bumpversion changes --- version_bump.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/version_bump.sh b/version_bump.sh index ff8062c6..2166527e 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -1,4 +1,6 @@ #!/bin/bash + +# Fail out if any step has an error set -e if [ "$1" == "patch" ]; then @@ -15,5 +17,16 @@ else exit 1 fi +# Change version of crates and packages everywhere bumpversion $PART + +# Get the new version we bumped to +NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) +echo NEW_VERSION=$NEW_VERSION + +# Update crate dependencies for the crates we publish +cargo upgrade veilid-tools@$NEW_VERSION +cargo upgrade veilid-core@$NEW_VERSION + +# Update lockfile cargo update \ No newline at end of file From ba72aa9dd3c1137b522e0415a8f4d2114a1e81aa Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:03:21 -0400 Subject: [PATCH 15/21] version bump fix --- .bumpversion.cfg | 2 +- Cargo.lock | 114 ++++++++++++++++++++++----------- veilid-cli/Cargo.toml | 2 +- veilid-core/Cargo.toml | 2 +- veilid-flutter/pubspec.yaml | 2 +- veilid-flutter/rust/Cargo.toml | 2 +- veilid-python/pyproject.toml | 2 +- veilid-server/Cargo.toml | 2 +- veilid-tools/Cargo.toml | 2 +- veilid-wasm/Cargo.toml | 2 +- version_bump.sh | 4 +- 11 files changed, 89 insertions(+), 47 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 824c0b03..89f06175 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.1 +current_version = 0.2.2 [bumpversion:file:veilid-server/Cargo.toml] search = name = "veilid-server" diff --git a/Cargo.lock b/Cargo.lock index 4ad66551..45843680 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,6 +439,18 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +[[package]] +name = "async-tls" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7e7fbc0843fc5ad3d5ca889c5b2bea9130984d34cd0e62db57ab70c2529a8e3" +dependencies = [ + "futures", + "rustls 0.18.1", + "webpki 0.21.4", + "webpki-roots 0.20.0", +] + [[package]] name = "async-tls" version = "0.12.0" @@ -447,9 +459,9 @@ checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" dependencies = [ "futures-core", "futures-io", - "rustls", + "rustls 0.20.9", "rustls-pemfile", - "webpki", + "webpki 0.22.1", "webpki-roots 0.22.6", ] @@ -470,6 +482,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" dependencies = [ + "async-tls 0.9.0", "futures-io", "futures-util", "log", @@ -483,7 +496,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ - "async-tls", + "async-tls 0.12.0", "futures-io", "futures-util", "log", @@ -2157,19 +2170,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "grpcio" version = "0.9.1" @@ -4218,6 +4218,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +dependencies = [ + "base64 0.12.3", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + [[package]] name = "rustls" version = "0.20.9" @@ -4226,8 +4239,8 @@ checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.1", ] [[package]] @@ -4296,6 +4309,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sct" version = "0.7.0" @@ -5394,7 +5417,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ - "gloo-utils 0.1.7", + "gloo-utils", "serde", "serde-wasm-bindgen", "serde_json", @@ -5580,7 +5603,7 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.1" +version = "0.2.2" dependencies = [ "arboard", "async-std", @@ -5602,7 +5625,7 @@ dependencies = [ "indent", "json", "log", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "serde", "serde_derive", "serial_test 0.10.0", @@ -5616,14 +5639,14 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.1" +version = "0.2.2" dependencies = [ "argon2", "async-io", "async-lock", "async-std", "async-std-resolver", - "async-tls", + "async-tls 0.12.0", "async-tungstenite 0.23.0", "async_executors", "backtrace", @@ -5675,7 +5698,7 @@ dependencies = [ "range-set-blaze", "rtnetlink", "rusqlite", - "rustls", + "rustls 0.20.9", "rustls-pemfile", "schemars", "send_wrapper 0.6.0", @@ -5710,7 +5733,7 @@ dependencies = [ "wasm-logger", "weak-table", "web-sys", - "webpki", + "webpki 0.22.1", "webpki-roots 0.25.2", "wee_alloc", "winapi", @@ -5722,7 +5745,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.1" +version = "0.2.2" dependencies = [ "allo-isolate", "async-std", @@ -5737,7 +5760,7 @@ dependencies = [ "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "serde", "serde_json", "tokio", @@ -5774,11 +5797,11 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.2.1" +version = "0.2.2" dependencies = [ "ansi_term", "async-std", - "async-tungstenite 0.23.0", + "async-tungstenite 0.8.0", "backtrace", "cfg-if 1.0.0", "clap 4.4.3", @@ -5793,11 +5816,11 @@ dependencies = [ "hostname", "json", "lazy_static", - "nix 0.27.1", + "nix 0.22.3", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "rpassword", "serde", "serde_derive", @@ -5824,7 +5847,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.1" +version = "0.2.2" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5876,17 +5899,17 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.1" +version = "0.2.2" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", "data-encoding", "futures-util", - "gloo-utils 0.2.0", + "gloo-utils", "js-sys", "lazy_static", "parking_lot 0.12.1", - "send_wrapper 0.6.0", + "send_wrapper 0.4.0", "serde", "serde-wasm-bindgen", "serde_json", @@ -6069,6 +6092,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki" version = "0.22.1" @@ -6079,13 +6112,22 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +dependencies = [ + "webpki 0.21.4", +] + [[package]] name = "webpki-roots" version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki", + "webpki 0.22.1", ] [[package]] diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index a3b39d02..71ae433a 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-cli" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] edition = "2021" diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index c4d5d338..f5d7cf00 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-core" -version = "0.2.1" +version = "0.2.2" # --- description = "Core library used to create a Veilid node and operate it as part of an application" authors = ["Veilid Team "] diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml index afda391d..edaf48c6 100644 --- a/veilid-flutter/pubspec.yaml +++ b/veilid-flutter/pubspec.yaml @@ -1,6 +1,6 @@ # --- Bumpversion match - do not reorder name: veilid -version: 0.2.1 +version: 0.2.2 # --- description: Veilid Framework homepage: https://veilid.com diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index df806257..821e7978 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-flutter" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/veilid-python/pyproject.toml b/veilid-python/pyproject.toml index 19a71176..a6a96c53 100644 --- a/veilid-python/pyproject.toml +++ b/veilid-python/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] # --- Bumpversion match - do not reorder name = "veilid" -version = "0.2.1" +version = "0.2.2" # --- description = "" authors = ["Veilid Team "] diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index 66ea0b0c..028b289e 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-server" -version = "0.2.1" +version = "0.2.2" # --- description = "Veilid Server" authors = ["Veilid Team "] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index e9333b9e..726826a1 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-tools" -version = "0.2.1" +version = "0.2.2" # --- description = "A collection of baseline tools for Rust development use by Veilid and Veilid-enabled Rust applications" authors = ["Veilid Team "] diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index 2abb4c45..c4acf2bd 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-wasm" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/version_bump.sh b/version_bump.sh index 2166527e..58bd228f 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -25,8 +25,8 @@ NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) echo NEW_VERSION=$NEW_VERSION # Update crate dependencies for the crates we publish -cargo upgrade veilid-tools@$NEW_VERSION -cargo upgrade veilid-core@$NEW_VERSION +cargo upgrade -p veilid-tools@$NEW_VERSION +cargo upgrade -p veilid-core@$NEW_VERSION # Update lockfile cargo update \ No newline at end of file From 960a4cb9649ea445dc8842b6d15323c226aa3eb9 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:04:36 -0400 Subject: [PATCH 16/21] Revert "version bump fix" This reverts commit 2d291b86b64542845bc10c092e8ad6a78e8b85df. --- .bumpversion.cfg | 2 +- Cargo.lock | 114 +++++++++++---------------------- veilid-cli/Cargo.toml | 2 +- veilid-core/Cargo.toml | 2 +- veilid-flutter/pubspec.yaml | 2 +- veilid-flutter/rust/Cargo.toml | 2 +- veilid-python/pyproject.toml | 2 +- veilid-server/Cargo.toml | 2 +- veilid-tools/Cargo.toml | 2 +- veilid-wasm/Cargo.toml | 2 +- version_bump.sh | 4 +- 11 files changed, 47 insertions(+), 89 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 89f06175..824c0b03 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.2 +current_version = 0.2.1 [bumpversion:file:veilid-server/Cargo.toml] search = name = "veilid-server" diff --git a/Cargo.lock b/Cargo.lock index 45843680..4ad66551 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,18 +439,6 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" -[[package]] -name = "async-tls" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e7fbc0843fc5ad3d5ca889c5b2bea9130984d34cd0e62db57ab70c2529a8e3" -dependencies = [ - "futures", - "rustls 0.18.1", - "webpki 0.21.4", - "webpki-roots 0.20.0", -] - [[package]] name = "async-tls" version = "0.12.0" @@ -459,9 +447,9 @@ checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" dependencies = [ "futures-core", "futures-io", - "rustls 0.20.9", + "rustls", "rustls-pemfile", - "webpki 0.22.1", + "webpki", "webpki-roots 0.22.6", ] @@ -482,7 +470,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" dependencies = [ - "async-tls 0.9.0", "futures-io", "futures-util", "log", @@ -496,7 +483,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ - "async-tls 0.12.0", + "async-tls", "futures-io", "futures-util", "log", @@ -2170,6 +2157,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "grpcio" version = "0.9.1" @@ -4218,19 +4218,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.9" @@ -4239,8 +4226,8 @@ checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.1", + "sct", + "webpki", ] [[package]] @@ -4309,16 +4296,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -5417,7 +5394,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ - "gloo-utils", + "gloo-utils 0.1.7", "serde", "serde-wasm-bindgen", "serde_json", @@ -5603,7 +5580,7 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.2" +version = "0.2.1" dependencies = [ "arboard", "async-std", @@ -5625,7 +5602,7 @@ dependencies = [ "indent", "json", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_derive", "serial_test 0.10.0", @@ -5639,14 +5616,14 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.2" +version = "0.2.1" dependencies = [ "argon2", "async-io", "async-lock", "async-std", "async-std-resolver", - "async-tls 0.12.0", + "async-tls", "async-tungstenite 0.23.0", "async_executors", "backtrace", @@ -5698,7 +5675,7 @@ dependencies = [ "range-set-blaze", "rtnetlink", "rusqlite", - "rustls 0.20.9", + "rustls", "rustls-pemfile", "schemars", "send_wrapper 0.6.0", @@ -5733,7 +5710,7 @@ dependencies = [ "wasm-logger", "weak-table", "web-sys", - "webpki 0.22.1", + "webpki", "webpki-roots 0.25.2", "wee_alloc", "winapi", @@ -5745,7 +5722,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.2" +version = "0.2.1" dependencies = [ "allo-isolate", "async-std", @@ -5760,7 +5737,7 @@ dependencies = [ "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_json", "tokio", @@ -5797,11 +5774,11 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.2.2" +version = "0.2.1" dependencies = [ "ansi_term", "async-std", - "async-tungstenite 0.8.0", + "async-tungstenite 0.23.0", "backtrace", "cfg-if 1.0.0", "clap 4.4.3", @@ -5816,11 +5793,11 @@ dependencies = [ "hostname", "json", "lazy_static", - "nix 0.22.3", + "nix 0.27.1", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rpassword", "serde", "serde_derive", @@ -5847,7 +5824,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.2" +version = "0.2.1" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5899,17 +5876,17 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.2" +version = "0.2.1" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", "data-encoding", "futures-util", - "gloo-utils", + "gloo-utils 0.2.0", "js-sys", "lazy_static", "parking_lot 0.12.1", - "send_wrapper 0.4.0", + "send_wrapper 0.6.0", "serde", "serde-wasm-bindgen", "serde_json", @@ -6092,16 +6069,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.1" @@ -6112,22 +6079,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.1", + "webpki", ] [[package]] diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index 71ae433a..a3b39d02 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-cli" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] edition = "2021" diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index f5d7cf00..c4d5d338 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-core" -version = "0.2.2" +version = "0.2.1" # --- description = "Core library used to create a Veilid node and operate it as part of an application" authors = ["Veilid Team "] diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml index edaf48c6..afda391d 100644 --- a/veilid-flutter/pubspec.yaml +++ b/veilid-flutter/pubspec.yaml @@ -1,6 +1,6 @@ # --- Bumpversion match - do not reorder name: veilid -version: 0.2.2 +version: 0.2.1 # --- description: Veilid Framework homepage: https://veilid.com diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index 821e7978..df806257 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-flutter" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/veilid-python/pyproject.toml b/veilid-python/pyproject.toml index a6a96c53..19a71176 100644 --- a/veilid-python/pyproject.toml +++ b/veilid-python/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] # --- Bumpversion match - do not reorder name = "veilid" -version = "0.2.2" +version = "0.2.1" # --- description = "" authors = ["Veilid Team "] diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index 028b289e..66ea0b0c 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-server" -version = "0.2.2" +version = "0.2.1" # --- description = "Veilid Server" authors = ["Veilid Team "] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 726826a1..e9333b9e 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-tools" -version = "0.2.2" +version = "0.2.1" # --- description = "A collection of baseline tools for Rust development use by Veilid and Veilid-enabled Rust applications" authors = ["Veilid Team "] diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index c4acf2bd..2abb4c45 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-wasm" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/version_bump.sh b/version_bump.sh index 58bd228f..2166527e 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -25,8 +25,8 @@ NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) echo NEW_VERSION=$NEW_VERSION # Update crate dependencies for the crates we publish -cargo upgrade -p veilid-tools@$NEW_VERSION -cargo upgrade -p veilid-core@$NEW_VERSION +cargo upgrade veilid-tools@$NEW_VERSION +cargo upgrade veilid-core@$NEW_VERSION # Update lockfile cargo update \ No newline at end of file From 189862ee5ab5daa693a27a43dd9a9b6f3f3d3e11 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:05:06 -0400 Subject: [PATCH 17/21] version work --- version_bump.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version_bump.sh b/version_bump.sh index 2166527e..58bd228f 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -25,8 +25,8 @@ NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) echo NEW_VERSION=$NEW_VERSION # Update crate dependencies for the crates we publish -cargo upgrade veilid-tools@$NEW_VERSION -cargo upgrade veilid-core@$NEW_VERSION +cargo upgrade -p veilid-tools@$NEW_VERSION +cargo upgrade -p veilid-core@$NEW_VERSION # Update lockfile cargo update \ No newline at end of file From d4221bff773505ef959272140f8838a5501a0217 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:07:21 -0400 Subject: [PATCH 18/21] simplify --- version_bump.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/version_bump.sh b/version_bump.sh index 58bd228f..8299dea1 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -25,8 +25,7 @@ NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) echo NEW_VERSION=$NEW_VERSION # Update crate dependencies for the crates we publish -cargo upgrade -p veilid-tools@$NEW_VERSION -cargo upgrade -p veilid-core@$NEW_VERSION +cargo upgrade -p veilid-tools@$NEW_VERSION -p veilid-core@$NEW_VERSION # Update lockfile cargo update \ No newline at end of file From eda99bbd47a94c7a57f12d702c20e82036660aa3 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:57:04 -0400 Subject: [PATCH 19/21] node search fix --- .../src/network_manager/network_connection.rs | 2 +- veilid-core/src/rpc_processor/mod.rs | 13 +++---------- veilid-core/src/veilid_api/debug.rs | 3 +++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/veilid-core/src/network_manager/network_connection.rs b/veilid-core/src/network_manager/network_connection.rs index 0b73bc6c..59f1a018 100644 --- a/veilid-core/src/network_manager/network_connection.rs +++ b/veilid-core/src/network_manager/network_connection.rs @@ -404,7 +404,7 @@ impl NetworkConnection { } pub fn debug_print(&self, cur_ts: Timestamp) -> String { - format!("{} <- {} | {:x} | est {} sent {} rcvd {}", + format!("{} <- {} | {} | est {} sent {} rcvd {}", self.descriptor.remote_address(), self.descriptor.local().map(|x| x.to_string()).unwrap_or("---".to_owned()), self.connection_id.as_u64(), diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs index 63510ab0..fbcf2bf2 100644 --- a/veilid-core/src/rpc_processor/mod.rs +++ b/veilid-core/src/rpc_processor/mod.rs @@ -453,9 +453,9 @@ impl RPCProcessor { ////////////////////////////////////////////////////////////////////// - /// Search the DHT for a single node and add it to the routing table and return the node reference + /// Search the network for a single node and add it to the routing table and return the node reference /// If no node was found in the timeout, this returns None - async fn search_dht_single_key( + async fn search_for_node_id( &self, node_id: TypedKey, count: usize, @@ -561,7 +561,7 @@ impl RPCProcessor { // Search in preferred cryptosystem order let nr = match this - .search_dht_single_key(node_id, node_count, fanout, timeout, safety_selection) + .search_for_node_id(node_id, node_count, fanout, timeout, safety_selection) .await { TimeoutOr::Timeout => None, @@ -571,13 +571,6 @@ impl RPCProcessor { } }; - if let Some(nr) = &nr { - if nr.node_ids().contains(&node_id) { - // found a close node, but not exact within our configured resolve_node timeout - return Ok(None); - } - } - Ok(nr) }) } diff --git a/veilid-core/src/veilid_api/debug.rs b/veilid-core/src/veilid_api/debug.rs index e0d05661..5d633868 100644 --- a/veilid-core/src/veilid_api/debug.rs +++ b/veilid-core/src/veilid_api/debug.rs @@ -1661,6 +1661,7 @@ attach detach restart network contact [] +resolve ping appmessage appcall @@ -1748,6 +1749,8 @@ record list self.debug_app_call(rest).await } else if arg == "appreply" { self.debug_app_reply(rest).await + } else if arg == "resolve" { + self.debug_resolve(rest).await } else if arg == "contact" { self.debug_contact(rest).await } else if arg == "nodeinfo" { From 1ea0ecce87e65ce73b49f4b7b72364c53fc52196 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 16:59:54 -0400 Subject: [PATCH 20/21] changelog for v0.2.2 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 716d1ac8..442ae308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +**Changed in Veilid 0.2.2** +- Capnproto 1.0.1 + Protobuf 24.3 +- DHT set/get correctness fixes +- Connection table fixes +- Node resolution fixes +- More debugging commands (appmessage, appcall, resolve, better nodeinfo, etc) +- Reverse connect for WASM nodes +- Better Typescript types for WASM +- Various script and environment cleanups +- Earthly build for aarch64 RPM +- Much improved and faster public address detection + **Changes in Veilid 0.2.1** - Crates are separated and publishable - First publication of veilid-core with docs to crates.io and docs.rs From 06c0abead8794126c03bdbdc1d800274eb919d53 Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Sat, 16 Sep 2023 17:32:16 -0500 Subject: [PATCH 21/21] =?UTF-8?q?Version=20update:=20v0.2.1=20=E2=86=92=20?= =?UTF-8?q?v0.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- Cargo.lock | 62 +++++++++++++++++----------------- veilid-cli/Cargo.toml | 4 +-- veilid-core/Cargo.toml | 6 ++-- veilid-flutter/pubspec.yaml | 2 +- veilid-flutter/rust/Cargo.toml | 2 +- veilid-python/pyproject.toml | 2 +- veilid-server/Cargo.toml | 2 +- veilid-tools/Cargo.toml | 2 +- veilid-wasm/Cargo.toml | 4 +-- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 824c0b03..89f06175 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.1 +current_version = 0.2.2 [bumpversion:file:veilid-server/Cargo.toml] search = name = "veilid-server" diff --git a/Cargo.lock b/Cargo.lock index 4ad66551..dab2186e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -430,7 +430,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -461,7 +461,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -730,7 +730,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1006,7 +1006,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1406,7 +1406,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1462,7 +1462,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1484,7 +1484,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1672,7 +1672,7 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -1715,7 +1715,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -2009,7 +2009,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -3650,7 +3650,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -3721,7 +3721,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -4417,7 +4417,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -4439,7 +4439,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -4461,7 +4461,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -4533,7 +4533,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -4810,9 +4810,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.35" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bf04c28bee9043ed9ea1e41afc0552288d3aba9c6efdd78903b802926f4879" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" dependencies = [ "proc-macro2", "quote", @@ -4897,7 +4897,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -5004,7 +5004,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -5213,7 +5213,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -5411,7 +5411,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] @@ -5580,7 +5580,7 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.1" +version = "0.2.2" dependencies = [ "arboard", "async-std", @@ -5616,7 +5616,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.1" +version = "0.2.2" dependencies = [ "argon2", "async-io", @@ -5722,7 +5722,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.1" +version = "0.2.2" dependencies = [ "allo-isolate", "async-std", @@ -5774,7 +5774,7 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.2.1" +version = "0.2.2" dependencies = [ "ansi_term", "async-std", @@ -5824,7 +5824,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.1" +version = "0.2.2" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5876,7 +5876,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.1" +version = "0.2.2" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -5973,7 +5973,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", "wasm-bindgen-shared", ] @@ -6007,7 +6007,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6522,7 +6522,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.35", + "syn 2.0.36", ] [[package]] diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index a3b39d02..4e887b37 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-cli" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] edition = "2021" @@ -54,7 +54,7 @@ flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] } thiserror = "^1" crossbeam-channel = "^0" hex = "^0" -veilid-tools = { version = "0.2.1", path = "../veilid-tools" } +veilid-tools = { version = "0.2.2", path = "../veilid-tools" } json = "^0" stop-token = { version = "^0", default-features = false } diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index c4d5d338..cb77a8dc 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-core" -version = "0.2.1" +version = "0.2.2" # --- description = "Core library used to create a Veilid node and operate it as part of an application" authors = ["Veilid Team "] @@ -59,7 +59,7 @@ network-result-extra = ["veilid-tools/network-result-extra"] [dependencies] # Tools -veilid-tools = { version = "0.2.1", path = "../veilid-tools", features = [ +veilid-tools = { version = "0.2.2", path = "../veilid-tools", features = [ "tracing", ], default-features = false } paste = "1.0.14" @@ -182,7 +182,7 @@ socket2 = { version = "0.5.3", features = ["all"] } # Dependencies for WASM builds only [target.'cfg(target_arch = "wasm32")'.dependencies] -veilid-tools = { version = "0.2.1", path = "../veilid-tools", default-features = false, features = [ +veilid-tools = { version = "0.2.2", path = "../veilid-tools", default-features = false, features = [ "rt-wasm-bindgen", ] } diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml index afda391d..edaf48c6 100644 --- a/veilid-flutter/pubspec.yaml +++ b/veilid-flutter/pubspec.yaml @@ -1,6 +1,6 @@ # --- Bumpversion match - do not reorder name: veilid -version: 0.2.1 +version: 0.2.2 # --- description: Veilid Framework homepage: https://veilid.com diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index df806257..821e7978 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-flutter" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/veilid-python/pyproject.toml b/veilid-python/pyproject.toml index 19a71176..a6a96c53 100644 --- a/veilid-python/pyproject.toml +++ b/veilid-python/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] # --- Bumpversion match - do not reorder name = "veilid" -version = "0.2.1" +version = "0.2.2" # --- description = "" authors = ["Veilid Team "] diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index 66ea0b0c..028b289e 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-server" -version = "0.2.1" +version = "0.2.2" # --- description = "Veilid Server" authors = ["Veilid Team "] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index e9333b9e..726826a1 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-tools" -version = "0.2.1" +version = "0.2.2" # --- description = "A collection of baseline tools for Rust development use by Veilid and Veilid-enabled Rust applications" authors = ["Veilid Team "] diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index 2abb4c45..87801681 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-wasm" -version = "0.2.1" +version = "0.2.2" # --- authors = ["Veilid Team "] license = "MPL-2.0" @@ -15,7 +15,7 @@ default = ["veilid-core/default-wasm"] crypto-test = ["veilid-core/crypto-test"] [dependencies] -veilid-core = { version = "0.2.1", path = "../veilid-core", default-features = false } +veilid-core = { version = "0.2.2", path = "../veilid-core", default-features = false } tracing = { version = "^0", features = ["log", "attributes"] } tracing-wasm = "^0"