f fix funding_tx_opt check & context.funding_transaction set

Author: dunxen

lightning/src/ln/channel.rs

@@ -6175,11 +6175,8 @@ impl<SP: Deref> FundedChannel<SP> where
 
 			let (holder_tx_signatures_opt, funding_tx_opt) = signing_session.received_tx_signatures(msg.clone())
 				.map_err(|_| ChannelError::Warn("Witness count did not match contributed input count".to_string()))?;
-			if holder_tx_signatures_opt.is_some() && self.is_awaiting_initial_mon_persist() {
-				log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
-				self.context.monitor_pending_tx_signatures = holder_tx_signatures_opt;
-				return Ok(None);
-			}
+
+
 			if funding_tx_opt.is_some() {
 				// We have a finalized funding transaction, so we can set the funding transaction and reset the
 				// signing session fields.
@@ -6188,6 +6185,12 @@ impl<SP: Deref> FundedChannel<SP> where
 				self.interactive_tx_signing_session = None;
 			}
 
+			if holder_tx_signatures_opt.is_some() && self.is_awaiting_initial_mon_persist() {
+				log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
+				self.context.monitor_pending_tx_signatures = holder_tx_signatures_opt;
+				return Ok(None);
+			}
+
 			Ok(holder_tx_signatures_opt)
 		} else {
 			Err(ChannelError::Close((