Retransmit commitment_signed before tx_signatures

During channel reestablishment, both commitment_signed and tx_signatures
messages may be retransmitted. However, commitment_signed must come
first, so re-arrange the ordering. This moves tx_abort as well to keep
the interactive tx messages together.

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -8944,19 +8944,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				msg,
 			});
 		}
-		// TODO(dual_funding): For async signing support we need to hold back `tx_signatures` until the `commitment_signed` is ready.
-		if let Some(msg) = tx_signatures {
-			pending_msg_events.push(MessageSendEvent::SendTxSignatures {
-				node_id: counterparty_node_id,
-				msg,
-			});
-		}
-		if let Some(msg) = tx_abort {
-			pending_msg_events.push(MessageSendEvent::SendTxAbort {
-				node_id: counterparty_node_id,
-				msg,
-			});
-		}
 
 		macro_rules! handle_cs { () => {
 			if let Some(update) = commitment_update {
@@ -8986,6 +8973,20 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 			},
 		}
 
+		// TODO(dual_funding): For async signing support we need to hold back `tx_signatures` until the `commitment_signed` is ready.
+		if let Some(msg) = tx_signatures {
+			pending_msg_events.push(MessageSendEvent::SendTxSignatures {
+				node_id: counterparty_node_id,
+				msg,
+			});
+		}
+		if let Some(msg) = tx_abort {
+			pending_msg_events.push(MessageSendEvent::SendTxAbort {
+				node_id: counterparty_node_id,
+				msg,
+			});
+		}
+
 		if let Some(tx) = funding_broadcastable {
 			if channel.context.is_manual_broadcast() {
 				log_info!(logger, "Not broadcasting funding transaction with txid {} as it is manually managed", tx.compute_txid());