Skip to content

Commit 3a6eb74

Browse files
committed
Log broadcast of interactive funding transaction
1 parent 3ce8204 commit 3a6eb74

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
@@ -6300,7 +6300,11 @@ where
63006300
match chan.funding_transaction_signed(txid, witnesses) {
63016301
Ok((Some(tx_signatures), funding_tx_opt)) => {
63026302
if let Some(funding_tx) = funding_tx_opt {
6303-
self.broadcast_interactive_funding(chan, &funding_tx);
6303+
self.broadcast_interactive_funding(
6304+
chan,
6305+
&funding_tx,
6306+
&self.logger,
6307+
);
63046308
}
63056309
peer_state.pending_msg_events.push(
63066310
MessageSendEvent::SendTxSignatures {
@@ -6345,8 +6349,14 @@ where
63456349
}
63466350

63476351
fn broadcast_interactive_funding(
6348-
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction,
6352+
&self, channel: &mut FundedChannel<SP>, funding_tx: &Transaction, logger: &L,
63496353
) {
6354+
let logger = WithChannelContext::from(logger, channel.context(), None);
6355+
log_info!(
6356+
logger,
6357+
"Broadcasting signed interactive funding transaction {}",
6358+
funding_tx.compute_txid()
6359+
);
63506360
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
63516361
{
63526362
let mut pending_events = self.pending_events.lock().unwrap();
@@ -9415,7 +9425,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
94159425
match channel.funding_transaction_signed(txid, vec![]) {
94169426
Ok((Some(tx_signatures), funding_tx_opt)) => {
94179427
if let Some(funding_tx) = funding_tx_opt {
9418-
self.broadcast_interactive_funding(channel, &funding_tx);
9428+
self.broadcast_interactive_funding(channel, &funding_tx, &self.logger);
94199429
}
94209430
if channel.context.is_connected() {
94219431
pending_msg_events.push(MessageSendEvent::SendTxSignatures {
@@ -10381,11 +10391,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1038110391
});
1038210392
}
1038310393
if let Some(ref funding_tx) = funding_tx_opt {
10384-
self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
10385-
{
10386-
let mut pending_events = self.pending_events.lock().unwrap();
10387-
emit_channel_pending_event!(pending_events, chan);
10388-
}
10394+
self.broadcast_interactive_funding(chan, funding_tx, &self.logger);
1038910395
}
1039010396
},
1039110397
None => {

0 commit comments

Comments
 (0)