Merge pull request #2267 from TheBlueMatt/2023-05-better-scb-err

TheBlueMatt · web-flow · commit 818dbdf7ab34 · 2023-05-06T00:58:18.000Z
Mention lnd's SCB feature in the corresponding error message
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -4092,7 +4092,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 
 		if msg.next_local_commitment_number >= INITIAL_COMMITMENT_NUMBER || msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER ||
 			msg.next_local_commitment_number == 0 {
-			return Err(ChannelError::Close("Peer sent a garbage channel_reestablish".to_owned()));
+			return Err(ChannelError::Close("Peer sent a garbage channel_reestablish (usually an lnd node with lost state asking us to force-close for them)".to_owned()));
 		}
 
 		if msg.next_remote_commitment_number > 0 {

Original file line number	Diff line number	Diff line change
`@@ -4092,7 +4092,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {`
`4092`	`4092`
`4093`	`4093`	`if msg.next_local_commitment_number >= INITIAL_COMMITMENT_NUMBER \|\| msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER \|\|`
`4094`	`4094`	`msg.next_local_commitment_number == 0 {`
`4095`		`- return Err(ChannelError::Close("Peer sent a garbage channel_reestablish".to_owned()));`
	`4095`	`+ return Err(ChannelError::Close("Peer sent a garbage channel_reestablish (usually an lnd node with lost state asking us to force-close for them)".to_owned()));`
`4096`	`4096`	`}`
`4097`	`4097`
`4098`	`4098`	`if msg.next_remote_commitment_number > 0 {`