Merge pull request #75 from synonymdev/electrum-connection-fix

Add Electrum connection timeout to prevent thread pool exhaustion

Author: ovitrif

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.7.0-rc.32 (Synonym Fork)
+# 0.7.0-rc.33 (Synonym Fork)
 
 ## Bug Fixes
 
@@ -29,6 +29,14 @@
 
 ## Synonym Fork Additions
 
+- Added `connection_timeout_secs` field to `ElectrumSyncConfig` (default: 10 s). This bounds
+  Electrum socket operations for both the BDK on-chain and LDK tx-sync clients, preventing Tokio's
+  blocking thread pool from being exhausted by threads stuck on dead sockets under total packet
+  loss (e.g. a captive portal on iOS). Set to `0` to disable; values above 255 are capped to
+  255 and a warning is logged.
+  **Breaking change:** existing struct-literal construction of `ElectrumSyncConfig` must add the
+  new field or switch to `ElectrumSyncConfig { .., ..Default::default() }`.
+
 - Added `OnchainPayment::calculate_send_all_fee()` to preview the fee for a drain / send-all
   transaction before broadcasting (fee-calculation counterpart of `send_all_to_address`)
 - Added runtime APIs for dynamic address type management:

Cargo.toml

@@ -4,7 +4,7 @@ exclude = ["bindings/uniffi-bindgen"]
 
 [package]
 name = "ldk-node"
-version = "0.7.0-rc.32"
+version = "0.7.0-rc.33"
 authors = ["Elias Rohrer <dev@tnull.de>"]
 homepage = "https://lightningdevkit.org/"
 license = "MIT OR Apache-2.0"

Package.swift

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.7.0-rc.32"
-let checksum = "89d987f390e0f8fae370c6d549aacd8b8e1c3c95fb0d6e9ccfcf216cbd263b38"
+let tag = "v0.7.0-rc.33"
+let checksum = "82e318ac605e04d87f1aa24c920c06627346d9500c6395db45cb23f159e200f0"
 let url = "https://github.com/synonymdev/ldk-node/releases/download/\(tag)/LDKNodeFFI.xcframework.zip"
 
 let package = Package(

bindgen.sh

@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 group=com.synonym
-version=0.7.0-rc.32
+version=0.7.0-rc.33

bindings/kotlin/ldk-node-android/gradle.properties

@@ -9459,15 +9459,18 @@ object FfiConverterTypeElectrumSyncConfig: FfiConverterRustBuffer<ElectrumSyncCo
     override fun read(buf: ByteBuffer): ElectrumSyncConfig {
         return ElectrumSyncConfig(
             FfiConverterOptionalTypeBackgroundSyncConfig.read(buf),
+            FfiConverterULong.read(buf),
         )
     }
 
     override fun allocationSize(value: ElectrumSyncConfig) = (
-            FfiConverterOptionalTypeBackgroundSyncConfig.allocationSize(value.`backgroundSyncConfig`)
+            FfiConverterOptionalTypeBackgroundSyncConfig.allocationSize(value.`backgroundSyncConfig`) +
+            FfiConverterULong.allocationSize(value.`connectionTimeoutSecs`)
     )
 
     override fun write(value: ElectrumSyncConfig, buf: ByteBuffer) {
         FfiConverterOptionalTypeBackgroundSyncConfig.write(value.`backgroundSyncConfig`, buf)
+        FfiConverterULong.write(value.`connectionTimeoutSecs`, buf)
     }
 }
 

bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so

@@ -868,7 +868,8 @@ data class CustomTlvRecord (
 
 @kotlinx.serialization.Serializable
 data class ElectrumSyncConfig (
-    val `backgroundSyncConfig`: BackgroundSyncConfig?
+    val `backgroundSyncConfig`: BackgroundSyncConfig?, 
+    val `connectionTimeoutSecs`: kotlin.ULong
 ) {
     companion object
 }