Merge pull request #63 from synonymdev/chore/upstream-rust-ln

ovitrif · web-flow · commit 01c6e61938ac · 2026-02-27T18:32:04.000+01:00
chore: use upstream rust-lightning v0.2.2
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -1,8 +1,6 @@
 name: Security Audit
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   audit:
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -1,10 +1,6 @@
 name: CI Checks - Benchmarks
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   benchmark:
diff --git a/.github/workflows/cln-integration.yml b/.github/workflows/cln-integration.yml
@@ -1,10 +1,6 @@
 name: CI Checks - CLN Integration Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   check-cln:
diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml
@@ -1,10 +1,6 @@
 name: CI Checks - Kotlin Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   check-kotlin:
diff --git a/.github/workflows/lnd-integration.yml b/.github/workflows/lnd-integration.yml
@@ -1,10 +1,6 @@
 name: CI Checks - LND Integration Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   check-lnd:
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -1,10 +1,6 @@
 name: CI Checks - Python Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   check-python:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,10 +1,6 @@
 name: CI Checks - Rust Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   build:
diff --git a/.github/workflows/semver.yml b/.github/workflows/semver.yml
@@ -1,5 +1,5 @@
 name: SemVer checks
-on: [push, pull_request]
+on: [workflow_dispatch]
 
 jobs:
   semver-checks:
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -1,10 +1,6 @@
 name: CI Checks - Swift Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   check-swift:
diff --git a/.github/workflows/vss-integration.yml b/.github/workflows/vss-integration.yml
@@ -1,10 +1,6 @@
 name: CI Checks - VSS Integration Tests
 
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+on: [workflow_dispatch]
 
 jobs:
   build-and-test:
diff --git a/AGENTS.md b/AGENTS.md
@@ -199,9 +199,9 @@ If anything is missing or cannot be verified, you must fix it before declaring s
 - NEVER run binding generation scripts yourself - always ask the user to run them (they are long-running and resource-intensive)
 
 ## Bindings Generation Command
-To regenerate ALL bindings (Swift, Kotlin, Python), use this command:
+To regenerate ALL bindings (Swift, Kotlin, Python), run from the repo root:
 ```sh
-RUSTFLAGS="--cfg no_download" cargo build && ./scripts/uniffi_bindgen_generate.sh && ./scripts/swift_create_xcframework_archive.sh && sh scripts/uniffi_bindgen_generate_kotlin.sh && sh scripts/uniffi_bindgen_generate_kotlin_android.sh
+./bindgen.sh
 ```
 
 ## Version Bumping Checklist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.7.0-rc.27 (Synonym Fork)
+# 0.7.0-rc.28 (Synonym Fork)
 
 ## Bug Fixes
 
@@ -12,6 +12,9 @@
   confirmed, causing `get_merkle` to fail for 0-conf channel funding transactions.
 - Fixed duplicate payment events (`PaymentReceived`, `PaymentSuccessful`, `PaymentFailed`) being
   emitted when LDK replays events after node restart.
+- Switched from forked rust-lightning (`ovitrif/rust-lightning#0.2-electrum-fix`) back to official
+  upstream crates.io releases. The Electrum sync fix (PR #4341) is now in upstream
+  `lightning-transaction-sync` v0.2.1. Also picks up `lightning` v0.2.2 fixes.
 
 ## Synonym Fork Additions
 
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]
 
 [package]
 name = "ldk-node"
-version = "0.7.0-rc.27"
+version = "0.7.0-rc.28"
 authors = ["Elias Rohrer <dev@tnull.de>"]
 homepage = "https://lightningdevkit.org/"
 license = "MIT OR Apache-2.0"
@@ -123,19 +123,6 @@ check-cfg = [
 name = "payments"
 harness = false
 
-[patch.crates-io]
-lightning = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-types = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-invoice = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-net-tokio = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-persister = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-background-processor = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-rapid-gossip-sync = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-block-sync = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-transaction-sync = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-liquidity = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-lightning-macros = { git = "https://github.com/ovitrif/rust-lightning", branch = "0.2-electrum-fix" }
-
 #[patch.crates-io]
 #lightning = { path = "../rust-lightning/lightning" }
 #lightning-types = { path = "../rust-lightning/lightning-types" }
diff --git a/Package.swift b/Package.swift
@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.7.0-rc.27"
-let checksum = "3b26fa722dbabc615ff61360c67974d9b07f8789fafc2871315557356b5439db"
+let tag = "v0.7.0-rc.28"
+let checksum = "a831f3454be219770bfd511f0c5b8d17c9f814d3769d6c9111a3c0c332d2de96"
 let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"
 
 let package = Package(
diff --git a/bindgen.sh b/bindgen.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+RUSTFLAGS="--cfg no_download" cargo build \
+  && ./scripts/uniffi_bindgen_generate.sh \
+  && ./scripts/swift_create_xcframework_archive.sh \
+  && sh scripts/uniffi_bindgen_generate_kotlin.sh \
+  && sh scripts/uniffi_bindgen_generate_kotlin_android.sh
diff --git a/bindings/README.md b/bindings/README.md
@@ -3,7 +3,7 @@
 ## Build All Bindings
 Run in the root dir:
 ```sh
-RUSTFLAGS="--cfg no_download" cargo build && ./scripts/uniffi_bindgen_generate.sh && ./scripts/swift_create_xcframework_archive.sh && sh scripts/uniffi_bindgen_generate_kotlin.sh && sh scripts/uniffi_bindgen_generate_kotlin_android.sh
+./bindgen.sh
 ```
 
 ---
diff --git a/bindings/kotlin/ldk-node-android/gradle.properties b/bindings/kotlin/ldk-node-android/gradle.properties
@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 group=com.synonym
-version=0.7.0-rc.27
+version=0.7.0-rc.28
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so
diff --git a/bindings/kotlin/ldk-node-jvm/gradle.properties b/bindings/kotlin/ldk-node-jvm/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536m
 kotlin.code.style=official
 group=com.synonym
-version=0.7.0-rc.27
+version=0.7.0-rc.28
diff --git a/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib b/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib
diff --git a/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib b/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib
diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml
