Merge pull request #3627 from TheBlueMatt/2025-02-fix-invalid-state

jkczyz · web-flow · commit 4f681304e26e · 2025-02-28T08:31:30.000-06:00
Fix Channel being left in indeterminite state from 9f9a7a9
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -1534,6 +1534,7 @@ impl<SP: Deref> Channel<SP> where
 				res
 			},
 			_ => {
+				self.phase = phase;
 				debug_assert!(!matches!(self.phase, ChannelPhase::Undefined));
 				Err(ChannelError::close("Got a commitment_signed message for an unfunded V1 channel!".into()))
 			}

Original file line number	Diff line number	Diff line change
`@@ -1534,6 +1534,7 @@ impl<SP: Deref> Channel<SP> where`
`1534`	`1534`	`res`
`1535`	`1535`	`},`
`1536`	`1536`	`_ => {`
	`1537`	`+ self.phase = phase;`
`1537`	`1538`	`debug_assert!(!matches!(self.phase, ChannelPhase::Undefined));`
`1538`	`1539`	`Err(ChannelError::close("Got a commitment_signed message for an unfunded V1 channel!".into()))`
`1539`	`1540`	`}`