Use HolderCommitmentPoint::current_transaction_number

jkczyz · jkczyz · commit 51406e65cbd0 · 2025-09-02T15:55:14.000-07:00
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -9129,7 +9129,7 @@ where
 			return Err(ChannelError::close("Peer sent an invalid channel_reestablish to force close in a non-standard way".to_owned()));
 		}
 
-		let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.holder_commitment_point.next_transaction_number() - 1;
+		let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.holder_commitment_point.current_transaction_number();
 		if msg.next_remote_commitment_number > 0 {
 			let expected_point = self.context.holder_signer.as_ref()
 				.get_per_commitment_point(INITIAL_COMMITMENT_NUMBER - msg.next_remote_commitment_number + 1, &self.context.secp_ctx)

Original file line number	Diff line number	Diff line change
`@@ -9129,7 +9129,7 @@ where`
`9129`	`9129`	`return Err(ChannelError::close("Peer sent an invalid channel_reestablish to force close in a non-standard way".to_owned()));`
`9130`	`9130`	`}`
`9131`	`9131`
`9132`		`- let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.holder_commitment_point.next_transaction_number() - 1;`
	`9132`	`+ let our_commitment_transaction = INITIAL_COMMITMENT_NUMBER - self.holder_commitment_point.current_transaction_number();`
`9133`	`9133`	`if msg.next_remote_commitment_number > 0 {`
`9134`	`9134`	`let expected_point = self.context.holder_signer.as_ref()`
`9135`	`9135`	`.get_per_commitment_point(INITIAL_COMMITMENT_NUMBER - msg.next_remote_commitment_number + 1, &self.context.secp_ctx)`