f - set sent_funding_txid

Author: jkczyz

lightning/src/ln/channel.rs

@@ -8371,13 +8371,15 @@ impl<SP: Deref> FundedChannel<SP> where
 			if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height, logger) {
 				log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
 
-				let mut announcement_sigs = None;
-				if Some(splice_locked.splice_txid) == pending_splice.received_funding_txid {
+				pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
+				if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 					promote_splice_funding!(self, funding);
-					announcement_sigs = self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger);
+
+					let announcement_sigs = self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger);
+					return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 				}
 
-				return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
+				return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), None));
 			}
 		}
 
@@ -8499,15 +8501,21 @@ impl<SP: Deref> FundedChannel<SP> where
 			};
 
 			if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height, logger) {
-				let mut announcement_sigs = None;
-				if Some(splice_locked.splice_txid) == pending_splice.received_funding_txid {
+				log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
+
+				pending_splice.sent_funding_txid = Some(splice_locked.splice_txid);
+				if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 					promote_splice_funding!(self, funding);
+
+					let mut announcement_sigs = None;
 					if let Some((chain_hash, node_signer, user_config)) = chain_node_signer {
 						announcement_sigs = self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger);
 					}
+
+					return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 				}
-				log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
-				return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
+
+				return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, None));
 			}
 		}