Merge pull request #137 from MaxFangX/max/fix-spend-spendable-outputs

bugfix: Return early if no non-static outputs

Author: tnull

src/event.rs

@@ -8,7 +8,7 @@ use crate::payment_store::{
 };
 
 use crate::io::{KVStore, EVENT_QUEUE_PERSISTENCE_KEY, EVENT_QUEUE_PERSISTENCE_NAMESPACE};
-use crate::logger::{log_error, log_info, Logger};
+use crate::logger::{log_debug, log_error, log_info, Logger};
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::events::Event as LdkEvent;
@@ -564,7 +564,10 @@ where
 					&Secp256k1::new(),
 				);
 				match res {
-					Ok(spending_tx) => self.wallet.broadcast_transaction(&spending_tx),
+					Ok(Some(spending_tx)) => self.wallet.broadcast_transaction(&spending_tx),
+					Ok(None) => {
+						log_debug!(self.logger, "Omitted spending static outputs: {:?}", outputs);
+					}
 					Err(err) => {
 						log_error!(self.logger, "Error spending outputs: {:?}", err);
 					}

src/logger.rs

@@ -1,5 +1,5 @@
 pub(crate) use lightning::util::logger::Logger;
-pub(crate) use lightning::{log_error, log_info, log_trace};
+pub(crate) use lightning::{log_debug, log_error, log_info, log_trace};
 
 use lightning::util::logger::{Level, Record};
 use lightning::util::ser::Writer;

src/wallet.rs

@@ -362,19 +362,24 @@ where
 		&self, descriptors: &[&SpendableOutputDescriptor], outputs: Vec<TxOut>,
 		change_destination_script: Script, feerate_sat_per_1000_weight: u32,
 		secp_ctx: &Secp256k1<C>,
-	) -> Result<Transaction, ()> {
+	) -> Result<Option<Transaction>, ()> {
 		let only_non_static = &descriptors
 			.iter()
 			.filter(|desc| !matches!(desc, SpendableOutputDescriptor::StaticOutput { .. }))
 			.copied()
 			.collect::<Vec<_>>();
-		self.inner.spend_spendable_outputs(
-			only_non_static,
-			outputs,
-			change_destination_script,
-			feerate_sat_per_1000_weight,
-			secp_ctx,
-		)
+		if only_non_static.is_empty() {
+			return Ok(None);
+		}
+		self.inner
+			.spend_spendable_outputs(
+				only_non_static,
+				outputs,
+				change_destination_script,
+				feerate_sat_per_1000_weight,
+				secp_ctx,
+			)
+			.map(Some)
 	}
 
 	pub fn sign_message(&self, msg: &[u8]) -> Result<String, Error> {