From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Jun 2022 03:37:16 +0000 (+0000)
Subject: Do not panic on early tx broadcasts in fuzzing
X-Git-Tag: v0.0.108~4^2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=refs%2Fheads%2F2022-06-fix-fuzz-nonbug;p=rust-lightning

Do not panic on early tx broadcasts in fuzzing

If the user broadcasts a funding transaction before the
counterparty provides a `funding_signed` we will panic in
`check_get_channel_ready`. This is expected - the user did
something which may lead to loss of funds, and we *really* need to
let them know.

However, the fuzzer can do this and we shouldn't treat it as a bug,
its a totally expected panic. Thus, we disable the panic in fuzz.

Thanks to Chaincode for providing fuzzing resources which managed
to hit this panic.
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index ca02f0a9a..a54ef652b 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -4652,9 +4652,17 @@ impl<Signer: Sign> Channel<Signer> {
 		} else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::OurChannelReady as u32) {
 			// We got a reorg but not enough to trigger a force close, just ignore.
 			false
-		} else if self.channel_state < ChannelState::ChannelFunded as u32 {
-			panic!("Started confirming a channel in a state pre-FundingSent?: {}", self.channel_state);
 		} else {
+			if self.channel_state < ChannelState::ChannelFunded as u32 {
+				// We should never see a funding transaction on-chain until we've received
+				// funding_signed (if we're an outbound channel), or seen funding_generated (if we're
+				// an inbound channel - before that we have no known funding TXID). The fuzzer,
+				// however, may do this and we shouldn't treat it as a bug.
+				#[cfg(not(fuzzing))]
+				panic!("Started confirming a channel in a state pre-FundingSent: {}.\n\
+					Do NOT broadcast a funding transaction manually - let LDK do it for you!",
+					self.channel_state);
+			}
 			// We got a reorg but not enough to trigger a force close, just ignore.
 			false
 		};