f - check pending_splice.sent_funding_txid

Author: jkczyz

lightning/src/ln/channel.rs

@@ -9125,7 +9125,7 @@ where
 
 	#[cfg(splicing)]
 	fn maybe_promote_splice_funding<L: Deref>(
-		&mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
+		&mut self, confirmed_funding_index: usize, logger: &L,
 	) -> bool
 	where
 		L::Target: Logger,
@@ -9134,6 +9134,14 @@ where
 		debug_assert!(confirmed_funding_index < self.pending_funding.len());
 
 		let pending_splice = self.pending_splice.as_mut().unwrap();
+		let splice_txid = match pending_splice.sent_funding_txid {
+			Some(sent_funding_txid) => sent_funding_txid,
+			None => {
+				debug_assert!(false);
+				return false;
+			},
+		};
+
 		if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 			log_info!(
 				logger,
@@ -9261,7 +9269,7 @@ where
 					);
 
 					let announcement_sigs = self
-						.maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
+						.maybe_promote_splice_funding(confirmed_funding_index, logger)
 						.then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 						.flatten();
 
@@ -9427,7 +9435,7 @@ where
 				log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
 
 				let announcement_sigs = self
-					.maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
+					.maybe_promote_splice_funding(confirmed_funding_index, logger)
 					.then(|| chain_node_signer
 						.and_then(|(chain_hash, node_signer, user_config)|
 							self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)