Merge pull request #4130 from TheBlueMatt/2025-09-misc-followups

Author: TheBlueMatt

lightning-liquidity/src/lsps2/service.rs

@@ -166,9 +166,9 @@ impl TrustModel {
 		}
 	}
 
-	fn get_funding_tx(&self) -> Option<Transaction> {
+	fn get_funding_tx(&self) -> Option<&Transaction> {
 		match self {
-			TrustModel::ClientTrustsLsp { funding_tx, .. } => funding_tx.clone(),
+			TrustModel::ClientTrustsLsp { funding_tx, .. } => funding_tx.as_ref(),
 			_ => None,
 		}
 	}
@@ -581,7 +581,7 @@ impl OutboundJITChannel {
 		}
 	}
 
-	fn get_funding_tx(&self) -> Option<Transaction> {
+	fn get_funding_tx(&self) -> Option<&Transaction> {
 		self.trust_model.get_funding_tx()
 	}
 
@@ -2028,7 +2028,7 @@ where
 		}
 
 		if let Some(funding_tx) = jit_channel.get_funding_tx() {
-			self.tx_broadcaster.broadcast_transactions(&[&funding_tx]);
+			self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
 		}
 	}
 }

lightning/src/chain/channelmonitor.rs

@@ -835,6 +835,11 @@ pub enum Balance {
 		/// When multiple candidates exist, the last one reflects the balance of the
 		/// latest splice/RBF attempt, while the first reflects the balance prior to the splice
 		/// occurring.
+		///
+		/// Entries remain in this vec until the pending splice has reached [`ANTI_REORG_DELAY`]
+		/// confirmations, at which point any conflicts will be removed. Once a splice confirms
+		/// [`Self::ClaimableOnChannelClose::confirmed_balance_candidate_index`] will point to the
+		/// confirmed entry, even if it has fewer than [`ANTI_REORG_DELAY`] confirmations.
 		balance_candidates: Vec<HolderCommitmentTransactionBalance>,
 		/// The index within [`Balance::ClaimableOnChannelClose::balance_candidates`] for the
 		/// balance according to the current onchain state of the channel. This can be helpful when