Merge pull request #44 from synonymdev/feat/backport-uptream-pr-4341

fix: backport upstream electrum sync fix (PR #4341)

Author: ovitrif

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

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.
 

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 <dev@tnull.de>"]
 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" }

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(