update fork with fixes

Author: benthecarman

orange-sdk/Cargo.toml

@@ -18,7 +18,7 @@ _cashu-tests = ["_test-utils", "cdk-ldk-node", "cdk/mint", "cdk-sqlite", "cdk-ax
 [dependencies]
 graduated-rebalancer = { path = "../graduated-rebalancer", version = "0.1.0" }
 
-ldk-node = { git = "https://github.com/lightningdevkit/ldk-node.git", rev = "dd519080318ba099280b4353fb6335c587a67cbd" }
+ldk-node = { git = "https://github.com/lightningdevkit/ldk-node.git", rev = "6d91eabcb11bf3b32f0a2e5f43b55c98d84ba1f0" }
 lightning-macros = "0.2.0-beta1"
 bitcoin-payment-instructions = { workspace = true }
 chrono = { version = "0.4", default-features = false }
@@ -27,15 +27,15 @@ reqwest = { version = "0.12.23", default-features = false, features = ["rustls-t
 breez-sdk-spark = { git = "https://github.com/breez/spark-sdk.git", rev = "1c3dd78a40ae50a88d743110a79fa4a95d93d932", default-features = false, features = ["rustls-tls"], optional = true }
 tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "sync"] }
 uuid = { version = "1.0", default-features = false, optional = true }
-cdk = { git = "https://github.com/benthecarman/cdk.git", rev = "6a8f046a405137cfbb3a77f1f045c3a238e62c00", default-features = false, features = ["wallet"], optional = true }
+cdk = { git = "https://github.com/benthecarman/cdk.git", rev = "62ac47d51d6c74c7b847ae0c19e7c84899efe872", default-features = false, features = ["wallet"], optional = true }
 serde_json = { version = "1.0", optional = true }
 async-trait = "0.1"
 log = "0.4.28"
 
 corepc-node = { version = "0.8.0", features = ["29_0", "download"], optional = true }
-cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", rev = "6a8f046a405137cfbb3a77f1f045c3a238e62c00", optional = true }
-cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "6a8f046a405137cfbb3a77f1f045c3a238e62c00", optional = true }
-cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "6a8f046a405137cfbb3a77f1f045c3a238e62c00", optional = true }
+cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", rev = "62ac47d51d6c74c7b847ae0c19e7c84899efe872", optional = true }
+cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "62ac47d51d6c74c7b847ae0c19e7c84899efe872", optional = true }
+cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "62ac47d51d6c74c7b847ae0c19e7c84899efe872", optional = true }
 axum = { version = "0.8.1", optional = true }
 
 uniffi = { version = "0.29", features = ["cli", "tokio"], optional = true }

orange-sdk/src/runtime.rs

@@ -6,7 +6,7 @@
 // accordance with one or both of these licenses.
 
 use ldk_node::lightning::util::logger::Logger as _;
-use ldk_node::lightning::{log_debug, log_error, log_trace};
+use ldk_node::lightning::{log_debug, log_error, log_trace, log_warn};
 use std::future::Future;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
@@ -95,14 +95,20 @@ impl Runtime {
 
 	pub fn abort_cancellable_background_tasks(&self) {
 		let mut tasks = core::mem::take(&mut *self.cancellable_background_tasks.lock().unwrap());
-		debug_assert!(!tasks.is_empty(), "Expected some cancellable background_tasks");
+		if tasks.is_empty() {
+			log_warn!(self.logger, "Stopping cancellable background tasks with no tasks");
+			return;
+		}
 		tasks.abort_all();
 		self.block_on(async { while tasks.join_next().await.is_some() {} })
 	}
 
 	pub fn wait_on_background_tasks(&self) {
 		let mut tasks = core::mem::take(&mut *self.background_tasks.lock().unwrap());
-		debug_assert!(!tasks.is_empty(), "Expected some background_tasks");
+		if tasks.is_empty() {
+			log_warn!(self.logger, "Stopping background tasks with no tasks");
+			return;
+		}
 		self.block_on(async {
 			loop {
 				let timeout_fut = tokio::time::timeout(