From dfd06f3b53b88859c5a192efeccd1cfbb3faa5b0 Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Sat, 5 Sep 2026 14:01:07 +0000 Subject: [PATCH 1/6] Add UniFFI Kotlin bindings for payjoin-ffi Generate with in-tree uniffi-bindgen --language kotlin, siloed like Python (no extra cargo feature). Rename protocol close to closeSession in Kotlin only so AutoCloseable still works. Pin the Gradle 9.1.0 wrapper with distributionSha256Sum; validateDistributionUrl only checks the download URL. Add a kotlin nix dev shell (JDK 21, MSRV, bitcoind) and run CI inside it, matching the other language bindings. Unit tests cover URIs, persistence, cancel, and validation. --- .github/workflows/kotlin.yml | 38 +++ flake.nix | 19 ++ payjoin-ffi/README.md | 1 + payjoin-ffi/contrib/test.sh | 2 +- payjoin-ffi/kotlin/.gitignore | 15 ++ payjoin-ffi/kotlin/CONTRIBUTING.md | 26 ++ payjoin-ffi/kotlin/README.md | 30 +++ payjoin-ffi/kotlin/build.gradle.kts | 37 +++ payjoin-ffi/kotlin/contrib/test.sh | 15 ++ payjoin-ffi/kotlin/gradle.properties | 2 + .../kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 + payjoin-ffi/kotlin/gradlew | 248 ++++++++++++++++++ payjoin-ffi/kotlin/gradlew.bat | 93 +++++++ .../kotlin/scripts/generate_bindings.sh | 50 ++++ payjoin-ffi/kotlin/settings.gradle.kts | 1 + .../kotlin/org/payjoindevkit/CancelTests.kt | 75 ++++++ .../org/payjoindevkit/InMemoryPersisters.kt | 41 +++ .../org/payjoindevkit/PersistenceTests.kt | 79 ++++++ .../kotlin/org/payjoindevkit/TestFixtures.kt | 8 + .../test/kotlin/org/payjoindevkit/UriTests.kt | 48 ++++ .../org/payjoindevkit/ValidationTests.kt | 38 +++ payjoin-ffi/uniffi.toml | 10 + 23 files changed, 883 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/kotlin.yml create mode 100644 payjoin-ffi/kotlin/.gitignore create mode 100644 payjoin-ffi/kotlin/CONTRIBUTING.md create mode 100644 payjoin-ffi/kotlin/README.md create mode 100644 payjoin-ffi/kotlin/build.gradle.kts create mode 100755 payjoin-ffi/kotlin/contrib/test.sh create mode 100644 payjoin-ffi/kotlin/gradle.properties create mode 100644 payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.jar create mode 100644 payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.properties create mode 100755 payjoin-ffi/kotlin/gradlew create mode 100644 payjoin-ffi/kotlin/gradlew.bat create mode 100755 payjoin-ffi/kotlin/scripts/generate_bindings.sh create mode 100644 payjoin-ffi/kotlin/settings.gradle.kts create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/InMemoryPersisters.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/PersistenceTests.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestFixtures.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml new file mode 100644 index 000000000..fbda675ae --- /dev/null +++ b/.github/workflows/kotlin.yml @@ -0,0 +1,38 @@ +name: Build and Test Kotlin +on: + workflow_run: + workflows: ["Flake maintenance"] + types: [requested] + branches: + - "update_flake_lock_action" + pull_request: + paths: + - payjoin-ffi/** + # The jobs run inside the flake's kotlin dev shell, so changes to + # the flake change this workflow's environment. + - flake.nix + - flake.lock + - .github/workflows/kotlin.yml + +jobs: + build-kotlin-and-test: + name: "Build and test kotlin" + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-26.04, macos-latest] + env: + RUSTUP_TOOLCHAIN: 1.85.0 + steps: + - name: Checkout + uses: actions/checkout@v6 + - name: "Install Rust 1.85.0" + uses: dtolnay/rust-toolchain@1.85.0 + - name: "Use cache" + uses: Swatinem/rust-cache@v2 + with: + shared-key: msrv-workspace + - name: Set up nix + uses: ./.github/actions/setup-nix + - name: "Build and test" + run: nix develop .#kotlin -c bash ./payjoin-ffi/kotlin/contrib/test.sh diff --git a/flake.nix b/flake.nix index 981a9f0cd..2b57b61fd 100644 --- a/flake.nix +++ b/flake.nix @@ -389,6 +389,24 @@ BITCOIND_SKIP_DOWNLOAD = 1; }; + kotlinDevShell = pkgs.mkShell { + name = "kotlin-dev"; + packages = + with pkgs; + [ + rustVersions.msrv + jdk21 + bzip2 + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + pkg-config + openssl + clang + ]; + BITCOIND_EXE = pkgs.lib.getExe' pkgs.bitcoind "bitcoind"; + BITCOIND_SKIP_DOWNLOAD = 1; + }; + # Rust toolchain for the python dev shell: msrv pinned to match # payjoin-ffi/python build requirements, with per-arch targets added # so cargo can build artifacts under nix for payjoin-ffi/python/scripts/generate_bindings.sh @@ -502,6 +520,7 @@ javascript = javascriptDevShell; csharp = csharpDevShell; dart = dartDevShell; + kotlin = kotlinDevShell; }; formatter = treefmtEval.config.build.wrapper; checks = diff --git a/payjoin-ffi/README.md b/payjoin-ffi/README.md index 284a76978..b56a17290 100644 --- a/payjoin-ffi/README.md +++ b/payjoin-ffi/README.md @@ -16,6 +16,7 @@ The directories below include instructions for using, building, and publishing t | Dart | linux, macOS | [payjoin-ffi/dart](dart) | [pub.dev](https://pub.dev/packages/payjoin) | | JavaScript | linux, macOS | [payjoin-ffi/javascript](javascript) | [npm](https://www.npmjs.com/package/payjoin) | | C# | linux, macOS, windows | [payjoin-ffi/csharp](csharp) | [nuget](https://www.nuget.org/packages/Payjoin) | +| Kotlin | linux, macOS | [payjoin-ffi/kotlin](kotlin) | (not published) | ## Minimum Supported Rust Version (MSRV) diff --git a/payjoin-ffi/contrib/test.sh b/payjoin-ffi/contrib/test.sh index 19689fa69..ebb258159 100755 --- a/payjoin-ffi/contrib/test.sh +++ b/payjoin-ffi/contrib/test.sh @@ -2,7 +2,7 @@ set -e cd "$(dirname "$0")/.." cargo test --package payjoin-ffi --verbose --features=_manual-tls,_test-utils -BINDINGS="dart javascript python csharp" +BINDINGS="dart javascript python csharp kotlin" pids=() tmpfiles=() for binding in $BINDINGS; do diff --git a/payjoin-ffi/kotlin/.gitignore b/payjoin-ffi/kotlin/.gitignore new file mode 100644 index 000000000..526ee0881 --- /dev/null +++ b/payjoin-ffi/kotlin/.gitignore @@ -0,0 +1,15 @@ +# Generated UniFFI Kotlin +src/main/kotlin/org/ + +# Native library copied by generate_bindings.sh +/lib/*.so +/lib/*.dylib +/lib/*.dll + +# Gradle +.gradle/ +build/ +local.properties + +.idea/ +.DS_Store diff --git a/payjoin-ffi/kotlin/CONTRIBUTING.md b/payjoin-ffi/kotlin/CONTRIBUTING.md new file mode 100644 index 000000000..20908def2 --- /dev/null +++ b/payjoin-ffi/kotlin/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# Contributing to the Payjoin Kotlin Bindings + +Kotlin/JVM bindings for the [Payjoin Dev Kit](https://payjoindevkit.org/), generated from +`payjoin-ffi` with Mozilla UniFFI. This document covers building from source and running tests. + +## Development + +```shell +git clone https://github.com/payjoin/rust-payjoin.git +cd rust-payjoin/payjoin-ffi/kotlin +bash ./scripts/generate_bindings.sh +./gradlew test +``` + +Generation uses the in-tree `uniffi-bindgen` binary (`--language kotlin`). There is no extra Cargo +feature on `payjoin-ffi`. By default, development generation enables `_test-utils`. For production +bindings, set `PAYJOIN_FFI_FEATURES` to empty: + +```shell +PAYJOIN_FFI_FEATURES= bash ./scripts/generate_bindings.sh +``` + +Protocol `close` is renamed to `closeSession` only in `[bindings.kotlin.rename]` in +`payjoin-ffi/uniffi.toml`, so it does not clash with `AutoCloseable.close()`. + +A nix `.#kotlin` shell is not in the flake yet. Use a local JDK 21+ and the Gradle wrapper. diff --git a/payjoin-ffi/kotlin/README.md b/payjoin-ffi/kotlin/README.md new file mode 100644 index 000000000..4acfcf1e8 --- /dev/null +++ b/payjoin-ffi/kotlin/README.md @@ -0,0 +1,30 @@ +# Payjoin Kotlin Bindings + +Kotlin/JVM bindings for the [Payjoin Dev Kit](https://payjoindevkit.org/), generated from `payjoin-ffi` with UniFFI (`--language kotlin`). + +Payjoin lets the receiver contribute inputs to the sender's transaction. These bindings implement [BIP 78](https://github.com/bitcoin/bips/blob/master/bip-0078.mediawiki) and [BIP 77](https://github.com/bitcoin/bips/blob/master/bip-0077.md). + +Requires **JDK 21+**. Native `payjoin_ffi` is loaded via JNA. + +Protocol session teardown on pending-fallback and JSON persisters is `closeSession()`. `AutoCloseable.close()` drops the Rust handle (try-with-resources / `.use`). Other language bindings keep `close`. + +## Build and test + +```shell +cd payjoin-ffi/kotlin +bash ./scripts/generate_bindings.sh +./gradlew test +``` + +Or `bash ./contrib/test.sh` from this directory (uses `Cargo-recent.lock`). + +Without nix: Rust (see repo `rust-toolchain.toml` / MSRV 1.85), JDK 21+, and the Gradle wrapper in this directory. + +## Stability + +Pre-1.0. Generated sources are not committed; run generate before test or pack. + +## Documentation + +- [Payjoin Dev Kit](https://payjoindevkit.org/) +- [rust-payjoin](https://github.com/payjoin/rust-payjoin) diff --git a/payjoin-ffi/kotlin/build.gradle.kts b/payjoin-ffi/kotlin/build.gradle.kts new file mode 100644 index 000000000..c3fc59eb4 --- /dev/null +++ b/payjoin-ffi/kotlin/build.gradle.kts @@ -0,0 +1,37 @@ +plugins { + kotlin("jvm") version "2.1.20" +} + +repositories { + mavenCentral() +} + +dependencies { + api("net.java.dev.jna:jna:5.17.0") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") + testImplementation(kotlin("test")) + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2") +} + +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) + } +} + +tasks.test { + useJUnitPlatform() + val libDir = layout.projectDirectory.dir("lib").asFile + val native = listOf("libpayjoin_ffi.so", "libpayjoin_ffi.dylib", "payjoin_ffi.dll") + .map { libDir.resolve(it) } + .firstOrNull { it.exists() } + if (native != null) { + systemProperty("uniffi.component.payjoin.libraryOverride", native.absolutePath) + } + systemProperty("jna.library.path", libDir.absolutePath) +} diff --git a/payjoin-ffi/kotlin/contrib/test.sh b/payjoin-ffi/kotlin/contrib/test.sh new file mode 100755 index 000000000..046df6079 --- /dev/null +++ b/payjoin-ffi/kotlin/contrib/test.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)" +cd "$REPO_ROOT" +source contrib/lockfile.sh +use_lockfile Cargo-recent.lock + +cd "$REPO_ROOT/payjoin-ffi/kotlin" + +echo "==> Generating FFI bindings..." +bash ./scripts/generate_bindings.sh + +echo "==> Running Kotlin tests..." +./gradlew --no-daemon test diff --git a/payjoin-ffi/kotlin/gradle.properties b/payjoin-ffi/kotlin/gradle.properties new file mode 100644 index 000000000..f1e88d6a4 --- /dev/null +++ b/payjoin-ffi/kotlin/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx1g +kotlin.code.style=official diff --git a/payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.jar b/payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.properties b/payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..26dec6cde --- /dev/null +++ b/payjoin-ffi/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/payjoin-ffi/kotlin/gradlew b/payjoin-ffi/kotlin/gradlew new file mode 100755 index 000000000..adff685a0 --- /dev/null +++ b/payjoin-ffi/kotlin/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/payjoin-ffi/kotlin/gradlew.bat b/payjoin-ffi/kotlin/gradlew.bat new file mode 100644 index 000000000..c4bdd3ab8 --- /dev/null +++ b/payjoin-ffi/kotlin/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/payjoin-ffi/kotlin/scripts/generate_bindings.sh b/payjoin-ffi/kotlin/scripts/generate_bindings.sh new file mode 100755 index 000000000..6199d8841 --- /dev/null +++ b/payjoin-ffi/kotlin/scripts/generate_bindings.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +set -euo pipefail + +OS=$(uname -s) +echo "Running on $OS" + +if [[ $OS == "Darwin" ]]; then + LIBNAME=libpayjoin_ffi.dylib +elif [[ $OS == "Linux" ]]; then + LIBNAME=libpayjoin_ffi.so +elif [[ $OS == MINGW* || $OS == MSYS* || $OS == CYGWIN* ]]; then + LIBNAME=payjoin_ffi.dll +else + echo "Unsupported os: $OS" + exit 1 +fi + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +cd "$SCRIPT_DIR/../.." + +echo "Generating payjoin Kotlin..." +PAYJOIN_FFI_FEATURES=${PAYJOIN_FFI_FEATURES-_test-utils} +PAYJOIN_FFI_PROFILE=${PAYJOIN_FFI_PROFILE:-dev} +if [[ $PAYJOIN_FFI_PROFILE == "dev" ]]; then + TARGET_PROFILE_DIR=debug +else + TARGET_PROFILE_DIR=$PAYJOIN_FFI_PROFILE +fi +FEATURE_ARGS=() +if [[ -n $PAYJOIN_FFI_FEATURES ]]; then + FEATURE_ARGS=(--features "$PAYJOIN_FFI_FEATURES") +fi + +cargo build "${FEATURE_ARGS[@]}" --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi + +OUT_DIR="kotlin/src/main/kotlin" +mkdir -p "$OUT_DIR" +rm -rf "$OUT_DIR/org" + +# ktlint is optional; --no-format keeps generate working without it. +cargo run "${FEATURE_ARGS[@]}" --profile dev -p payjoin-ffi --bin uniffi-bindgen -- generate \ + --library "../target/$TARGET_PROFILE_DIR/$LIBNAME" \ + --language kotlin \ + --out-dir "$OUT_DIR" \ + --no-format + +mkdir -p kotlin/lib +cp "../target/$TARGET_PROFILE_DIR/$LIBNAME" "kotlin/lib/$LIBNAME" + +echo "All done!" diff --git a/payjoin-ffi/kotlin/settings.gradle.kts b/payjoin-ffi/kotlin/settings.gradle.kts new file mode 100644 index 000000000..29aa1e341 --- /dev/null +++ b/payjoin-ffi/kotlin/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "payjoin" diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt new file mode 100644 index 000000000..73ff6a5ae --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt @@ -0,0 +1,75 @@ +package org.payjoindevkit + +import kotlin.test.Test +import kotlin.test.assertIs +import kotlin.test.assertNull +import kotlin.test.assertTrue +import kotlinx.coroutines.test.runTest + +class CancelTests { + @Test + fun receiverCancel() { + val persister = InMemoryReceiverPersister() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val initialized = ReceiverBuilder( + "tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", + "https://example.com", + ohttpKeys, + ).build().save(persister) + val fallbackTx = initialized.cancel().save(persister) + assertNull(fallbackTx) + assertIs(replayReceiverEventLog(persister).state()) + } + + @Test + fun receiverCancelAsync() = runTest { + val persister = InMemoryReceiverPersisterAsync() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val initialized = ReceiverBuilder( + "tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", + "https://example.com", + ohttpKeys, + ).build().saveAsync(persister) + val fallbackTx = initialized.cancel().saveAsync(persister) + assertNull(fallbackTx) + assertIs(replayReceiverEventLogAsync(persister).state()) + } + + @Test + fun senderCancel() { + val receiverPersister = InMemoryReceiverPersister() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val receiver = ReceiverBuilder( + "2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", + "https://example.com", + ohttpKeys, + ).build().save(receiverPersister) + val uri = receiver.pjUri() + val persister = InMemorySenderPersister() + val withReplyKey = SenderBuilder(originalPsbt(), uri).buildRecommended(1000u).save(persister) + val pendingFallback = withReplyKey.cancel().save(persister) + assertTrue(pendingFallback.fallbackTx().isNotEmpty()) + assertIs(replaySenderEventLog(persister).state()) + pendingFallback.closeSession().save(persister) + assertIs(replaySenderEventLog(persister).state()) + } + + @Test + fun senderCancelAsync() = runTest { + val receiverPersister = InMemoryReceiverPersisterAsync() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val receiver = ReceiverBuilder( + "2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", + "https://example.com", + ohttpKeys, + ).build().saveAsync(receiverPersister) + val uri = receiver.pjUri() + val persister = InMemorySenderPersisterAsync() + val withReplyKey = SenderBuilder(originalPsbt(), uri).buildRecommended(1000u).saveAsync(persister) + val pendingFallback = withReplyKey.cancel().saveAsync(persister) + assertTrue(pendingFallback.fallbackTx().isNotEmpty()) + assertIs(replaySenderEventLogAsync(persister).state()) + pendingFallback.closeSession().saveAsync(persister) + assertIs(replaySenderEventLogAsync(persister).state()) + } +} diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/InMemoryPersisters.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/InMemoryPersisters.kt new file mode 100644 index 000000000..ef7954140 --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/InMemoryPersisters.kt @@ -0,0 +1,41 @@ +package org.payjoindevkit + +internal abstract class MemoryEventLog { + private val events = java.util.concurrent.CopyOnWriteArrayList() + @Volatile var closed: Boolean = false + private set + + fun save(event: String) { + events.add(event) + } + + fun load(): List = events.toList() + + fun closeSession() { + closed = true + } +} + +internal abstract class MemoryEventLogAsync { + private val events = java.util.concurrent.CopyOnWriteArrayList() + @Volatile var closed: Boolean = false + private set + + suspend fun save(event: String) { + events.add(event) + } + + suspend fun load(): List = events.toList() + + suspend fun closeSession() { + closed = true + } +} + +internal class InMemoryReceiverPersister : MemoryEventLog(), JsonReceiverSessionPersister + +internal class InMemorySenderPersister : MemoryEventLog(), JsonSenderSessionPersister + +internal class InMemoryReceiverPersisterAsync : MemoryEventLogAsync(), JsonReceiverSessionPersisterAsync + +internal class InMemorySenderPersisterAsync : MemoryEventLogAsync(), JsonSenderSessionPersisterAsync diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/PersistenceTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/PersistenceTests.kt new file mode 100644 index 000000000..2cbfcd03f --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/PersistenceTests.kt @@ -0,0 +1,79 @@ +package org.payjoindevkit + +import kotlin.test.Test +import kotlin.test.assertFalse +import kotlin.test.assertIs +import kotlin.test.assertTrue +import kotlinx.coroutines.test.runTest + +class PersistenceTests { + @Test + fun receiverPersistence() { + val persister = InMemoryReceiverPersister() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + ReceiverBuilder("tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", "https://example.com", ohttpKeys) + .build() + .save(persister) + val state = replayReceiverEventLog(persister).state() + assertIs(state) + assertFalse(persister.closed) + persister.closeSession() + assertTrue(persister.closed) + } + + @Test + fun senderPersistence() { + val receiverPersister = InMemoryReceiverPersister() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val receiver = ReceiverBuilder( + "2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", + "https://example.com", + ohttpKeys, + ).build().save(receiverPersister) + val uri = receiver.pjUri() + val senderPersister = InMemorySenderPersister() + SenderBuilder(originalPsbt(), uri).buildRecommended(1000u).save(senderPersister) + val state = replaySenderEventLog(senderPersister).state() + assertIs(state) + assertFalse(senderPersister.closed) + senderPersister.closeSession() + assertTrue(senderPersister.closed) + receiverPersister.closeSession() + assertTrue(receiverPersister.closed) + } + + @Test + fun receiverPersistenceAsync() = runTest { + val persister = InMemoryReceiverPersisterAsync() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + ReceiverBuilder("tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", "https://example.com", ohttpKeys) + .build() + .saveAsync(persister) + val state = replayReceiverEventLogAsync(persister).state() + assertIs(state) + assertFalse(persister.closed) + persister.closeSession() + assertTrue(persister.closed) + } + + @Test + fun senderPersistenceAsync() = runTest { + val receiverPersister = InMemoryReceiverPersisterAsync() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + val receiver = ReceiverBuilder( + "2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", + "https://example.com", + ohttpKeys, + ).build().saveAsync(receiverPersister) + val uri = receiver.pjUri() + val senderPersister = InMemorySenderPersisterAsync() + SenderBuilder(originalPsbt(), uri).buildRecommended(1000u).saveAsync(senderPersister) + val state = replaySenderEventLogAsync(senderPersister).state() + assertIs(state) + assertFalse(senderPersister.closed) + senderPersister.closeSession() + assertTrue(senderPersister.closed) + receiverPersister.closeSession() + assertTrue(receiverPersister.closed) + } +} diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestFixtures.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestFixtures.kt new file mode 100644 index 000000000..ff1351dda --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestFixtures.kt @@ -0,0 +1,8 @@ +package org.payjoindevkit + +import java.util.HexFormat + +internal val ohttpKeysData: ByteArray = + HexFormat.of().parseHex( + "01001604ba48c49c3d4a92a3ad00ecc63a024da10ced02180c73ec12d8a7ad2cc91bb483824fe2bee8d28bfe2eb2fc6453bc4d31cd851e8a6540e86c5382af588d370957000400010003", + ) diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt new file mode 100644 index 000000000..8a88625b3 --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt @@ -0,0 +1,48 @@ +package org.payjoindevkit + +import kotlin.test.Test +import kotlin.test.assertContains +import kotlin.test.assertFailsWith +import kotlin.test.assertNotNull + +class UriTests { + @Test + fun urlEncodedPayjoinParameter() { + val uri = "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX?amount=1&pj=https://example.com?ciao" + Uri.parse(uri).use { parsed -> + parsed.checkPjSupported().use { pjUri -> + assertContains(pjUri.pjEndpoint(), "example.com") + } + } + } + + @Test + fun missingAmountShouldBeOk() { + val uri = "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX?pj=https://testnet.demo.btcpayserver.org/BTC/pj" + assertNotNull(Url.parse(uri)) + } + + @Test + fun validUrisWithDifferentAddressesAndEndpoints() { + val https = exampleUrl() + val onion = "http://vjdpwgybvubne5hda6v4c5iaeeevhge6jvo3w2cl6eocbwwvwxp7b7qd.onion" + val addresses = listOf( + "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX", + "BITCOIN:TB1Q6D3A2W975YNY0ASUVD9A67NER4NKS58FF0Q8G4", + "bitcoin:tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", + ) + for (address in addresses) { + for (pj in listOf(https, onion)) { + assertNotNull(Url.parse("$address?amount=1&pj=$pj")) + } + } + } + + @Test + fun uriParseSmoke() { + Uri.parse("bitcoin:bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4").use { uri -> + assertNotNull(uri.address()) + } + assertFailsWith { Uri.parse("not-a-uri") } + } +} diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt new file mode 100644 index 000000000..c0bfd82e7 --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt @@ -0,0 +1,38 @@ +package org.payjoindevkit + +import kotlin.test.Test +import kotlin.test.assertFailsWith + +class ValidationTests { + @Test + fun receiverBuilderRejectsBadAddress() { + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + assertFailsWith { + ReceiverBuilder("not-an-address", "https://example.com", ohttpKeys) + } + } + + @Test + fun inputPairRejectsInvalidOutpoint() { + assertFailsWith { + val txin = TxIn( + previousOutput = OutPoint(txid = "deadbeef", vout = 0u), + scriptSig = ByteArray(0), + sequence = 0u, + witness = emptyList(), + ) + val psbtin = PsbtInput(witnessUtxo = null, redeemScript = null, witnessScript = null) + InputPair(txin, psbtin, null) + } + } + + @Test + fun senderBuilderRejectsBadPsbt() { + val uri = Uri.parse( + "bitcoin:tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4?pj=https://example.com/pj", + ).checkPjSupported() + assertFailsWith { + SenderBuilder("not-a-psbt", uri) + } + } +} diff --git a/payjoin-ffi/uniffi.toml b/payjoin-ffi/uniffi.toml index 9006539eb..f2be18d49 100644 --- a/payjoin-ffi/uniffi.toml +++ b/payjoin-ffi/uniffi.toml @@ -2,6 +2,16 @@ package_name = "org.payjoindevkit" cdylib_name = "payjoin_ffi" +# AutoCloseable/Disposable.close() drops the Rust handle. Payjoin also exports +# protocol close() on these types. Rename only the Kotlin protocol methods. +[bindings.kotlin.rename] +"ReceiverPendingFallback.close" = "closeSession" +"SenderPendingFallback.close" = "closeSession" +"JsonReceiverSessionPersister.close" = "closeSession" +"JsonReceiverSessionPersisterAsync.close" = "closeSession" +"JsonSenderSessionPersister.close" = "closeSession" +"JsonSenderSessionPersisterAsync.close" = "closeSession" + [bindings.python] cdylib_name = "payjoin_ffi" From 86dc52370fa9c5e8120eefdb5a9f480f1c7ffba6 Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Sat, 5 Sep 2026 15:37:07 +0000 Subject: [PATCH 2/6] Add v2 payjoin integration test for Kotlin Drive a full BIP77 round trip against the in-process directory, OHTTP relay, and bitcoind, mirroring the Python suite's RPC sequence and assertions. TestHttp trusts only the self-signed rcgen directory cert so HTTPS through the relay succeeds in the JVM. Parse bitcoind RPC responses with kotlinx-serialization-json. --- payjoin-ffi/kotlin/README.md | 4 +- payjoin-ffi/kotlin/build.gradle.kts | 1 + .../org/payjoindevkit/IntegrationTests.kt | 455 ++++++++++++++++++ .../test/kotlin/org/payjoindevkit/TestHttp.kt | 74 +++ 4 files changed, 533 insertions(+), 1 deletion(-) create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt create mode 100644 payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestHttp.kt diff --git a/payjoin-ffi/kotlin/README.md b/payjoin-ffi/kotlin/README.md index 4acfcf1e8..40ed7536a 100644 --- a/payjoin-ffi/kotlin/README.md +++ b/payjoin-ffi/kotlin/README.md @@ -18,7 +18,9 @@ bash ./scripts/generate_bindings.sh Or `bash ./contrib/test.sh` from this directory (uses `Cargo-recent.lock`). -Without nix: Rust (see repo `rust-toolchain.toml` / MSRV 1.85), JDK 21+, and the Gradle wrapper in this directory. +`./gradlew test` includes a v2↔v2 integration test that starts a local payjoin directory, OHTTP relay, and bitcoind. Bitcoin Core is downloaded by corepc-node (`29_0`) on first run; it is not supplied by nix. + +Without nix: Rust (see repo `rust-toolchain.toml` / MSRV 1.85), JDK 21+, and the Gradle wrapper in this directory. Network access is required the first time bitcoind is fetched. ## Stability diff --git a/payjoin-ffi/kotlin/build.gradle.kts b/payjoin-ffi/kotlin/build.gradle.kts index c3fc59eb4..97e3b88ec 100644 --- a/payjoin-ffi/kotlin/build.gradle.kts +++ b/payjoin-ffi/kotlin/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") testImplementation(kotlin("test")) testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2") + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1") } java { diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt new file mode 100644 index 000000000..10f4b9f64 --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt @@ -0,0 +1,455 @@ +package org.payjoindevkit + +import java.util.HexFormat +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue +import kotlin.test.fail +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonNull +import kotlinx.serialization.json.boolean +import kotlinx.serialization.json.booleanOrNull +import kotlinx.serialization.json.contentOrNull +import kotlinx.serialization.json.double +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive + +/** + * Full BIP 77 v2↔v2 round trip against the in-process directory, OHTTP relay, + * and bitcoind. Mirrors `payjoin-ffi/python/test/test_payjoin_integration_test.py` + * (`test_integration_v2_to_v2`): same RPC sequence, same receiver checklist, + * same final assertions, plus an explicit check that the broadcast transaction + * spends coins from both wallets. + * + * Every [TestServices] call takes a global runtime mutex and blocks, so sender + * and receiver are driven strictly in sequence. + */ +class IntegrationTests { + @Test + fun v2ToV2Payjoin() { + initTracing() + TestServices.initialize().use { services -> + services.waitForServicesReady() + val directory = services.directoryUrl() + val relay = services.ohttpRelayUrl() + services.fetchOhttpKeys().use { ohttpKeys -> + TestHttp(services).use { http -> + initBitcoindSenderReceiver().use { env -> + env.getSender().use { senderRpc -> + env.getReceiver().use { receiverRpc -> + runV2ToV2( + http, + directory, + relay, + ohttpKeys, + senderRpc, + receiverRpc, + ) + } + } + } + } + } + } + } + + private fun runV2ToV2( + http: TestHttp, + directory: String, + relay: String, + ohttpKeys: OhttpKeys, + senderRpc: RpcClient, + receiverRpc: RpcClient, + ) { + val receiverAddress = Json.parseToJsonElement(rpc(receiverRpc, "getnewaddress")).jsonPrimitive.content + val senderOutpoints = listOutpoints(senderRpc) + val receiverOutpoints = listOutpoints(receiverRpc) + val recvPersister = InMemoryReceiverPersister() + val sendPersister = InMemorySenderPersister() + + // ********************** + // Inside the Receiver: + val session = ReceiverBuilder(receiverAddress, directory, ohttpKeys).use { builder -> + builder.build().use { it.save(recvPersister) } + } + session.use { + val firstPoll = pollReceiver(session, recvPersister, http, relay) + assertEquals(null, firstPoll, "receiver mailbox should be empty before the sender posts") + + // ********************** + // Inside the Sender: + val pjUri = session.pjUri() + pjUri.use { + val originalPsbt = buildSweepPsbt(senderRpc, pjUri) + val withReplyKey = SenderBuilder(originalPsbt, pjUri).use { senderBuilder -> + senderBuilder.buildRecommended(1000u).use { it.save(sendPersister) } + } + withReplyKey.use { + val pollingForProposal = withReplyKey.createV2PostRequest(relay).useDisposable { posted -> + val body = http.post(posted.request) + withReplyKey.processResponse(body, posted.ohttpCtx).use { it.save(sendPersister) } + } + pollingForProposal.use { + // ********************** + // Inside the Receiver: + val payjoinProposal = waitForReceiverProposal(session, recvPersister, http, relay, receiverRpc) + payjoinProposal.use { + payjoinProposal.createPostRequest(relay).useDisposable { posted -> + val body = http.post(posted.request) + payjoinProposal.processResponse(body, posted.clientResponse).use { transition -> + transition.save(recvPersister).use { } + } + } + + // ********************** + // Inside the Sender: + val psbtBase64 = waitForSenderProposal(pollingForProposal, sendPersister, http, relay) + finishPayjoin( + senderRpc, + receiverRpc, + psbtBase64, + senderOutpoints, + receiverOutpoints, + ) + } + } + } + } + } + + recvPersister.closeSession() + sendPersister.closeSession() + } + + private fun pollReceiver( + session: Initialized, + recvPersister: InMemoryReceiverPersister, + http: TestHttp, + relay: String, + ): UncheckedOriginalPayload? { + return session.createPollRequest(relay).useDisposable { requestResponse -> + val body = http.post(requestResponse.request) + session.processResponse(body, requestResponse.clientResponse).use { transition -> + when (val outcome = transition.save(recvPersister)) { + // Progress retains outcome.inner as the return value; destroying the enum would free that handle. + is InitializedTransitionOutcome.Progress -> outcome.inner + is InitializedTransitionOutcome.Stasis -> { + outcome.destroy() + null + } + } + } + } + } + + private fun waitForReceiverProposal( + session: Initialized, + recvPersister: InMemoryReceiverPersister, + http: TestHttp, + relay: String, + receiverRpc: RpcClient, + ): PayjoinProposal { + val deadline = System.nanoTime() + POLL_TIMEOUT_NS + var attempts = 0 + while (System.nanoTime() < deadline) { + attempts += 1 + val original = pollReceiver(session, recvPersister, http, relay) + if (original != null) { + return original.use { processUncheckedProposal(it, recvPersister, receiverRpc) } + } + Thread.sleep(POLL_SLEEP_MS) + } + fail("Timed out waiting for sender original after $attempts poll(s)") + } + + private fun processUncheckedProposal( + proposal: UncheckedOriginalPayload, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val maybeInputsOwned = proposal.checkBroadcastSuitability(null, MempoolAcceptanceCallback(receiverRpc)) + .use { it.save(recvPersister) } + return maybeInputsOwned.use { processMaybeInputsOwned(it, recvPersister, receiverRpc) } + } + + private fun processMaybeInputsOwned( + proposal: MaybeInputsOwned, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val maybeInputsSeen = proposal.checkInputsNotOwned(IsInputOwnedCallback(receiverRpc)) + .use { it.save(recvPersister) } + return maybeInputsSeen.use { processMaybeInputsSeen(it, recvPersister, receiverRpc) } + } + + private fun processMaybeInputsSeen( + proposal: MaybeInputsSeen, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val outputsUnknown = proposal.checkNoInputsSeenBefore(CheckInputsNotSeenCallback()) + .use { it.save(recvPersister) } + return outputsUnknown.use { processOutputsUnknown(it, recvPersister, receiverRpc) } + } + + private fun processOutputsUnknown( + proposal: OutputsUnknown, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val wantsOutputs = proposal.identifyReceiverOutputs(IsScriptOwnedCallback(receiverRpc)) + .use { it.save(recvPersister) } + return wantsOutputs.use { processWantsOutputs(it, recvPersister, receiverRpc) } + } + + private fun processWantsOutputs( + proposal: WantsOutputs, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val wantsInputs = proposal.commitOutputs().use { it.save(recvPersister) } + return wantsInputs.use { processWantsInputs(it, recvPersister, receiverRpc) } + } + + private fun processWantsInputs( + proposal: WantsInputs, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val inputs = getInputs(receiverRpc) + val wantsFeeRange = try { + proposal.contributeInputs(inputs).use { contributed -> + contributed.commitInputs().use { it.save(recvPersister) } + } + } finally { + inputs.forEach { it.close() } + } + return wantsFeeRange.use { processWantsFeeRange(it, recvPersister, receiverRpc) } + } + + private fun processWantsFeeRange( + proposal: WantsFeeRange, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + val provisional = proposal.applyFeeRange(1u, 10u).use { it.save(recvPersister) } + return provisional.use { processProvisionalProposal(it, recvPersister, receiverRpc) } + } + + private fun processProvisionalProposal( + proposal: ProvisionalProposal, + recvPersister: InMemoryReceiverPersister, + receiverRpc: RpcClient, + ): PayjoinProposal { + return proposal.finalizeProposal(ProcessPsbtCallback(receiverRpc)).use { it.save(recvPersister) } + } + + private fun waitForSenderProposal( + pollingForProposal: PollingForProposal, + sendPersister: InMemorySenderPersister, + http: TestHttp, + relay: String, + ): String { + val deadline = System.nanoTime() + POLL_TIMEOUT_NS + var attempts = 0 + var sender = pollingForProposal + while (System.nanoTime() < deadline) { + attempts += 1 + val outcome = sender.createPollRequest(relay).useDisposable { pollReq -> + val body = http.post(pollReq.request) + sender.processResponse(body, pollReq.ohttpCtx).use { it.save(sendPersister) } + } + when (outcome) { + // Progress returns a PSBT string, not a live handle; same rule as receiver Progress — do not destroy. + is PollingForProposalTransitionOutcome.Progress -> return outcome.psbtBase64 + is PollingForProposalTransitionOutcome.Stasis -> { + if (sender !== pollingForProposal) { + sender.close() + } + sender = outcome.inner + Thread.sleep(POLL_SLEEP_MS) + } + } + } + fail("Timed out waiting for receiver proposal after $attempts poll(s)") + } + + private fun finishPayjoin( + senderRpc: RpcClient, + receiverRpc: RpcClient, + psbtBase64: String, + senderOutpoints: Set, + receiverOutpoints: Set, + ) { + val payjoinPsbt = Json.parseToJsonElement(rpc(senderRpc, "walletprocesspsbt", jstr(psbtBase64))) + .jsonObject.getValue("psbt").jsonPrimitive.content + val finalPsbt = Json.parseToJsonElement(rpc(senderRpc, "finalizepsbt", jstr(payjoinPsbt), "false")) + .jsonObject.getValue("psbt").jsonPrimitive.content + val finalTxHex = Json.parseToJsonElement(rpc(senderRpc, "finalizepsbt", jstr(finalPsbt), "true")) + .jsonObject.getValue("hex").jsonPrimitive.content + val txid = Json.parseToJsonElement(rpc(senderRpc, "sendrawtransaction", jstr(finalTxHex))) + .jsonPrimitive.content + assertTrue(txid.isNotEmpty(), "sendrawtransaction should accept the payjoin") + + val networkFees = Json.parseToJsonElement(rpc(senderRpc, "decodepsbt", jstr(finalPsbt))) + .jsonObject.getValue("fee").jsonPrimitive.double + val decodedTx = Json.parseToJsonElement(rpc(senderRpc, "decoderawtransaction", jstr(finalTxHex))) + .jsonObject + val vins = decodedTx.getValue("vin").jsonArray + val vouts = decodedTx.getValue("vout").jsonArray + assertEquals(2, vins.size) + assertEquals(1, vouts.size) + + val spent = vins.map { vin -> + val obj = vin.jsonObject + OutpointRef( + obj.getValue("txid").jsonPrimitive.content, + obj.getValue("vout").jsonPrimitive.double.toInt().toUInt(), + ) + }.toSet() + assertTrue(spent.any { it in senderOutpoints }, "final tx should spend a sender input") + assertTrue(spent.any { it in receiverOutpoints }, "final tx should spend a receiver input") + + val receiverPending = Json.parseToJsonElement(rpc(receiverRpc, "getbalances")) + .jsonObject.getValue("mine").jsonObject.getValue("untrusted_pending").jsonPrimitive.double + assertEquals(100.0 - networkFees, receiverPending, 1e-6) + val senderBalance = Json.parseToJsonElement(rpc(senderRpc, "getbalance")).jsonPrimitive.double + assertEquals(0.0, senderBalance, 1e-6) + } +} + +private const val POLL_SLEEP_MS = 250L +private const val POLL_TIMEOUT_NS = 30_000_000_000L + +private data class OutpointRef(val txid: String, val vout: UInt) + +private fun rpc(client: RpcClient, method: String, vararg params: String?): String = + client.call(method, params.toList()) + +// String-valued RPC params go through jstr(); JSON structure ([], objects, numbers, true/false) is passed raw. +private fun jstr(value: String): String = buildString { + append('"') + for (ch in value) { + when (ch) { + '\\' -> append("\\\\") + '"' -> append("\\\"") + else -> append(ch) + } + } + append('"') +} + +private fun buildSweepPsbt(sender: RpcClient, pjUri: PjUri): String { + val outputs = "{${jstr(pjUri.address())}:50}" + val options = """{"lockUnspents":true,"fee_rate":10,"subtractFeeFromOutputs":[0]}""" + val psbt = Json.parseToJsonElement( + rpc(sender, "walletcreatefundedpsbt", "[]", outputs, "0", options), + ).jsonObject.getValue("psbt").jsonPrimitive.content + return Json.parseToJsonElement(rpc(sender, "walletprocesspsbt", jstr(psbt), "true", jstr("ALL"), "false")) + .jsonObject.getValue("psbt").jsonPrimitive.content +} + +private fun getInputs(rpcConnection: RpcClient): List { + val utxos = Json.parseToJsonElement(rpc(rpcConnection, "listunspent")).jsonArray + return utxos.map { utxo -> + val obj = utxo.jsonObject + val txid = obj.getValue("txid").jsonPrimitive.content + val vout = obj.getValue("vout").jsonPrimitive.double.toInt().toUInt() + val scriptPubkey = HexFormat.of().parseHex(obj.getValue("scriptPubKey").jsonPrimitive.content) + val amountSat = kotlin.math.round(obj.getValue("amount").jsonPrimitive.double * 100_000_000.0).toULong() + val txin = TxIn( + previousOutput = OutPoint(txid, vout), + scriptSig = ByteArray(0), + sequence = 0u, + witness = emptyList(), + ) + val psbtIn = PsbtInput( + witnessUtxo = TxOut(amountSat, scriptPubkey), + redeemScript = null, + witnessScript = null, + ) + InputPair(txin, psbtIn, null) + } +} + +private fun listOutpoints(client: RpcClient): Set = + Json.parseToJsonElement(rpc(client, "listunspent")).jsonArray.map { utxo -> + val obj = utxo.jsonObject + OutpointRef( + obj.getValue("txid").jsonPrimitive.content, + obj.getValue("vout").jsonPrimitive.double.toInt().toUInt(), + ) + }.toSet() + +private class MempoolAcceptanceCallback(private val connection: RpcClient) : CanBroadcast { + override fun callback(tx: ByteArray): Boolean { + return try { + val hexTx = HexFormat.of().formatHex(tx) + Json.parseToJsonElement(rpc(connection, "testmempoolaccept", "[${jstr(hexTx)}]")) + .jsonArray[0] + .jsonObject.getValue("allowed").jsonPrimitive.boolean + } catch (_: Exception) { + false + } + } +} + +private class IsScriptOwnedCallback(private val connection: RpcClient) : IsScriptOwned { + override fun callback(script: ByteArray): Boolean { + return try { + val decoded = Json.parseToJsonElement( + rpc(connection, "decodescript", jstr(HexFormat.of().formatHex(script))), + ).jsonObject + val candidates = mutableListOf() + decoded["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + decoded["addresses"]?.jsonArray?.forEach { item -> + if (item.jsonPrimitive.isString) candidates.add(item.jsonPrimitive.content) + } + decoded["p2sh"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + decoded["segwit"]?.jsonObject?.let { segwit -> + segwit["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + segwit["addresses"]?.jsonArray?.forEach { item -> + if (item.jsonPrimitive.isString) candidates.add(item.jsonPrimitive.content) + } + } + candidates.any { addr -> + Json.parseToJsonElement(rpc(connection, "getaddressinfo", jstr(addr))) + .jsonObject["ismine"]?.jsonPrimitive?.booleanOrNull == true + } + } catch (_: Exception) { + false + } + } +} + +private class IsInputOwnedCallback(private val connection: RpcClient) : IsInputOwned { + override fun callback(outpoint: OutPoint): Boolean { + return try { + val txOut = Json.parseToJsonElement( + rpc( + connection, + "gettxout", + jstr(outpoint.txid), + outpoint.vout.toString(), + "true", + ), + ) + if (txOut is JsonNull) return false + val scriptHex = txOut.jsonObject.getValue("scriptPubKey").jsonObject.getValue("hex").jsonPrimitive.content + IsScriptOwnedCallback(connection).callback(HexFormat.of().parseHex(scriptHex)) + } catch (_: Exception) { + false + } + } +} + +private class CheckInputsNotSeenCallback : IsOutputKnown { + override fun callback(outpoint: OutPoint): Boolean = false +} + +private class ProcessPsbtCallback(private val connection: RpcClient) : ProcessPsbt { + override fun callback(psbt: String): String = + Json.parseToJsonElement(rpc(connection, "walletprocesspsbt", jstr(psbt))) + .jsonObject.getValue("psbt").jsonPrimitive.content +} diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestHttp.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestHttp.kt new file mode 100644 index 000000000..d9e70ef8c --- /dev/null +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/TestHttp.kt @@ -0,0 +1,74 @@ +package org.payjoindevkit + +import java.io.ByteArrayInputStream +import java.net.InetSocketAddress +import java.net.ProxySelector +import java.net.URI +import java.net.http.HttpClient +import java.net.http.HttpRequest +import java.net.http.HttpResponse +import java.security.KeyStore +import java.security.cert.CertificateFactory +import java.time.Duration +import javax.net.ssl.SSLContext +import javax.net.ssl.TrustManagerFactory + +/** + * HTTP client for the v2 integration harness. + * + * The in-process directory serves HTTPS with a self-signed certificate from + * `payjoin-test-utils` (`local_cert_key()`, SANs `localhost` and `0.0.0.0`). + * This client trusts that one certificate and nothing else, and sends every + * request through the OHTTP relay as an HTTP proxy. + */ +class TestHttp(services: TestServices) : AutoCloseable { + private val requestTimeout: Duration = Duration.ofSeconds(30) + private val client: HttpClient = buildClient(services) + + fun post(request: Request): ByteArray { + val httpRequest = HttpRequest.newBuilder(URI.create(request.url)) + .timeout(requestTimeout) + .header("Content-Type", request.contentType) + .POST(HttpRequest.BodyPublishers.ofByteArray(request.body)) + .build() + val response = client.send(httpRequest, HttpResponse.BodyHandlers.ofByteArray()) + val status = response.statusCode() + if (status < 200 || status >= 300) { + throw IllegalStateException("HTTP $status posting to ${request.url}") + } + return response.body() + } + + override fun close() { + client.close() + } + + companion object { + private fun buildClient(services: TestServices): HttpClient { + val timeout = Duration.ofSeconds(30) + val relay = URI.create(services.ohttpRelayUrl()) + val port = if (relay.port == -1) 80 else relay.port + return HttpClient.newBuilder() + .connectTimeout(timeout) + .sslContext(sslContextTrusting(services.cert())) + .proxy(ProxySelector.of(InetSocketAddress(relay.host, port))) + .build() + } + + private fun sslContextTrusting(certDer: ByteArray): SSLContext { + val cert = CertificateFactory.getInstance("X.509") + .generateCertificate(ByteArrayInputStream(certDer)) + val keyStore = KeyStore.getInstance(KeyStore.getDefaultType()) + keyStore.load(null, null) + keyStore.setCertificateEntry("directory", cert) + val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) + tmf.init(keyStore) + val sslContext = SSLContext.getInstance("TLS") + sslContext.init(null, tmf.trustManagers, null) + return sslContext + } + } +} + +internal inline fun T.useDisposable(block: (T) -> R): R = + try { block(this) } finally { destroy() } From 7d3ee616c12851b105f406961e6f95a5e7ad5687 Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Thu, 10 Sep 2026 22:50:41 +0530 Subject: [PATCH 3/6] Address Kotlin bindings review feedback --- payjoin-ffi/kotlin/CONTRIBUTING.md | 5 ++++- payjoin-ffi/kotlin/README.md | 4 +++- payjoin-ffi/kotlin/build.gradle.kts | 7 ++++++- .../kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/payjoin-ffi/kotlin/CONTRIBUTING.md b/payjoin-ffi/kotlin/CONTRIBUTING.md index 20908def2..b79bd6ca8 100644 --- a/payjoin-ffi/kotlin/CONTRIBUTING.md +++ b/payjoin-ffi/kotlin/CONTRIBUTING.md @@ -23,4 +23,7 @@ PAYJOIN_FFI_FEATURES= bash ./scripts/generate_bindings.sh Protocol `close` is renamed to `closeSession` only in `[bindings.kotlin.rename]` in `payjoin-ffi/uniffi.toml`, so it does not clash with `AutoCloseable.close()`. -A nix `.#kotlin` shell is not in the flake yet. Use a local JDK 21+ and the Gradle wrapper. +With nix, `nix develop .#kotlin` provides the pinned MSRV Rust toolchain, JDK 21, and +`BITCOIND_EXE` (via `nixpkgs`, with `BITCOIND_SKIP_DOWNLOAD=1`), and is what CI uses. Without +nix, use a local JDK 21+ and the Gradle wrapper; `corepc-node` will download `bitcoind` on +first test run. diff --git a/payjoin-ffi/kotlin/README.md b/payjoin-ffi/kotlin/README.md index 40ed7536a..c5807e467 100644 --- a/payjoin-ffi/kotlin/README.md +++ b/payjoin-ffi/kotlin/README.md @@ -18,7 +18,9 @@ bash ./scripts/generate_bindings.sh Or `bash ./contrib/test.sh` from this directory (uses `Cargo-recent.lock`). -`./gradlew test` includes a v2↔v2 integration test that starts a local payjoin directory, OHTTP relay, and bitcoind. Bitcoin Core is downloaded by corepc-node (`29_0`) on first run; it is not supplied by nix. +`./gradlew test` includes a v2↔v2 integration test that starts a local payjoin directory, OHTTP relay, and bitcoind. Inside the nix `.#kotlin` shell, `BITCOIND_EXE` points at the nixpkgs +`bitcoind` and `BITCOIND_SKIP_DOWNLOAD=1` is set, so no download happens. Outside the nix shell, +Bitcoin Core is downloaded by corepc-node (`29_0`) on first run instead. Without nix: Rust (see repo `rust-toolchain.toml` / MSRV 1.85), JDK 21+, and the Gradle wrapper in this directory. Network access is required the first time bitcoind is fetched. diff --git a/payjoin-ffi/kotlin/build.gradle.kts b/payjoin-ffi/kotlin/build.gradle.kts index 97e3b88ec..687a920bf 100644 --- a/payjoin-ffi/kotlin/build.gradle.kts +++ b/payjoin-ffi/kotlin/build.gradle.kts @@ -1,5 +1,9 @@ plugins { - kotlin("jvm") version "2.1.20" + // KGP's Gradle compatibility matrix must cover the wrapper version pinned in + // gradle/wrapper/gradle-wrapper.properties (currently 9.1.0). 2.1.20 only tests + // against Gradle up to 8.12.1; 2.3.20+ is the first stable KGP line whose matrix + // extends to 9.1.0 (tested up to 9.3.0). + kotlin("jvm") version "2.3.21" } repositories { @@ -32,6 +36,7 @@ tasks.test { .map { libDir.resolve(it) } .firstOrNull { it.exists() } if (native != null) { + inputs.file(native) systemProperty("uniffi.component.payjoin.libraryOverride", native.absolutePath) } systemProperty("jna.library.path", libDir.absolutePath) diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt index 8a88625b3..56aa0ef43 100644 --- a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt @@ -19,7 +19,7 @@ class UriTests { @Test fun missingAmountShouldBeOk() { val uri = "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX?pj=https://testnet.demo.btcpayserver.org/BTC/pj" - assertNotNull(Url.parse(uri)) + Uri.parse(uri).use { assertNotNull(it) } } @Test @@ -33,7 +33,7 @@ class UriTests { ) for (address in addresses) { for (pj in listOf(https, onion)) { - assertNotNull(Url.parse("$address?amount=1&pj=$pj")) + Uri.parse("$address?amount=1&pj=$pj").use { assertNotNull(it) } } } } From 64a8082305a138303dbea4888f2720e4820ee671 Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Sat, 12 Sep 2026 11:10:17 +0530 Subject: [PATCH 4/6] Compile production Kotlin bindings in CI and tighten FFI tests. Honor CARGO_TARGET_DIR, load the OS-native library, and assert percent-encoded URIs, overflow variants, and persister close via Rust. Co-authored-by: Cursor --- .github/workflows/kotlin.yml | 4 + payjoin-ffi/kotlin/build.gradle.kts | 10 +- .../kotlin/scripts/generate_bindings.sh | 28 ++-- .../kotlin/org/payjoindevkit/CancelTests.kt | 7 + .../org/payjoindevkit/IntegrationTests.kt | 64 ++++----- .../test/kotlin/org/payjoindevkit/UriTests.kt | 10 +- .../org/payjoindevkit/ValidationTests.kt | 129 ++++++++++++++++-- 7 files changed, 193 insertions(+), 59 deletions(-) diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml index fbda675ae..a6fe71437 100644 --- a/.github/workflows/kotlin.yml +++ b/.github/workflows/kotlin.yml @@ -36,3 +36,7 @@ jobs: uses: ./.github/actions/setup-nix - name: "Build and test" run: nix develop .#kotlin -c bash ./payjoin-ffi/kotlin/contrib/test.sh + - name: "Compile production bindings" + run: | + nix develop .#kotlin -c env PAYJOIN_FFI_FEATURES= bash ./payjoin-ffi/kotlin/scripts/generate_bindings.sh + nix develop .#kotlin -c bash -c 'cd payjoin-ffi/kotlin && ./gradlew --no-daemon compileKotlin' diff --git a/payjoin-ffi/kotlin/build.gradle.kts b/payjoin-ffi/kotlin/build.gradle.kts index 687a920bf..5f9e90e99 100644 --- a/payjoin-ffi/kotlin/build.gradle.kts +++ b/payjoin-ffi/kotlin/build.gradle.kts @@ -32,9 +32,13 @@ kotlin { tasks.test { useJUnitPlatform() val libDir = layout.projectDirectory.dir("lib").asFile - val native = listOf("libpayjoin_ffi.so", "libpayjoin_ffi.dylib", "payjoin_ffi.dll") - .map { libDir.resolve(it) } - .firstOrNull { it.exists() } + val os = System.getProperty("os.name").lowercase() + val nativeName = when { + os.contains("mac") || os.contains("darwin") -> "libpayjoin_ffi.dylib" + os.contains("win") -> "payjoin_ffi.dll" + else -> "libpayjoin_ffi.so" + } + val native = libDir.resolve(nativeName).takeIf { it.exists() } if (native != null) { inputs.file(native) systemProperty("uniffi.component.payjoin.libraryOverride", native.absolutePath) diff --git a/payjoin-ffi/kotlin/scripts/generate_bindings.sh b/payjoin-ffi/kotlin/scripts/generate_bindings.sh index 6199d8841..c56def793 100755 --- a/payjoin-ffi/kotlin/scripts/generate_bindings.sh +++ b/payjoin-ffi/kotlin/scripts/generate_bindings.sh @@ -26,25 +26,35 @@ if [[ $PAYJOIN_FFI_PROFILE == "dev" ]]; then else TARGET_PROFILE_DIR=$PAYJOIN_FFI_PROFILE fi -FEATURE_ARGS=() -if [[ -n $PAYJOIN_FFI_FEATURES ]]; then - FEATURE_ARGS=(--features "$PAYJOIN_FFI_FEATURES") -fi - -cargo build "${FEATURE_ARGS[@]}" --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi +# Empty FEATURE_ARGS + `set -u` is unbound on macOS bash 3.2. Pass --features only when set. +run_cargo() { + local cmd=$1 + shift + if [[ -n $PAYJOIN_FFI_FEATURES ]]; then + cargo "$cmd" --features "$PAYJOIN_FFI_FEATURES" "$@" + else + cargo "$cmd" "$@" + fi +} + +run_cargo build --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi + +# Cargo writes here when CARGO_TARGET_DIR is set; otherwise the workspace target/. +TARGET_ROOT="${CARGO_TARGET_DIR:-../target}" +NATIVE_LIB="$TARGET_ROOT/$TARGET_PROFILE_DIR/$LIBNAME" OUT_DIR="kotlin/src/main/kotlin" mkdir -p "$OUT_DIR" rm -rf "$OUT_DIR/org" # ktlint is optional; --no-format keeps generate working without it. -cargo run "${FEATURE_ARGS[@]}" --profile dev -p payjoin-ffi --bin uniffi-bindgen -- generate \ - --library "../target/$TARGET_PROFILE_DIR/$LIBNAME" \ +run_cargo run --profile dev -p payjoin-ffi --bin uniffi-bindgen -- generate \ + --library "$NATIVE_LIB" \ --language kotlin \ --out-dir "$OUT_DIR" \ --no-format mkdir -p kotlin/lib -cp "../target/$TARGET_PROFILE_DIR/$LIBNAME" "kotlin/lib/$LIBNAME" +cp "$NATIVE_LIB" "kotlin/lib/$LIBNAME" echo "All done!" diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt index 73ff6a5ae..c57bf16c0 100644 --- a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/CancelTests.kt @@ -1,6 +1,7 @@ package org.payjoindevkit import kotlin.test.Test +import kotlin.test.assertFalse import kotlin.test.assertIs import kotlin.test.assertNull import kotlin.test.assertTrue @@ -19,6 +20,7 @@ class CancelTests { val fallbackTx = initialized.cancel().save(persister) assertNull(fallbackTx) assertIs(replayReceiverEventLog(persister).state()) + assertTrue(persister.closed) } @Test @@ -33,6 +35,7 @@ class CancelTests { val fallbackTx = initialized.cancel().saveAsync(persister) assertNull(fallbackTx) assertIs(replayReceiverEventLogAsync(persister).state()) + assertTrue(persister.closed) } @Test @@ -50,8 +53,10 @@ class CancelTests { val pendingFallback = withReplyKey.cancel().save(persister) assertTrue(pendingFallback.fallbackTx().isNotEmpty()) assertIs(replaySenderEventLog(persister).state()) + assertFalse(persister.closed) pendingFallback.closeSession().save(persister) assertIs(replaySenderEventLog(persister).state()) + assertTrue(persister.closed) } @Test @@ -69,7 +74,9 @@ class CancelTests { val pendingFallback = withReplyKey.cancel().saveAsync(persister) assertTrue(pendingFallback.fallbackTx().isNotEmpty()) assertIs(replaySenderEventLogAsync(persister).state()) + assertFalse(persister.closed) pendingFallback.closeSession().saveAsync(persister) assertIs(replaySenderEventLogAsync(persister).state()) + assertTrue(persister.closed) } } diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt index 10f4b9f64..3f5617e12 100644 --- a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/IntegrationTests.kt @@ -397,50 +397,42 @@ private class MempoolAcceptanceCallback(private val connection: RpcClient) : Can private class IsScriptOwnedCallback(private val connection: RpcClient) : IsScriptOwned { override fun callback(script: ByteArray): Boolean { - return try { - val decoded = Json.parseToJsonElement( - rpc(connection, "decodescript", jstr(HexFormat.of().formatHex(script))), - ).jsonObject - val candidates = mutableListOf() - decoded["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } - decoded["addresses"]?.jsonArray?.forEach { item -> + val decoded = Json.parseToJsonElement( + rpc(connection, "decodescript", jstr(HexFormat.of().formatHex(script))), + ).jsonObject + val candidates = mutableListOf() + decoded["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + decoded["addresses"]?.jsonArray?.forEach { item -> + if (item.jsonPrimitive.isString) candidates.add(item.jsonPrimitive.content) + } + decoded["p2sh"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + decoded["segwit"]?.jsonObject?.let { segwit -> + segwit["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } + segwit["addresses"]?.jsonArray?.forEach { item -> if (item.jsonPrimitive.isString) candidates.add(item.jsonPrimitive.content) } - decoded["p2sh"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } - decoded["segwit"]?.jsonObject?.let { segwit -> - segwit["address"]?.jsonPrimitive?.contentOrNull?.let { candidates.add(it) } - segwit["addresses"]?.jsonArray?.forEach { item -> - if (item.jsonPrimitive.isString) candidates.add(item.jsonPrimitive.content) - } - } - candidates.any { addr -> - Json.parseToJsonElement(rpc(connection, "getaddressinfo", jstr(addr))) - .jsonObject["ismine"]?.jsonPrimitive?.booleanOrNull == true - } - } catch (_: Exception) { - false + } + return candidates.any { addr -> + Json.parseToJsonElement(rpc(connection, "getaddressinfo", jstr(addr))) + .jsonObject["ismine"]?.jsonPrimitive?.booleanOrNull == true } } } private class IsInputOwnedCallback(private val connection: RpcClient) : IsInputOwned { override fun callback(outpoint: OutPoint): Boolean { - return try { - val txOut = Json.parseToJsonElement( - rpc( - connection, - "gettxout", - jstr(outpoint.txid), - outpoint.vout.toString(), - "true", - ), - ) - if (txOut is JsonNull) return false - val scriptHex = txOut.jsonObject.getValue("scriptPubKey").jsonObject.getValue("hex").jsonPrimitive.content - IsScriptOwnedCallback(connection).callback(HexFormat.of().parseHex(scriptHex)) - } catch (_: Exception) { - false - } + val txOut = Json.parseToJsonElement( + rpc( + connection, + "gettxout", + jstr(outpoint.txid), + outpoint.vout.toString(), + "true", + ), + ) + if (txOut is JsonNull) return false + val scriptHex = txOut.jsonObject.getValue("scriptPubKey").jsonObject.getValue("hex").jsonPrimitive.content + return IsScriptOwnedCallback(connection).callback(HexFormat.of().parseHex(scriptHex)) } } diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt index 56aa0ef43..74a73e4f3 100644 --- a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/UriTests.kt @@ -1,17 +1,21 @@ package org.payjoindevkit import kotlin.test.Test -import kotlin.test.assertContains +import kotlin.test.assertEquals import kotlin.test.assertFailsWith import kotlin.test.assertNotNull class UriTests { @Test fun urlEncodedPayjoinParameter() { - val uri = "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX?amount=1&pj=https://example.com?ciao" + val endpoint = "https://example.com/pj?ciao=1" + val encodedPj = "https%3A%2F%2Fexample.com%2Fpj%3Fciao%3D1" + val uri = "bitcoin:12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX?amount=1&pj=$encodedPj" Uri.parse(uri).use { parsed -> + assertEquals("12c6DSiU4Rq3P4ZxziKxzrL5LmMBrzjrJX", parsed.address()) + assertEquals(100_000_000uL, parsed.amountSats()) parsed.checkPjSupported().use { pjUri -> - assertContains(pjUri.pjEndpoint(), "example.com") + assertEquals(endpoint, pjUri.pjEndpoint()) } } } diff --git a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt index c0bfd82e7..9bfc01e6a 100644 --- a/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt +++ b/payjoin-ffi/kotlin/src/test/kotlin/org/payjoindevkit/ValidationTests.kt @@ -2,6 +2,7 @@ package org.payjoindevkit import kotlin.test.Test import kotlin.test.assertFailsWith +import kotlin.test.assertIs class ValidationTests { @Test @@ -14,15 +15,107 @@ class ValidationTests { @Test fun inputPairRejectsInvalidOutpoint() { - assertFailsWith { - val txin = TxIn( - previousOutput = OutPoint(txid = "deadbeef", vout = 0u), - scriptSig = ByteArray(0), - sequence = 0u, - witness = emptyList(), + // Too-long txid fails outpoint parsing before amount / UTXO checks. + val tooLongTxid = "00".repeat(64) + assertFailsWith { + InputPair( + TxIn( + previousOutput = OutPoint(txid = tooLongTxid, vout = 0u), + scriptSig = ByteArray(0), + sequence = 0u, + witness = emptyList(), + ), + dummyPsbtInput(TOO_LARGE_AMOUNT_SATS), + null, ) - val psbtin = PsbtInput(witnessUtxo = null, redeemScript = null, witnessScript = null) - InputPair(txin, psbtin, null) + } + } + + @Test + fun inputPairRejectsAmountOverflow() { + val ex = assertFailsWith { + InputPair( + TxIn( + previousOutput = OutPoint(txid = VALID_TXID, vout = 0u), + scriptSig = ByteArray(0), + sequence = 0u, + witness = emptyList(), + ), + dummyPsbtInput(TOO_LARGE_AMOUNT_SATS), + null, + ) + } + assertIs(ex.v1) + } + + @Test + fun receiverBuilderRejectsAmountOverflow() { + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + ReceiverBuilder( + "tb1q6d3a2w975yny0asuvd9a67ner4nks58ff0q8g4", + "https://example.com", + ohttpKeys, + ).use { builder -> + assertFailsWith { + builder.withAmount(TOO_LARGE_AMOUNT_SATS) + } + } + } + + @Test + fun senderBuilderWithAdditionalFeeRejectsAmountOverflow() { + v2PjUri().use { uri -> + SenderBuilder(originalPsbt(), uri).use { builder -> + val ex = assertFailsWith { + builder.buildWithAdditionalFee(TOO_LARGE_AMOUNT_SATS, null, 1000u, false) + } + assertIs(ex.v1) + } + } + } + + @Test + fun senderBuilderWithAdditionalFeeRejectsFeeRateOverflow() { + v2PjUri().use { uri -> + SenderBuilder(originalPsbt(), uri).use { builder -> + val ex = assertFailsWith { + builder.buildWithAdditionalFee(1u, null, ULong.MAX_VALUE, false) + } + assertIs(ex.v1) + } + } + } + + @Test + fun senderBuilderRecommendedRejectsFeeRateOverflow() { + v2PjUri().use { uri -> + SenderBuilder(originalPsbt(), uri).use { builder -> + val ex = assertFailsWith { + builder.buildRecommended(ULong.MAX_VALUE) + } + assertIs(ex.v1) + } + } + } + + @Test + fun senderBuilderNonIncentivizingRejectsFeeRateOverflow() { + v2PjUri().use { uri -> + SenderBuilder(originalPsbt(), uri).use { builder -> + val ex = assertFailsWith { + builder.buildNonIncentivizing(ULong.MAX_VALUE) + } + assertIs(ex.v1) + } + } + } + + @Test + fun pjUriRejectsAmountOverflow() { + v2PjUri().use { uri -> + assertFailsWith { + uri.setAmountSats(TOO_LARGE_AMOUNT_SATS) + } } } @@ -36,3 +129,23 @@ class ValidationTests { } } } + +private const val VALID_TXID = "0000000000000000000000000000000000000000000000000000000000000000" +private val TOO_LARGE_AMOUNT_SATS = 21_000_000uL * 100_000_000uL + 1uL + +private fun dummyPsbtInput(amountSat: ULong): PsbtInput = + PsbtInput( + witnessUtxo = TxOut(amountSat, byteArrayOf(0x6a)), + redeemScript = null, + witnessScript = null, + ) + +private fun v2PjUri(): PjUri { + val persister = InMemoryReceiverPersister() + val ohttpKeys = OhttpKeys.decode(ohttpKeysData) + return ReceiverBuilder( + "2MuyMrZHkbHbfjudmKUy45dU4P17pjG2szK", + "https://example.com", + ohttpKeys, + ).build().save(persister).pjUri() +} From 3e025b2c6c2575a39dacee3dcf8cb4cd5a4cb64d Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Sat, 12 Sep 2026 16:54:08 +0530 Subject: [PATCH 5/6] Resolve the Kotlin native lib path from cargo metadata. Honor CARGO_TARGET_DIR and [build] target-dir instead of assuming ../target. Co-authored-by: Cursor --- payjoin-ffi/kotlin/scripts/generate_bindings.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/payjoin-ffi/kotlin/scripts/generate_bindings.sh b/payjoin-ffi/kotlin/scripts/generate_bindings.sh index c56def793..3b629b2b6 100755 --- a/payjoin-ffi/kotlin/scripts/generate_bindings.sh +++ b/payjoin-ffi/kotlin/scripts/generate_bindings.sh @@ -39,8 +39,13 @@ run_cargo() { run_cargo build --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi -# Cargo writes here when CARGO_TARGET_DIR is set; otherwise the workspace target/. -TARGET_ROOT="${CARGO_TARGET_DIR:-../target}" +# cargo metadata honors CARGO_TARGET_DIR and [build] target-dir. The kotlin +# nix shell has no python/jq; metadata is one line so sed is enough. +TARGET_ROOT="$(cargo metadata --format-version 1 --no-deps | sed -n 's/.*"target_directory":"\([^"]*\)".*/\1/p')" +if [[ -z $TARGET_ROOT ]]; then + echo "failed to read target_directory from cargo metadata" >&2 + exit 1 +fi NATIVE_LIB="$TARGET_ROOT/$TARGET_PROFILE_DIR/$LIBNAME" OUT_DIR="kotlin/src/main/kotlin" From 7c8ba18a160714bb070e811d32078514f04d724f Mon Sep 17 00:00:00 2001 From: ram0verflow Date: Sun, 13 Sep 2026 18:55:23 +0530 Subject: [PATCH 6/6] Take the Kotlin native library path from cargo build JSON. Use the compiler-artifact filename so generate follows target-dir, CARGO_BUILD_TARGET, and custom profiles. --- flake.nix | 1 + .../kotlin/scripts/generate_bindings.sh | 42 +++++++++++++------ 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 2b57b61fd..afee40989 100644 --- a/flake.nix +++ b/flake.nix @@ -396,6 +396,7 @@ [ rustVersions.msrv jdk21 + python3 bzip2 ] ++ lib.optionals pkgs.stdenv.isLinux [ diff --git a/payjoin-ffi/kotlin/scripts/generate_bindings.sh b/payjoin-ffi/kotlin/scripts/generate_bindings.sh index 3b629b2b6..1f33111d4 100755 --- a/payjoin-ffi/kotlin/scripts/generate_bindings.sh +++ b/payjoin-ffi/kotlin/scripts/generate_bindings.sh @@ -21,10 +21,9 @@ cd "$SCRIPT_DIR/../.." echo "Generating payjoin Kotlin..." PAYJOIN_FFI_FEATURES=${PAYJOIN_FFI_FEATURES-_test-utils} PAYJOIN_FFI_PROFILE=${PAYJOIN_FFI_PROFILE:-dev} -if [[ $PAYJOIN_FFI_PROFILE == "dev" ]]; then - TARGET_PROFILE_DIR=debug -else - TARGET_PROFILE_DIR=$PAYJOIN_FFI_PROFILE +if ! command -v python3 >/dev/null 2>&1; then + echo "python3 is required to parse cargo --message-format=json" >&2 + exit 1 fi # Empty FEATURE_ARGS + `set -u` is unbound on macOS bash 3.2. Pass --features only when set. run_cargo() { @@ -37,16 +36,33 @@ run_cargo() { fi } -run_cargo build --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi +# compiler-artifact filenames include target-dir, CARGO_BUILD_TARGET, and profile. +NATIVE_LIB="$( + run_cargo build --message-format=json --profile "$PAYJOIN_FFI_PROFILE" -p payjoin-ffi | + python3 -c ' +import json, os, sys -# cargo metadata honors CARGO_TARGET_DIR and [build] target-dir. The kotlin -# nix shell has no python/jq; metadata is one line so sed is enough. -TARGET_ROOT="$(cargo metadata --format-version 1 --no-deps | sed -n 's/.*"target_directory":"\([^"]*\)".*/\1/p')" -if [[ -z $TARGET_ROOT ]]; then - echo "failed to read target_directory from cargo metadata" >&2 - exit 1 -fi -NATIVE_LIB="$TARGET_ROOT/$TARGET_PROFILE_DIR/$LIBNAME" +libname = sys.argv[1] +found = None +for line in sys.stdin: + line = line.strip() + if not line: + continue + try: + msg = json.loads(line) + except json.JSONDecodeError: + continue + if msg.get("reason") != "compiler-artifact": + continue + for filename in msg.get("filenames") or []: + if os.path.basename(filename) == libname: + found = filename +if not found: + sys.stderr.write("cargo build did not report %s\n" % libname) + sys.exit(1) +print(found) +' "$LIBNAME" +)" OUT_DIR="kotlin/src/main/kotlin" mkdir -p "$OUT_DIR"