f - request announcement_signatures when splice hasn't been promoted

Author: jkczyz

lightning/src/ln/channel.rs

@@ -10590,11 +10590,12 @@ where
 				//       - MUST set the `announcement_signatures` bit to `1` in `retransmit_flags`.
 				//     - otherwise:
 				//       - MUST set the `announcement_signatures` bit to `0` in `retransmit_flags`.
-				if self.funding.get_funding_txid() == Some(txid)
-					&& self.context.config.announce_for_forwarding
-					&& self.context.announcement_sigs.is_none()
-				{
-					funding_locked.retransmit(msgs::FundingLockedFlags::AnnouncementSignatures);
+				if self.context.config.announce_for_forwarding {
+					if self.funding.get_funding_txid() != Some(txid)
+						|| self.context.announcement_sigs.is_none()
+					{
+						funding_locked.retransmit(msgs::FundingLockedFlags::AnnouncementSignatures);
+					}
 				}
 
 				funding_locked