Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions .github/workflows/publish-android.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,18 +6,32 @@ on:
workflow_dispatch:
inputs:
version:
description: "Version to publish (e.g., v0.1.0)"
description: "Version/tag to publish (e.g., v0.7.0-rc.50 or 0.7.0-rc.50)"
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write
packages: write

steps:
- name: Normalize release version
id: version
shell: bash
run: |
VERSION="${{ github.event.inputs.version || github.event.release.tag_name || github.ref_name }}"
TAG="$VERSION"
if [[ "$TAG" != v* ]]; then
TAG="v$TAG"
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"

- uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.tag }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All@@ -29,24 +43,44 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Extract version from input or tag
id: version
shell: bash
run: |
VERSION="${{ inputs.version }}"
if [[ -z "$VERSION" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
- name: Install native build dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config protobuf-compiler

- name: Set up Android SDK
uses: android-actions/setup-android@v3

- name: Set up Android NDK
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r28c
add-to-path: true
Comment thread
ovitrif marked this conversation as resolved.

- name: Export Android NDK root
run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"

- name: Generate Android bindings
run: scripts/uniffi_bindgen_generate_kotlin_android.sh

- name: Build with Gradle
working-directory: bindings/kotlin/ldk-node-android
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}

- name: Upload native debug symbols artifact
uses: actions/upload-artifact@v4
with:
name: ldk-node-native-debug-symbols-${{ steps.version.outputs.version }}
path: bindings/kotlin/ldk-node-android/native-debug-symbols.zip

- name: Upload native debug symbols to release
env:
GH_TOKEN: ${{ github.token }}
run: gh release upload "${{ steps.version.outputs.tag }}" bindings/kotlin/ldk-node-android/native-debug-symbols.zip --clobber
Comment thread
ovitrif marked this conversation as resolved.

- name: Publish to GitHub Packages
working-directory: bindings/kotlin/ldk-node-android
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
GITHUB_REPO: ${{ github.repository }}
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}
1 change: 1 addition & 0 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
# will have compiled files and executables
/target/
/bindings/uniffi-bindgen/target/
/bindings/kotlin/ldk-node-android/native-debug-symbols.zip

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
# 0.7.0-rc.46 (Synonym Fork)
# 0.7.0-rc.51 (Synonym Fork)

## Bug Fixes

- Published stripped `ldk-node-android` artifacts with separate native debug symbols
and failed Android binding generation when generated JNI libraries lack usable symbols.
- Persist missing announced channel peers from the network graph during
build-time restore and after Rapid Gossip Sync graph updates. Automatic
recovery respects explicit disconnects and last-channel closes during the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]

[package]
name = "ldk-node"
version = "0.7.0-rc.46"
version = "0.7.0-rc.51"
authors = ["Elias Rohrer <dev@tnull.de>"]
homepage = "https://lightningdevkit.org/"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,8 @@

import PackageDescription

let tag = "v0.7.0-rc.46"
let checksum = "06558c2834c186d3da188389ef197942e948ac4f6f3261746e3594420ab0ee23"
let tag = "v0.7.0-rc.51"
let checksum = "efeec8d0480f1400c6a4203232359f5b3c4c338a4ba13826538cac12b8fe1bac"
let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"

