From 62be5f8f4af4e8f256049094542096e53bdc1641 Mon Sep 17 00:00:00 2001 From: Brandon Vandegrift <798832-bmv437@users.noreply.gitlab.com> Date: Sun, 6 Apr 2025 13:20:26 -0400 Subject: [PATCH 1/3] fix(wasm): Format watchDhtValue result timestamp as u64 before formatting as string --- veilid-wasm/src/lib.rs | 2 +- veilid-wasm/src/veilid_routing_context_js.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/veilid-wasm/src/lib.rs b/veilid-wasm/src/lib.rs index 35bbc638..67ada469 100644 --- a/veilid-wasm/src/lib.rs +++ b/veilid-wasm/src/lib.rs @@ -628,7 +628,7 @@ pub fn routing_context_watch_dht_values( let res = routing_context .watch_dht_values(key, subkeys, expiration, count) .await?; - APIResult::Ok(res.to_string()) + APIResult::Ok(res.as_u64().to_string()) }) } diff --git a/veilid-wasm/src/veilid_routing_context_js.rs b/veilid-wasm/src/veilid_routing_context_js.rs index 26a53a61..1515a954 100644 --- a/veilid-wasm/src/veilid_routing_context_js.rs +++ b/veilid-wasm/src/veilid_routing_context_js.rs @@ -379,7 +379,7 @@ impl VeilidRoutingContext { let res = routing_context .watch_dht_values(key, subkeys, expiration, count) .await?; - APIResult::Ok(res.to_string()) + APIResult::Ok(res.as_u64().to_string()) } /// Cancels a watch early From 7dbe46d2a1f6e44171802aeae4e3836d063c3ca3 Mon Sep 17 00:00:00 2001 From: Brandon Vandegrift <798832-bmv437@users.noreply.gitlab.com> Date: Sun, 6 Apr 2025 13:22:21 -0400 Subject: [PATCH 2/3] Pin cargo-edit version since latest uses newer rust edition --- 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 e642dc29..fd483564 100755 --- a/dev-setup/setup_linux.sh +++ b/dev-setup/setup_linux.sh @@ -111,7 +111,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-edit wasm-tools +cargo install wasm-bindgen-cli wasm-pack cargo-edit@0.13.0 wasm-tools # install pip packages pip3 install --upgrade bumpversion diff --git a/dev-setup/setup_macos.sh b/dev-setup/setup_macos.sh index c3015fe4..f40eb77a 100755 --- a/dev-setup/setup_macos.sh +++ b/dev-setup/setup_macos.sh @@ -146,7 +146,7 @@ $BREW_COMMAND install capnp cmake llvm jq 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-edit wasm-tools +cargo install wasm-bindgen-cli wasm-pack cargo-edit@0.13.0 wasm-tools # attempt to install pip packages - this may result in an error, which we will try to catch pip3 install --upgrade bumpversion || ( \ From 5c91af8b525692fcff98d80838cbf781dd203523 Mon Sep 17 00:00:00 2001 From: cellar geek Date: Mon, 7 Apr 2025 16:15:02 +0000 Subject: [PATCH 3/3] development.md: suggest forking to match contributing.md best practice --- DEVELOPMENT.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 7adf77ad..e18104a0 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -8,8 +8,10 @@ This guide covers setting up environments for core, Flutter/Dart, and Python dev ## Obtaining the source code +1. Start by [forking] the project +1. Clone your fork ```shell -git clone https://gitlab.com/veilid/veilid.git +git clone https://gitlab.com/[USERNAME]/veilid.git ``` ## Dependencies @@ -266,3 +268,5 @@ For each language, perform the listed steps and commit changed files. ### WASM 1. Update sources in `veilid-wasm/src` + +[forking]:https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html