@@ -7351,17 +7351,6 @@ impl<SP: Deref> Channel<SP> where
7351
7351
return None;
7352
7352
}
7353
7353
7354
- // If we're still pending the signature on a funding transaction, then we're not ready to send a
7355
- // channel_ready yet.
7356
- if self.context.signer_pending_funding {
7357
- log_debug!(logger, "Can't produce channel_ready: the signer is pending funding.");
7358
- // We make sure to set the channel ready flag here so that we try to
7359
- // generate a channel ready for 0conf channels once our signer unblocked
7360
- // for funding.
7361
- self.context.signer_pending_channel_ready = true;
7362
- return None;
7363
- }
7364
-
7365
7354
self.get_channel_ready(logger)
7366
7355
}
7367
7356
@@ -8528,7 +8517,8 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
8528
8517
holder_commitment_point,
8529
8518
};
8530
8519
8531
- let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some();
8520
+ let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
8521
+ || channel.context.signer_pending_channel_ready;
8532
8522
channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
8533
8523
Ok((channel, channel_monitor))
8534
8524
}
@@ -8797,7 +8787,8 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
8797
8787
interactive_tx_signing_session: None,
8798
8788
holder_commitment_point,
8799
8789
};
8800
- let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some();
8790
+ let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
8791
+ || channel.context.signer_pending_channel_ready;
8801
8792
channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
8802
8793
8803
8794
Ok((channel, funding_signed, channel_monitor))
0 commit comments