Merge branch 'main' into fix/channel-monitor-migration

# Conflicts:
#	CHANGELOG.md
#	Package.swift
#	bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so
#	bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so
#	bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so
#	bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib
#	bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib

Author: ovitrif

CHANGELOG.md

@@ -34,6 +34,14 @@
   with a newer `update_id` before writing, preventing stale migration data from overwriting
   current state on repeated migrations or restarts. Errors reading or deserializing existing
   monitors now fail-closed (abort migration) to avoid silent data loss.
+- 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:

Package.swift

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

bindgen.sh

@@ -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
 }

bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/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
 }

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

@@ -9448,15 +9448,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)
     }
 }