f - change how PendingSplice::confirmed_funding_txid is used

Author: jkczyz

lightning/src/ln/channel.rs

@@ -4970,9 +4970,36 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	}
 
 	#[cfg(splicing)]
-	fn check_get_splice_locked<L: Deref>(&mut self, funding: &FundingScope, height: u32, logger: &L) -> Option<msgs::SpliceLocked>
-		where L::Target: Logger
+	fn check_get_splice_locked<L: Deref>(
+		&mut self, pending_splice: &mut Option<PendingSplice>, funding: &mut FundingScope,
+		height: u32, logger: &L,
+	) -> Option<msgs::SpliceLocked>
+	where
+		L::Target: Logger,
 	{
+		// TODO: Check minimum depth has been reached.
+
+		let confirmed_funding_txo = funding.get_funding_txo();
+		if let Some(pending_splice) = pending_splice {
+			if let Some(funding_txid) = pending_splice.confirmed_funding_txid {
+				// splice_lock already received
+				if Some(funding_txid) == confirmed_funding_txo.map(|txo| txo.txid) {
+					// - swap FundingScope
+					// - clear pending_splice
+					// - clear pending_funding
+					// - send splice_locked
+				} else {
+					// splice_txid does not match one in received splice_locked
+				}
+			} else {
+				pending_splice.confirmed_funding_txid = confirmed_funding_txo.map(|txo| txo.txid);
+				debug_assert!(pending_splice.confirmed_funding_txid.is_some());
+				// - send splice_locked
+				// - wait for splice_locked
+			}
+		} else {
+			debug_assert!(false);
+		}
 		None
 	}
 }
@@ -8388,13 +8415,7 @@ impl<SP: Deref> FundedChannel<SP> where
 				}
 			} else {
 			#[cfg(splicing)] {
-				if let Some(pending_splice) = &mut self.pending_splice {
-					pending_splice.confirmed_funding_txid = confirmed_funding_txo.map(|txo| txo.txid);
-					debug_assert!(pending_splice.confirmed_funding_txid.is_some());
-				} else {
-					debug_assert!(false);
-				}
-				if let Some(splice_locked) = self.context.check_get_splice_locked(funding, height, logger) {
+				if let Some(splice_locked) = self.context.check_get_splice_locked(&mut self.pending_splice, funding, height, logger) {
 					log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
 					let announcement_sigs = self.context.get_announcement_sigs(funding, node_signer, chain_hash, user_config, height, logger);
 					return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
@@ -8501,11 +8522,11 @@ impl<SP: Deref> FundedChannel<SP> where
 			.and_then(|pending_splice| pending_splice.confirmed_funding_txid)
 		{
 			if let Some((funding, _)) = self.pending_funding
-				.iter()
+				.iter_mut()
 				.filter_map(|funding| funding.get_funding_txo().map(|txo| (funding, txo.txid)))
 				.find(|(_, funding_txid)| *funding_txid == confirmed_funding_txid)
 			{
-				if let Some(splice_locked) = self.context.check_get_splice_locked(funding, height, logger) {
+				if let Some(splice_locked) = self.context.check_get_splice_locked(&mut self.pending_splice, funding, height, logger) {
 					let announcement_sigs = if let Some((chain_hash, node_signer, user_config)) = chain_node_signer {
 						self.context.get_announcement_sigs(funding, node_signer, chain_hash, user_config, height, logger)
 					} else {