fix: align fork with upstream LDK 0.7 architecture

Author: ben-kaufman

bindings/ldk_node.udl

@@ -213,6 +213,7 @@ interface Bolt11Payment {
 	Bolt11Invoice receive_variable_amount_via_jit_channel([ByRef]Bolt11InvoiceDescription description, u32 expiry_secs, u64? max_proportional_lsp_fee_limit_ppm_msat);
 	[Throws=NodeError]
 	Bolt11Invoice receive_variable_amount_via_jit_channel_for_hash([ByRef]Bolt11InvoiceDescription description, u32 expiry_secs, u64? max_proportional_lsp_fee_limit_ppm_msat, PaymentHash payment_hash);
+	[Throws=NodeError]
 	u64 estimate_routing_fees([ByRef]Bolt11Invoice invoice);
 	[Throws=NodeError]
 	u64 estimate_routing_fees_using_amount([ByRef]Bolt11Invoice invoice, u64 amount_msat);

src/builder.rs

@@ -1357,9 +1357,6 @@ fn build_with_store_internal(
 		Arc::clone(&logger),
 	));
 
-	// Set the wallet in the chain source for event processing
-	chain_source.set_onchain_wallet(Arc::clone(&wallet));
-
 	// Initialize the KeysManager
 	let cur_time = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).map_err(|e| {
 		log_error!(logger, "Failed to get current time: {}", e);

src/chain/electrum.rs

@@ -48,7 +48,7 @@ const ELECTRUM_CLIENT_TIMEOUT_SECS: u8 = 10;
 pub(super) struct ElectrumChainSource {
 	server_url: String,
 	pub(super) sync_config: ElectrumSyncConfig,
-	pub(super) electrum_runtime_status: RwLock<ElectrumRuntimeStatus>,
+	electrum_runtime_status: RwLock<ElectrumRuntimeStatus>,
 	onchain_wallet_sync_status: Mutex<WalletSyncStatus>,
 	lightning_wallet_sync_status: Mutex<WalletSyncStatus>,
 	fee_estimator: Arc<OnchainFeeEstimator>,
@@ -309,6 +309,16 @@ impl ElectrumChainSource {
 			electrum_client.broadcast(tx).await;
 		}
 	}
+
+	pub(super) async fn get_address_balance(&self, address: &bitcoin::Address) -> Option<u64> {
+		let electrum_client: Arc<ElectrumRuntimeClient> =
+			if let Some(client) = self.electrum_runtime_status.read().unwrap().client().as_ref() {
+				Arc::clone(client)
+			} else {
+				return None;
+			};
+		electrum_client.get_address_balance(address).await
+	}
 }
 
 impl Filter for ElectrumChainSource {
@@ -370,7 +380,7 @@ impl ElectrumRuntimeStatus {
 		*self = Self::new()
 	}
 
-	pub(super) fn client(&self) -> Option<Arc<ElectrumRuntimeClient>> {
+	fn client(&self) -> Option<Arc<ElectrumRuntimeClient>> {
 		match self {
 			Self::Started(client) => Some(Arc::clone(&client)),
 			Self::Stopped { .. } => None,
@@ -455,7 +465,7 @@ impl ElectrumRuntimeClient {
 		}
 	}
 
-	pub(crate) async fn sync_confirmables(
+	async fn sync_confirmables(
 		&self, confirmables: Vec<Arc<dyn Confirm + Sync + Send>>,
 	) -> Result<(), Error> {
 		let now = Instant::now();

src/chain/esplora.rs

@@ -35,7 +35,7 @@ use bdk_wallet::event::WalletEvent;
 
 pub(super) struct EsploraChainSource {
 	pub(super) sync_config: EsploraSyncConfig,
-	pub(super) esplora_client: EsploraAsyncClient,
+	esplora_client: EsploraAsyncClient,
 	onchain_wallet_sync_status: Mutex<WalletSyncStatus>,
 	tx_sync: Arc<EsploraSyncClient<Arc<Logger>>>,
 	lightning_wallet_sync_status: Mutex<WalletSyncStatus>,
@@ -88,11 +88,13 @@ impl EsploraChainSource {
 		};
 		if let Some(mut sync_receiver) = receiver_res {
 			log_info!(self.logger, "Sync in progress, skipping.");
-			return sync_receiver.recv().await.map_err(|e| {
+			sync_receiver.recv().await.map_err(|e| {
 				debug_assert!(false, "Failed to receive wallet sync result: {:?}", e);
 				log_error!(self.logger, "Failed to receive wallet sync result: {:?}", e);
 				Error::WalletOperationFailed
-			})?;
+			})??;
+			// Return empty events since we're just waiting for another sync
+			return Ok(Vec::new());
 		}
 
 		let res = self.sync_onchain_wallet_inner(onchain_wallet).await;
@@ -435,6 +437,31 @@ impl EsploraChainSource {
 			}
 		}
 	}
+
+	pub(super) async fn get_address_balance(&self, address: &bitcoin::Address) -> Option<u64> {
+		let script = address.script_pubkey();
+		match self.esplora_client.scripthash_txs(&script, None).await {
+			Ok(txs) => {
+				let mut balance = 0i64;
+				for tx in txs {
+					for output in &tx.vout {
+						if output.scriptpubkey == script {
+							balance += output.value as i64;
+						}
+					}
+					for input in &tx.vin {
+						if let Some(prevout) = &input.prevout {
+							if prevout.scriptpubkey == script {
+								balance -= prevout.value as i64;
+							}
+						}
+					}
+				}
+				Some(balance.max(0) as u64)
+			},
+			Err(_) => None,
+		}
+	}
 }
 
 impl Filter for EsploraChainSource {