From d06c7b6044161c6bd22e2d432578a05ca6d8a773 Mon Sep 17 00:00:00 2001 From: chavic Date: Thu, 28 May 2026 18:59:13 +0200 Subject: [PATCH 1/2] Update C# dev shell docs --- payjoin-ffi/csharp/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/payjoin-ffi/csharp/README.md b/payjoin-ffi/csharp/README.md index c6270d00c..9c1c19f38 100644 --- a/payjoin-ffi/csharp/README.md +++ b/payjoin-ffi/csharp/README.md @@ -6,11 +6,10 @@ Welcome to the C# language bindings for the [Payjoin Dev Kit](https://payjoindev Follow these steps to clone the repository and run the tests. -With nix, the default development shell provides the Rust toolchain, .NET 10 SDK, -and .NET 8 runtime: +With nix, the C# development shell provides the Rust toolchain and .NET 10 SDK: ```shell -nix develop -c bash payjoin-ffi/csharp/contrib/test.sh +nix develop .#csharp -c bash payjoin-ffi/csharp/contrib/test.sh ``` ```shell @@ -55,7 +54,7 @@ dotnet test ## Requirements -- .NET 8.0 or higher +- .NET 10.0 or higher - Rust toolchain (MSRV: 1.85.0 for this repository) - Cargo will fetch the C# generator from `chavic/uniffi-bindgen-cs` at commit `878a3d269eacce64beadcd336ade0b7c8da09824` (pinned in `payjoin-ffi/Cargo.toml`) From fe14350d80f133975ceb4c47450c8f18e6a1cc2b Mon Sep 17 00:00:00 2001 From: chavic Date: Thu, 28 May 2026 18:59:47 +0200 Subject: [PATCH 2/2] Guard JS rustup target setup --- payjoin-ffi/javascript/scripts/generate_bindings.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/payjoin-ffi/javascript/scripts/generate_bindings.sh b/payjoin-ffi/javascript/scripts/generate_bindings.sh index 1dbbbc5a1..3d7b4ec01 100755 --- a/payjoin-ffi/javascript/scripts/generate_bindings.sh +++ b/payjoin-ffi/javascript/scripts/generate_bindings.sh @@ -19,7 +19,12 @@ cd node_modules/uniffi-bindgen-react-native cargo add home@=0.5.11 --package uniffi-bindgen-react-native cd ../.. -rustup target add wasm32-unknown-unknown +# rustup target add is a no-op against a nix-provided toolchain +# (no rustup home, targets baked into the nix derivation instead). +if command -v rustup >/dev/null 2>&1 && + rustup show active-toolchain >/dev/null 2>&1; then + rustup target add wasm32-unknown-unknown +fi npm run build npm run build:test-utils