f DRY up onchain sending/draining

Author: tnull

src/lib.rs

@@ -850,7 +850,7 @@ impl Node {
 			log_error!(self.logger, "Unable to send payment due to insufficient funds.");
 			return Err(Error::InsufficientFunds);
 		}
-		self.wallet.send_to_address(address, amount_sats)
+		self.wallet.send_to_address(address, Some(amount_sats))
 	}
 
 	/// Send an on-chain payment to the given address, draining all the available funds.
@@ -860,7 +860,7 @@ impl Node {
 			return Err(Error::NotRunning);
 		}
 
-		self.wallet.drain_to_address(address)
+		self.wallet.send_to_address(address, None)
 	}
 
 	/// Retrieve a list of known channels.

src/wallet.rs

@@ -208,8 +208,12 @@ where
 		Ok(self.inner.lock().unwrap().get_balance()?)
 	}
 
+	/// Send funds to the given address.
+	///
+	/// If `amount_msat_or_drain` is `None` the wallet will be drained, i.e., all available funds will be
+	/// spent.
 	pub(crate) fn send_to_address(
-		&self, address: &bitcoin::Address, amount_sats: u64,
+		&self, address: &bitcoin::Address, amount_msat_or_drain: Option<u64>,
 	) -> Result<Txid, Error> {
 		let confirmation_target = ConfirmationTarget::Normal;
 		let fee_rate = self.estimate_fee_rate(confirmation_target);
@@ -218,63 +222,18 @@ where
 			let locked_wallet = self.inner.lock().unwrap();
 			let mut tx_builder = locked_wallet.build_tx();
 
-			tx_builder
-				.add_recipient(address.script_pubkey(), amount_sats)
-				.fee_rate(fee_rate)
-				.enable_rbf();
-
-			let mut psbt = match tx_builder.finish() {
-				Ok((psbt, _)) => {
-					log_trace!(self.logger, "Created PSBT: {:?}", psbt);
-					psbt
-				}
-				Err(err) => {
-					log_error!(self.logger, "Failed to create transaction: {}", err);
-					return Err(err.into());
-				}
-			};
-
-			match locked_wallet.sign(&mut psbt, SignOptions::default()) {
-				Ok(finalized) => {
-					if !finalized {
-						return Err(Error::OnchainTxCreationFailed);
-					}
-				}
-				Err(err) => {
-					log_error!(self.logger, "Failed to create transaction: {}", err);
-					return Err(err.into());
-				}
+			if let Some(amount_sats) = amount_msat_or_drain {
+				tx_builder
+					.add_recipient(address.script_pubkey(), amount_sats)
+					.fee_rate(fee_rate)
+					.enable_rbf();
+			} else {
+				tx_builder
+					.drain_wallet()
+					.drain_to(address.script_pubkey())
+					.fee_rate(fee_rate)
+					.enable_rbf();
 			}
-			psbt.extract_tx()
-		};
-
-		self.broadcast_transaction(&tx);
-
-		let txid = tx.txid();
-		log_info!(
-			self.logger,
-			"Created new transaction {} sending {}sats on-chain to address {}",
-			txid,
-			amount_sats,
-			address
-		);
-
-		Ok(txid)
-	}
-
-	pub(crate) fn drain_to_address(&self, address: &bitcoin::Address) -> Result<Txid, Error> {
-		let confirmation_target = ConfirmationTarget::Normal;
-		let fee_rate = self.estimate_fee_rate(confirmation_target);
-
-		let tx = {
-			let locked_wallet = self.inner.lock().unwrap();
-			let mut tx_builder = locked_wallet.build_tx();
-
-			tx_builder
-				.drain_wallet()
-				.drain_to(address.script_pubkey())
-				.fee_rate(fee_rate)
-				.enable_rbf();
 
 			let mut psbt = match tx_builder.finish() {
 				Ok((psbt, _)) => {
@@ -304,12 +263,23 @@ where
 		self.broadcast_transaction(&tx);
 
 		let txid = tx.txid();
-		log_info!(
-			self.logger,
-			"Created new transaction {} sending all available on-chain funds to address {}",
-			txid,
-			address
-		);
+
+		if let Some(amount_sats) = amount_msat_or_drain {
+			log_info!(
+				self.logger,
+				"Created new transaction {} sending {}sats on-chain to address {}",
+				txid,
+				amount_sats,
+				address
+			);
+		} else {
+			log_info!(
+				self.logger,
+				"Created new transaction {} sending all available on-chain funds to address {}",
+				txid,
+				address
+			);
+		}
 
 		Ok(txid)
 	}