f - FundingLocked

Author: jkczyz

lightning/src/ln/channel.rs

@@ -10592,8 +10592,7 @@ where
 			your_last_per_commitment_secret: remote_last_secret,
 			my_current_per_commitment_point: dummy_pubkey,
 			next_funding_txid: self.maybe_get_next_funding_txid(),
-			your_last_funding_locked_txid: None,
-			my_current_funding_locked_txid: None,
+			my_current_funding_locked: None,
 		}
 	}
 

lightning/src/ln/channelmanager.rs

@@ -11049,8 +11049,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							your_last_per_commitment_secret: [1u8; 32],
 							my_current_per_commitment_point: PublicKey::from_slice(&[2u8; 33]).unwrap(),
 							next_funding_txid: None,
-							your_last_funding_locked_txid: None,
-							my_current_funding_locked_txid: None,
+							my_current_funding_locked: None,
 						},
 					});
 					return Err(MsgHandleErrInternal::send_err_msg_no_close(

lightning/src/ln/msgs.rs

@@ -927,16 +927,28 @@ pub struct ChannelReestablish {
 	///   * `channel_reestablish`-sending node: https:///github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L2466-L2470
 	///   * `channel_reestablish`-receiving node: https:///github.com/lightning/bolts/blob/247e83d/02-peer-protocol.md?plain=1#L2520-L2531
 	pub next_funding_txid: Option<Txid>,
-	/// The last funding txid received by the sending node, which may be:
-	/// - the txid of the last `splice_locked` it received, otherwise
-	/// - the txid of the funding transaction if it received `channel_ready`, or else
-	/// - `None` if it has never received `channel_ready` or `splice_locked`
-	pub your_last_funding_locked_txid: Option<Txid>,
 	/// The last funding txid sent by the sending node, which may be:
 	/// - the txid of the last `splice_locked` it sent, otherwise
 	/// - the txid of the funding transaction if it sent `channel_ready`, or else
 	/// - `None` if it has never sent `channel_ready` or `splice_locked`
-	pub my_current_funding_locked_txid: Option<Txid>,
+	///
+	/// Also contains a bitfield indicating which messages should be retransmitted.
+	pub my_current_funding_locked: Option<FundingLocked>,
+}
+
+/// Information exchanged during channel reestablishment about the last funding locked.
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct FundingLocked {
+	/// The last txid sent by the sending node, which may be either from the last `splice_locked` or
+	/// for the initial funding transaction if it sent `channel_ready`.
+	pub txid: Txid,
+
+	/// A bitfield indicating which messages should be retransmitted by the receiving node.
+	///
+	/// | Bit Position  | Name                      |
+	/// | ------------- | --------------------------|
+	/// | 0             | `announcement_signatures` |
+	pub retransmit_flags: u8,
 }
 
 /// An [`announcement_signatures`] message to be sent to or received from a peer.
@@ -2821,8 +2833,12 @@ impl_writeable_msg!(ChannelReestablish, {
 	my_current_per_commitment_point,
 }, {
 	(0, next_funding_txid, option),
-	(1, your_last_funding_locked_txid, option),
-	(3, my_current_funding_locked_txid, option),
+	(5, my_current_funding_locked, option),
+});
+
+impl_writeable!(FundingLocked, {
+	txid,
+	retransmit_flags
 });
 
 impl_writeable_msg!(ClosingSigned,
@@ -4295,8 +4311,7 @@ mod tests {
 			your_last_per_commitment_secret: [9; 32],
 			my_current_per_commitment_point: public_key,
 			next_funding_txid: None,
-			your_last_funding_locked_txid: None,
-			my_current_funding_locked_txid: None,
+			my_current_funding_locked: None,
 		};
 
 		let encoded_value = cr.encode();
@@ -4348,8 +4363,7 @@ mod tests {
 				])
 				.unwrap(),
 			)),
-			your_last_funding_locked_txid: None,
-			my_current_funding_locked_txid: None,
+			my_current_funding_locked: None,
 		};
 
 		let encoded_value = cr.encode();
@@ -4399,20 +4413,16 @@ mod tests {
 			your_last_per_commitment_secret: [9; 32],
 			my_current_per_commitment_point: public_key,
 			next_funding_txid: None,
-			your_last_funding_locked_txid: Some(Txid::from_raw_hash(
-				bitcoin::hashes::Hash::from_slice(&[
-					48, 167, 250, 69, 152, 48, 103, 172, 164, 99, 59, 19, 23, 11, 92, 84, 15, 80,
-					4, 12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124,
-				])
-				.unwrap(),
-			)),
-			my_current_funding_locked_txid: Some(Txid::from_raw_hash(
-				bitcoin::hashes::Hash::from_slice(&[
-					21, 167, 250, 69, 152, 48, 103, 172, 164, 99, 59, 19, 23, 11, 92, 84, 15, 80,
-					4, 12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124,
-				])
-				.unwrap(),
-			)),
+			my_current_funding_locked: Some(msgs::FundingLocked {
+				txid: Txid::from_raw_hash(
+					bitcoin::hashes::Hash::from_slice(&[
+						21, 167, 250, 69, 152, 48, 103, 172, 164, 99, 59, 19, 23, 11, 92, 84, 15,
+						80, 4, 12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124,
+					])
+					.unwrap(),
+				),
+				retransmit_flags: 1,
+			}),
 		};
 
 		let encoded_value = cr.encode();
@@ -4428,14 +4438,10 @@ mod tests {
 				3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30,
 				24, 52, 96, 72, 25, 255, 156, 23, 245, 233, 213, 221, 7,
 				143, // my_current_per_commitment_point
-				1,   // Type (your_last_funding_locked_txid)
-				32,  // Length
-				48, 167, 250, 69, 152, 48, 103, 172, 164, 99, 59, 19, 23, 11, 92, 84, 15, 80, 4,
-				12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124, // Value
-				3,   // Type (my_current_funding_locked_txid)
-				32,  // Length
+				5,   // Type (my_current_funding_locked)
+				33,  // Length
 				21, 167, 250, 69, 152, 48, 103, 172, 164, 99, 59, 19, 23, 11, 92, 84, 15, 80, 4,
-				12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124, // Value
+				12, 98, 82, 75, 31, 201, 11, 91, 23, 98, 23, 53, 124, 1, // Value
 			]
 		);
 	}