From 5b186967de6481d2b71b3bd06d0237d42aaaf4e0 Mon Sep 17 00:00:00 2001
From: Andrei <andrei.i@posteo.de>
Date: Mon, 19 May 2025 00:00:00 +0000
Subject: [PATCH] Uses node's runtime in `sync_wallets()`

---
 src/lib.rs | 53 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 7859a092e..41d8ed9c8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1253,39 +1253,38 @@ impl Node {
 		if rt_lock.is_none() {
 			return Err(Error::NotRunning);
 		}
+		let runtime = rt_lock.as_ref().unwrap();
 
 		let chain_source = Arc::clone(&self.chain_source);
 		let sync_cman = Arc::clone(&self.channel_manager);
 		let sync_cmon = Arc::clone(&self.chain_monitor);
 		let sync_sweeper = Arc::clone(&self.output_sweeper);
 		tokio::task::block_in_place(move || {
-			tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap().block_on(
-				async move {
-					match chain_source.as_ref() {
-						ChainSource::Esplora { .. } => {
-							chain_source.update_fee_rate_estimates().await?;
-							chain_source
-								.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
-								.await?;
-							chain_source.sync_onchain_wallet().await?;
-						},
-						ChainSource::Electrum { .. } => {
-							chain_source.update_fee_rate_estimates().await?;
-							chain_source
-								.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
-								.await?;
-							chain_source.sync_onchain_wallet().await?;
-						},
-						ChainSource::BitcoindRpc { .. } => {
-							chain_source.update_fee_rate_estimates().await?;
-							chain_source
-								.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
-								.await?;
-						},
-					}
-					Ok(())
-				},
-			)
+			runtime.block_on(async move {
+				match chain_source.as_ref() {
+					ChainSource::Esplora { .. } => {
+						chain_source.update_fee_rate_estimates().await?;
+						chain_source
+							.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
+							.await?;
+						chain_source.sync_onchain_wallet().await?;
+					},
+					ChainSource::Electrum { .. } => {
+						chain_source.update_fee_rate_estimates().await?;
+						chain_source
+							.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
+							.await?;
+						chain_source.sync_onchain_wallet().await?;
+					},
+					ChainSource::BitcoindRpc { .. } => {
+						chain_source.update_fee_rate_estimates().await?;
+						chain_source
+							.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
+							.await?;
+					},
+				}
+				Ok(())
+			})
 		})
 	}