Skip to content

Commit 8a15587

Browse files
committed
Log broadcast of interactive funding transaction
1 parent e841721 commit 8a15587

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
@@ -6248,7 +6248,11 @@ where
62486248
match chan.funding_transaction_signed(txid, witnesses) {
62496249
Ok((Some(tx_signatures), funding_tx_opt)) => {
62506250
if let Some(funding_tx) = funding_tx_opt {
6251-
self.broadcast_interactive_funding(chan, &funding_tx);
6251+
self.broadcast_interactive_funding(
6252+
chan,
6253+
&funding_tx,
6254+
&self.logger,
6255+
);
62526256
}
62536257
peer_state.pending_msg_events.push(
62546258
MessageSendEvent::SendTxSignatures {
@@ -6293,8 +6297,14 @@ where
62936297
}
62946298

62956299
fn broadcast_interactive_funding(
6296-
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction,
6300+
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction, logger: &L,
62976301
) {
6302+
let logger = WithChannelContext::from(logger, channel.context(), None);
6303+
log_info!(
6304+
logger,
6305+
"Broadcasting signed interactive funding transaction {}",
6306+
funding_tx.compute_txid()
6307+
);
62986308
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
62996309
{
63006310
let mut pending_events = self.pending_events.lock().unwrap();
@@ -9358,7 +9368,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
93589368
match channel.funding_transaction_signed(txid, vec![]) {
93599369
Ok((Some(tx_signatures), funding_tx_opt)) => {
93609370
if let Some(funding_tx) = funding_tx_opt {
9361-
self.broadcast_interactive_funding(channel, &funding_tx);
9371+
self.broadcast_interactive_funding(channel, &funding_tx, &self.logger);
93629372
}
93639373
if channel.context.is_connected() {
93649374
pending_msg_events.push(MessageSendEvent::SendTxSignatures {
@@ -10324,11 +10334,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1032410334
});
1032510335
}
1032610336
if let Some(ref funding_tx) = funding_tx_opt {
10327-
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
10328-
{
10329-
let mut pending_events = self.pending_events.lock().unwrap();
10330-
emit_channel_pending_event!(pending_events, chan);
10331-
}
10337+
self.broadcast_interactive_funding(chan, funding_tx, &self.logger);
1033210338
}
1033310339
},
1033410340
None => {

0 commit comments

Comments
 (0)