diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09b30403b9..4a0ebca4c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -497,6 +497,25 @@ jobs: - name: Run Dart tests run: nix develop -L .#bindings --command just test-dart + kotlin-binding-tests: + name: "Kotlin binding tests" + runs-on: self-hosted + timeout-minutes: 30 + needs: pre-commit-checks + steps: + - name: checkout + uses: actions/checkout@v4 + - uses: cachix/cachix-action@v16 + with: + name: cashudevkit + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + useDaemon: false + continue-on-error: true + - name: Build native library and generate bindings + run: nix develop -L .#bindings --command just binding-kotlin + - name: Run Kotlin tests + run: nix develop -L .#bindings --command just test-kotlin + swift-binding-tests: name: "Swift binding tests" runs-on: macos-latest diff --git a/.gitignore b/.gitignore index 37a4287d85..3b0031a6d4 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,17 @@ __pycache__ libcdk_ffi* cdk_ffi.py +# Kotlin bindings +.gradle/ +!gradle/wrapper/gradle-wrapper.jar +local.properties +*.iml +*.ipr +*.iws +bin/ +gen/ +out/ +bindings/kotlin/cdk-jvm/src/main/kotlin/uniffi/ +bindings/kotlin/cdk-jvm/src/main/resources/*.so +bindings/kotlin/cdk-jvm/src/main/resources/*.dylib + diff --git a/Cargo.lock b/Cargo.lock index be0e366192..d7879b88a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1423,6 +1423,14 @@ dependencies = [ "uniffi-dart", ] +[[package]] +name = "cdk-ffi-kotlin" +version = "0.16.0" +dependencies = [ + "cdk-ffi", + "uniffi", +] + [[package]] name = "cdk-ffi-swift" version = "0.16.0" diff --git a/Cargo.toml b/Cargo.toml index ecb9deccf7..e95ac0eaa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = [ "crates/*", "bindings/dart/rust", "bindings/swift/rust", + "bindings/kotlin/rust", ] exclude = [ "fuzz", diff --git a/bindings/dart/generate-bindings.sh b/bindings/dart/generate-bindings.sh deleted file mode 100755 index e13fde060e..0000000000 --- a/bindings/dart/generate-bindings.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -DART_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -RUST_DIR="$DART_DIR/rust" -OS=$(uname -s) - -echo "🚀 CDK Dart Bindings Generator" -echo "====================================" -echo "Running on: $OS" -echo "" - -cd "$DART_DIR" -echo "📦 Checking Dart version..." -dart --version -echo "" - -echo "📥 Getting Dart dependencies..." -dart pub get -echo "" - -if [[ "$OS" == "Darwin" ]]; then - LIB_EXT="dylib" -elif [[ "$OS" == "Linux" ]]; then - LIB_EXT="so" -else - echo "❌ Unsupported OS: $OS" - exit 1 -fi - -cd "$RUST_DIR" -echo "🔨 Building cdk_ffi_dart..." -cargo build --release - -CDK_FFI_LIB=$(find "$DART_DIR/../../target/release/deps" -name "libcdk_ffi*.$LIB_EXT" -type f | head -1) - -if [ -z "$CDK_FFI_LIB" ]; then - echo "❌ Error: Could not find cdk-ffi library in target/release/deps" - exit 1 -fi - -echo "📚 Using cdk-ffi library: $CDK_FFI_LIB" -echo "" - -echo "🔧 Generating Dart bindings..." -cargo run --release --bin uniffi-bindgen -- "$CDK_FFI_LIB" --out-dir "$DART_DIR/lib/src/generated" - -echo "" -echo "✅ Dart bindings generated successfully!" -echo "📄 Output: $DART_DIR/lib/src/generated/cdk.dart" diff --git a/bindings/dart/rust/rust-toolchain.toml b/bindings/dart/rust/rust-toolchain.toml deleted file mode 100644 index 52089fb183..0000000000 --- a/bindings/dart/rust/rust-toolchain.toml +++ /dev/null @@ -1,29 +0,0 @@ -[toolchain] -channel = "1.90.0" -components = ["clippy", "rustfmt"] - - -# The targets to support -targets = [ - # Android - "armv7-linux-androideabi", - "aarch64-linux-android", - "x86_64-linux-android", - - # iOS (device + simulator) - "aarch64-apple-ios", - "aarch64-apple-ios-sim", - "x86_64-apple-ios", - - # Windows - "aarch64-pc-windows-msvc", - "x86_64-pc-windows-msvc", - - # Linux - "aarch64-unknown-linux-gnu", - "x86_64-unknown-linux-gnu", - - # macOS - "aarch64-apple-darwin", - "x86_64-apple-darwin", -] diff --git a/bindings/kotlin/build.gradle.kts b/bindings/kotlin/build.gradle.kts new file mode 100644 index 0000000000..2b2d410c07 --- /dev/null +++ b/bindings/kotlin/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + kotlin("jvm") version "1.9.24" apply false +} diff --git a/bindings/kotlin/cdk-jvm/build.gradle.kts b/bindings/kotlin/cdk-jvm/build.gradle.kts new file mode 100644 index 0000000000..cc52697084 --- /dev/null +++ b/bindings/kotlin/cdk-jvm/build.gradle.kts @@ -0,0 +1,57 @@ +plugins { + kotlin("jvm") + `java-library` + `maven-publish` +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + withSourcesJar() + withJavadocJar() +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + implementation("net.java.dev.jna:jna:5.14.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") +} + +sourceSets { + main { + kotlin.srcDirs("src/main/kotlin") + resources.srcDirs("src/main/resources") + } +} + +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + showStandardStreams = true + } + systemProperty("junit.jupiter.execution.timeout.default", "60s") + jvmArgs("-Djava.library.path=${project.projectDir}/src/main/resources") +} + +tasks.processResources { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} + +publishing { + publications { + create("maven") { + groupId = project.property("GROUP") as String + artifactId = "cdk-jvm" + version = project.property("VERSION_NAME") as String + from(components["java"]) + } + } +} diff --git a/bindings/kotlin/cdk-jvm/src/test/kotlin/org/cashudevkit/WalletTest.kt b/bindings/kotlin/cdk-jvm/src/test/kotlin/org/cashudevkit/WalletTest.kt new file mode 100644 index 0000000000..a9dc41dc69 --- /dev/null +++ b/bindings/kotlin/cdk-jvm/src/test/kotlin/org/cashudevkit/WalletTest.kt @@ -0,0 +1,66 @@ +package org.cashudevkit + +import kotlinx.coroutines.runBlocking +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.* +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import java.io.File + +class WalletTest { + + private lateinit var wallet: Wallet + private lateinit var dbFile: File + + @BeforeEach + fun setUp() { + dbFile = File.createTempFile("cdk_test_", ".sqlite") + val mnemonic = generateMnemonic() + wallet = Wallet( + mintUrl = "https://testnut.cashudevkit.org", + unit = CurrencyUnit.Sat, + mnemonic = mnemonic, + store = WalletStore.Sqlite(path = dbFile.absolutePath), + config = WalletConfig(targetProofCount = null), + ) + } + + @AfterEach + fun tearDown() { + wallet.close() + dbFile.delete() + } + + @Test + fun `initial balance is zero`() = runBlocking { + val balance = wallet.totalBalance() + assertEquals(0UL, balance.value) + } + + @Test + fun `mint flow`() = runBlocking { + val quote = wallet.mintQuote( + paymentMethod = PaymentMethod.Bolt11, + amount = Amount(value = 100UL), + description = null, + extra = null, + ) + + assertTrue(quote.id.isNotEmpty()) + assertTrue(quote.request.isNotEmpty()) + + // testnut pays quotes automatically, wait for payment to settle + kotlinx.coroutines.delay(3000) + + val proofs = wallet.mint( + quoteId = quote.id, + amountSplitTarget = SplitTarget.None, + spendingConditions = null, + ) + + assertTrue(proofs.isNotEmpty()) + + val balance = wallet.totalBalance() + assertEquals(100UL, balance.value) + } +} diff --git a/bindings/kotlin/gradle.properties b/bindings/kotlin/gradle.properties new file mode 100644 index 0000000000..fc88281568 --- /dev/null +++ b/bindings/kotlin/gradle.properties @@ -0,0 +1,7 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.parallel=true +org.gradle.caching=true +kotlin.code.style=official + +GROUP=org.cashudevkit +VERSION_NAME=0.16.0-rc.2 diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar b/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..a4b76b9530 Binary files /dev/null and b/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties b/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..e18bc253b8 --- /dev/null +++ b/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/bindings/kotlin/gradlew b/bindings/kotlin/gradlew new file mode 100755 index 0000000000..f3b75f3b0d --- /dev/null +++ b/bindings/kotlin/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 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 + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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, 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/bindings/kotlin/gradlew.bat b/bindings/kotlin/gradlew.bat new file mode 100644 index 0000000000..9b42019c79 --- /dev/null +++ b/bindings/kotlin/gradlew.bat @@ -0,0 +1,94 @@ +@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 + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +: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/bindings/kotlin/rust/Cargo.toml b/bindings/kotlin/rust/Cargo.toml new file mode 100644 index 0000000000..f5ed12c49b --- /dev/null +++ b/bindings/kotlin/rust/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "cdk-ffi-kotlin" +edition.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +version.workspace = true +readme.workspace = true + +[lib] +crate-type = ["staticlib", "cdylib"] +name = "cdk_ffi_kotlin" + +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + +[dependencies] +cdk-ffi.workspace = true +uniffi = { workspace = true, features = ["cli"] } + +[build-dependencies] +uniffi = { workspace = true, features = ["build"] } + +[lints] +workspace = true diff --git a/bindings/kotlin/rust/src/lib.rs b/bindings/kotlin/rust/src/lib.rs new file mode 100644 index 0000000000..b6dcf04e68 --- /dev/null +++ b/bindings/kotlin/rust/src/lib.rs @@ -0,0 +1,2 @@ +//! CDK FFI bindings for Kotlin/JVM +pub use cdk_ffi::*; diff --git a/bindings/kotlin/rust/uniffi-bindgen.rs b/bindings/kotlin/rust/uniffi-bindgen.rs new file mode 100644 index 0000000000..3222a23b1b --- /dev/null +++ b/bindings/kotlin/rust/uniffi-bindgen.rs @@ -0,0 +1,4 @@ +//! UniFFI binding generator for Kotlin +fn main() { + uniffi::uniffi_bindgen_main() +} diff --git a/bindings/kotlin/rust/uniffi.toml b/bindings/kotlin/rust/uniffi.toml new file mode 100644 index 0000000000..59b3054faa --- /dev/null +++ b/bindings/kotlin/rust/uniffi.toml @@ -0,0 +1,3 @@ +[bindings.kotlin] +package_name = "org.cashudevkit" +cdylib_name = "cdk_ffi_kotlin" diff --git a/bindings/kotlin/settings.gradle.kts b/bindings/kotlin/settings.gradle.kts new file mode 100644 index 0000000000..6561cd80ff --- /dev/null +++ b/bindings/kotlin/settings.gradle.kts @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +rootProject.name = "cdk" +include("cdk-jvm") diff --git a/bindings/swift/rust/rust-toolchain.toml b/bindings/swift/rust/rust-toolchain.toml deleted file mode 100644 index 52089fb183..0000000000 --- a/bindings/swift/rust/rust-toolchain.toml +++ /dev/null @@ -1,29 +0,0 @@ -[toolchain] -channel = "1.90.0" -components = ["clippy", "rustfmt"] - - -# The targets to support -targets = [ - # Android - "armv7-linux-androideabi", - "aarch64-linux-android", - "x86_64-linux-android", - - # iOS (device + simulator) - "aarch64-apple-ios", - "aarch64-apple-ios-sim", - "x86_64-apple-ios", - - # Windows - "aarch64-pc-windows-msvc", - "x86_64-pc-windows-msvc", - - # Linux - "aarch64-unknown-linux-gnu", - "x86_64-unknown-linux-gnu", - - # macOS - "aarch64-apple-darwin", - "x86_64-apple-darwin", -] diff --git a/flake.nix b/flake.nix index 37b8b64d85..fce4509ebe 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,15 @@ "aarch64-darwin" = "aarch64-apple-darwin"; }.${system} or null; + # Rust host target triple (used by binding derivations) + hostTarget = + { + "x86_64-linux" = "x86_64-unknown-linux-gnu"; + "aarch64-linux" = "aarch64-unknown-linux-gnu"; + "x86_64-darwin" = "x86_64-apple-darwin"; + "aarch64-darwin" = "aarch64-apple-darwin"; + }.${system}; + cargoTargetEnvName = { "x86_64-linux" = "CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER"; @@ -353,7 +362,7 @@ commonCraneArgsMsrv // { pname = "cdk-deps-msrv"; - cargoExtraArgs = "--workspace --exclude cdk-redb --exclude cdk-integration-tests --exclude cdk-ffi-dart --exclude cdk-ffi-swift"; + cargoExtraArgs = "--workspace --exclude cdk-redb --exclude cdk-integration-tests --exclude cdk-ffi-dart --exclude cdk-ffi-swift --exclude cdk-ffi-kotlin"; } ); @@ -526,6 +535,86 @@ } ); + # ======================================== + # Language binding derivations (cached by Cachix) + # ======================================== + + # Dart FFI bindings: builds cdk-ffi-dart cdylib + generates Dart source + dartBindings = craneLib.mkCargoDerivation ( + commonCraneArgs + // { + pname = "cdk-dart-bindings"; + cargoArtifacts = workspaceDeps; + buildPhaseCargoCommand = '' + # Build the Dart FFI cdylib + cargo build --release -p cdk-ffi-dart + + LIB_EXT="${if isDarwin then "dylib" else "so"}" + + # Find the cdk-ffi-dart shared library in deps (contains UniFFI metadata) + CDK_FFI_LIB="target/release/deps/libcdk_ffi_dart.$LIB_EXT" + + if [ ! -f "$CDK_FFI_LIB" ]; then + echo "ERROR: Could not find $CDK_FFI_LIB" + ls -la target/release/deps/libcdk_ffi* || true + exit 1 + fi + + echo "Using library: $CDK_FFI_LIB" + + # Generate Dart bindings via the custom uniffi-bindgen binary + # Must run from bindings/dart/rust/ so it finds uniffi.toml + (cd bindings/dart/rust && \ + cargo run --release -p cdk-ffi-dart --bin uniffi-bindgen -- \ + "../../../$CDK_FFI_LIB" --out-dir ../../../target/dart-bindings) + ''; + installPhaseCommand = '' + LIB_EXT="${if isDarwin then "dylib" else "so"}" + mkdir -p $out/lib/src/generated + cp target/dart-bindings/*.dart $out/lib/src/generated/ + cp target/release/libcdk_ffi_dart.$LIB_EXT $out/lib/src/generated/ + ''; + } + ); + + # Kotlin JVM bindings: builds cdk-ffi-kotlin cdylib + generates Kotlin sources + kotlinBindings = craneLib.mkCargoDerivation ( + commonCraneArgs + // { + pname = "cdk-kotlin-bindings"; + cargoArtifacts = workspaceDeps; + buildPhaseCargoCommand = '' + LIB_EXT="${if isDarwin then "dylib" else "so"}" + + # Build for host target + cargo build --release -p cdk-ffi-kotlin --target "${hostTarget}" + + # Generate Kotlin bindings + cargo run --release -p cdk-ffi-kotlin --bin uniffi-bindgen -- generate \ + --library "target/${hostTarget}/release/libcdk_ffi_kotlin.$LIB_EXT" \ + --language kotlin \ + --out-dir target/kotlin-bindings \ + --no-format + ''; + installPhaseCommand = '' + LIB_EXT="${if isDarwin then "dylib" else "so"}" + + mkdir -p $out/cdk-jvm/src/main/kotlin + mkdir -p $out/cdk-jvm/src/main/resources + + # Copy generated Kotlin sources + cp -r target/kotlin-bindings/org $out/cdk-jvm/src/main/kotlin/ + + # Copy native library (renamed to libcdk_ffi for JNA convention) + cp "target/${hostTarget}/release/libcdk_ffi_kotlin.$LIB_EXT" \ + "$out/cdk-jvm/src/main/resources/libcdk_ffi.$LIB_EXT" + + # Strip debug symbols + strip -x "$out/cdk-jvm/src/main/resources/libcdk_ffi.$LIB_EXT" 2>/dev/null || true + ''; + } + ); + # ======================================== # Example definitions - single source of truth # ======================================== @@ -977,6 +1066,9 @@ packages = { deps = workspaceDeps; deps-msrv = workspaceDepsMsrv; + # Language bindings (cached cdylib + uniffi codegen) + dart-bindings = dartBindings; + kotlin-bindings = kotlinBindings; } # Static build deps (Linux only) // lib.optionalAttrs (muslTarget != null) { @@ -1223,7 +1315,7 @@ // envVars ); - # Shell for bindings development (Dart + Swift FFI) + # Shell for bindings development (Dart + Swift + Kotlin FFI) bindings = pkgs.mkShell ( { shellHook = commonShellHook; @@ -1232,6 +1324,7 @@ rustupShim dartpkgs.default pkgs.openssl + pkgs.jdk17 ]; nativeBuildInputs = [ pkgs.pkg-config diff --git a/justfile b/justfile index 51ed2c6759..a797a5cccf 100644 --- a/justfile +++ b/justfile @@ -840,20 +840,41 @@ ffi-release-kotlin VERSION: echo "✅ Kotlin workflow triggered successfully!" -# Generate Dart FFI bindings +# Generate Dart FFI bindings via nix binding-dart: #!/usr/bin/env bash set -euo pipefail - cd "{{justfile_directory()}}/bindings/dart" - ./generate-bindings.sh + cd "{{justfile_directory()}}" + result=$(nix build .#dart-bindings --print-out-paths --no-link) + cp -r "$result"/* bindings/dart/ + chmod -R u+w bindings/dart/lib/src/generated/ # Run Dart binding tests test-dart: #!/usr/bin/env bash set -euo pipefail - cd "{{justfile_directory()}}/bindings/dart" + cd "{{justfile_directory()}}" + cp rust-toolchain.toml bindings/dart/rust/rust-toolchain.toml + trap 'rm -f bindings/dart/rust/rust-toolchain.toml' EXIT + cd bindings/dart dart test +# Generate Kotlin JVM bindings via nix +binding-kotlin: + #!/usr/bin/env bash + set -euo pipefail + cd "{{justfile_directory()}}" + result=$(nix build .#kotlin-bindings --print-out-paths --no-link) + cp -r "$result"/* bindings/kotlin/ + chmod -R u+w bindings/kotlin/cdk-jvm/src/main/kotlin bindings/kotlin/cdk-jvm/src/main/resources + +# Run Kotlin binding tests +test-kotlin: + #!/usr/bin/env bash + set -euo pipefail + cd "{{justfile_directory()}}/bindings/kotlin" + ./gradlew :cdk-jvm:test + # Generate Swift FFI bindings and XCFramework binding-swift: #!/usr/bin/env bash diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e768ba7587..ca19c82a14 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,28 @@ [toolchain] -channel="1.94.0" +channel = "1.94.0" components = ["rustfmt", "clippy", "rust-analyzer"] +targets = [ + # Android + "armv7-linux-androideabi", + "aarch64-linux-android", + "x86_64-linux-android", + + # iOS (device + simulator) + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "x86_64-apple-ios", + + # Windows + "aarch64-pc-windows-msvc", + "x86_64-pc-windows-msvc", + + # Linux + "aarch64-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", + + # macOS + "aarch64-apple-darwin", + "x86_64-apple-darwin", +] +