diff --git a/AGENTS.md b/AGENTS.md index aa30438e3..c74bd951e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -228,8 +228,9 @@ When bumping the version, ALWAYS update ALL of these files: # Compare output with the checksum value in Package.swift - they MUST match ``` - Create GitHub release with same name as the tag, upload `LDKNodeFFI.xcframework.zip` -- Add release link at the end of PR description (or as a comment if not your PR): +- **ALWAYS add release link at the end of PR description** (use `gh pr edit` to update the body): ``` ### Release - - Release [vN.N.N](link_to_release) + - [vN.N.N](link_to_release) ``` +- Only add release as a comment if it's not your PR and you cannot edit the description diff --git a/CHANGELOG.md b/CHANGELOG.md index fab1f29d6..2f1ec14fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ -# 0.7.0-rc.17 (Synonym Fork) +# 0.7.0-rc.18 (Synonym Fork) ## Bug Fixes +- Backported upstream Electrum sync fix (PR #4341): Skip unconfirmed `get_history` entries in + `ElectrumSyncClient`. Previously, mempool entries (height=0 or -1) were incorrectly treated as + 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. diff --git a/Cargo.toml b/Cargo.toml index ebfcdeb32..76c8fda7a 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ldk-node" -version = "0.7.0-rc.17" +version = "0.7.0-rc.18" authors = ["Elias Rohrer "] homepage = "https://lightningdevkit.org/" license = "MIT OR Apache-2.0" @@ -118,6 +118,19 @@ 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 index 1354c853d..ab06e22ba 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,8 @@ import PackageDescription -let tag = "v0.7.0-rc.17" -let checksum = "b90aefa8285b7c4b459e107b611840e5f218689797c0dc24e8bb5e8d1208fa56" +let tag = "v0.7.0-rc.18" +let checksum = "05903150276c3c31b2552b89d3781157ac1bbf55a10598655897abd9fe936b6c" let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip" let package = Package( diff --git a/bindings/kotlin/ldk-node-android/gradle.properties b/bindings/kotlin/ldk-node-android/gradle.properties index f2dfe04a5..2b0abdb57 100644 --- a/bindings/kotlin/ldk-node-android/gradle.properties +++ b/bindings/kotlin/ldk-node-android/gradle.properties @@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official -libraryVersion=0.7.0-rc.17 +libraryVersion=0.7.0-rc.18 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 index 9259e15e8..1798f33a0 100755 Binary files a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so and b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so differ 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 index 10afda9b8..45afa3297 100755 Binary files a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so and b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so differ 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 index 87363f888..b75d024e8 100755 Binary files a/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so and b/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so differ diff --git a/bindings/kotlin/ldk-node-jvm/gradle.properties b/bindings/kotlin/ldk-node-jvm/gradle.properties index b6495460c..f2e17b9f8 100644 --- a/bindings/kotlin/ldk-node-jvm/gradle.properties +++ b/bindings/kotlin/ldk-node-jvm/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx1536m kotlin.code.style=official -libraryVersion=0.7.0-rc.17 +libraryVersion=0.7.0-rc.18 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 index 770287ec1..b77fef4a4 100644 Binary files a/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib and b/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib differ 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 index 6bb54abb8..c9b9a44e9 100644 Binary files a/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib and b/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib differ diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index 2d2e1f8e0..079fbce67 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "ldk_node" -version = "0.7.0-rc.17" +version = "0.7.0-rc.18" authors = [ { name="Elias Rohrer", email="dev@tnull.de" }, ]