let package = Package(
Expand Down
2 changes: 1 addition & 1 deletion bindings/kotlin/ldk-node-android/gradle.properties
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official
group=com.synonym
version=0.7.0-rc.46
version=0.7.0-rc.51
108 changes: 108 additions & 0 deletions bindings/kotlin/ldk-node-android/lib/build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
import java.io.ByteArrayOutputStream
import java.io.File

plugins {
id("com.android.library")
kotlin("android")
Expand DownExpand Up@@ -58,6 +61,107 @@ dependencies {
api("org.slf4j:slf4j-api:1.7.30")
}

val androidNativeAbis = listOf("armeabi-v7a", "arm64-v8a", "x86_64")

fun executableFromPath(name: String): String? {
return System.getenv("PATH")
?.split(File.pathSeparator)
?.asSequence()
?.map { File(it, name) }
?.firstOrNull { it.canExecute() }
?.absolutePath
}

fun findReadelf(): String {
executableFromPath("llvm-readelf")?.let { return it }
executableFromPath("readelf")?.let { return it }

return listOf("ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "NDK_HOME")
.mapNotNull { System.getenv(it) }
.map { File(it, "toolchains/llvm/prebuilt") }
.firstNotNullOfOrNull { prebuiltDir ->
if (!prebuiltDir.isDirectory) return@firstNotNullOfOrNull null

prebuiltDir
.walkTopDown()
.firstOrNull { it.name == "llvm-readelf" && it.canExecute() }
?.absolutePath
}
?: throw GradleException(
"llvm-readelf or readelf is required to validate Android native debug symbols"
)
}

fun Project.runReadelf(readelf: String, vararg args: String): Pair<Int, String> {
val stdout = ByteArrayOutputStream()
val stderr = ByteArrayOutputStream()
val result = exec {
commandLine(readelf, *args)
standardOutput = stdout
errorOutput = stderr
isIgnoreExitValue = true
}

return result.exitValue to stdout.toString().ifBlank { stderr.toString() }
}

fun String.parseElfAlignment(): Long {
return if (startsWith("0x")) {
removePrefix("0x").toLong(16)
} else {
toLong()
}
}

val validateReleaseNativeLibraries by tasks.registering {
group = "verification"
description = "Validates release JNI libraries are stripped and keep 16 KB LOAD alignment."

doLast {
val readelf = findReadelf()
val loadAlignmentRegex = Regex("""^\s*LOAD\s+.*\s+(0x[0-9a-fA-F]+|\d+)\s*$""")

androidNativeAbis.forEach { abi ->
val lib = layout.projectDirectory.file("src/main/jniLibs/$abi/libldk_node.so").asFile
if (!lib.isFile) {
throw GradleException("Android native library missing at '${lib.path}'")
}

val (sectionsExit, sections) = runReadelf(readelf, "-S", lib.absolutePath)
if (sectionsExit != 0) {
throw GradleException("Unable to inspect Android native library sections: '${lib.path}'")
}
if (Regex("""\.debug_""").containsMatchIn(sections)) {
throw GradleException("Android release native library still contains .debug_* sections: '${lib.path}'")
}

val wideHeaders = runReadelf(readelf, "-W", "-l", lib.absolutePath)
val headers = if (wideHeaders.first == 0) {
wideHeaders.second
} else {
val fallbackHeaders = runReadelf(readelf, "-l", lib.absolutePath)
if (fallbackHeaders.first != 0) {
throw GradleException("Unable to inspect Android native library headers: '${lib.path}'")
}
fallbackHeaders.second
}

val alignments = headers
.lineSequence()
.mapNotNull { loadAlignmentRegex.matchEntire(it)?.groupValues?.get(1)?.parseElfAlignment() }
.toList()

if (alignments.isEmpty() || alignments.any { it < 16_384 }) {
throw GradleException("Android native library is not 16 KB page-size aligned: '${lib.path}'")
}
}
}
}

tasks.matching { it.name == "bundleReleaseAar" || it.name.startsWith("publish") }.configureEach {
dependsOn(validateReleaseNativeLibraries)
}

afterEvaluate {
publishing {
publications {
Expand All@@ -68,6 +172,10 @@ afterEvaluate {
version = providers.gradleProperty("version").orNull ?: "0.0.0"

from(components["release"])
artifact(rootProject.layout.projectDirectory.file("native-debug-symbols.zip")) {
classifier = "native-debug-symbols"
extension = "zip"
}
pom {
name.set(mavenArtifactId)
description.set("LDK Node Android bindings (Synonym fork).")
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading