Skip to content

Commit 1726047

Browse files
committed
Log broadcast of interactive funding transaction
1 parent b6607a7 commit 1726047

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6438,7 +6438,11 @@ where
64386438
splice_negotiated,
64396439
}) => {
64406440
if let Some(funding_tx) = funding_tx {
6441-
self.broadcast_interactive_funding(chan, &funding_tx);
6441+
self.broadcast_interactive_funding(
6442+
chan,
6443+
&funding_tx,
6444+
&self.logger,
6445+
);
64426446
}
64436447
if let Some(splice_negotiated) = splice_negotiated {
64446448
self.pending_events.lock().unwrap().push_back((
@@ -6501,8 +6505,14 @@ where
65016505
}
65026506

65036507
fn broadcast_interactive_funding(
6504-
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction,
6508+
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction, logger: &L,
65056509
) {
6510+
let logger = WithChannelContext::from(logger, channel.context(), None);
6511+
log_info!(
6512+
logger,
6513+
"Broadcasting signed interactive funding transaction {}",
6514+
funding_tx.compute_txid()
6515+
);
65066516
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
65076517
{
65086518
let mut pending_events = self.pending_events.lock().unwrap();
@@ -9571,7 +9581,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
95719581
match channel.funding_transaction_signed(txid, vec![]) {
95729582
Ok(FundingTxSigned { tx_signatures: Some(tx_signatures), funding_tx, splice_negotiated }) => {
95739583
if let Some(funding_tx) = funding_tx {
9574-
self.broadcast_interactive_funding(channel, &funding_tx);
9584+
self.broadcast_interactive_funding(channel, &funding_tx, &self.logger);
95759585
}
95769586

95779587
if let Some(splice_negotiated) = splice_negotiated {
@@ -10579,11 +10589,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1057910589
});
1058010590
}
1058110591
if let Some(ref funding_tx) = funding_tx {
10582-
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
10583-
{
10584-
let mut pending_events = self.pending_events.lock().unwrap();
10585-
emit_channel_pending_event!(pending_events, chan);
10586-
}
10592+
self.broadcast_interactive_funding(chan, funding_tx, &self.logger);
1058710593
}
1058810594
if let Some(splice_negotiated) = splice_negotiated {
1058910595
self.pending_events.lock().unwrap().push_back((

0 commit comments

Comments
 (0)