@@ -5526,10 +5526,13 @@ where
5526
5526
}
5527
5527
5528
5528
#[rustfmt::skip]
5529
- fn check_for_funding_tx_confirmed(
5529
+ fn check_for_funding_tx_confirmed<L: Deref> (
5530
5530
&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
5531
- index_in_block: usize, tx: &mut ConfirmedTransaction,
5532
- ) -> Result<bool, ClosureReason> {
5531
+ index_in_block: usize, tx: &mut ConfirmedTransaction, logger: &L,
5532
+ ) -> Result<bool, ClosureReason>
5533
+ where
5534
+ L::Target: Logger,
5535
+ {
5533
5536
let funding_txo = match funding.get_funding_txo() {
5534
5537
Some(funding_txo) => funding_txo,
5535
5538
None => {
@@ -5579,6 +5582,14 @@ where
5579
5582
Err(_) => panic!("Block was bogus - either height was > 16 million, had > 16 million transactions, or had > 65k outputs"),
5580
5583
};
5581
5584
5585
+ log_info!(
5586
+ logger,
5587
+ "Funding txid {} for channel {} confirmed in block {}",
5588
+ funding_txo.txid,
5589
+ &self.channel_id(),
5590
+ block_hash,
5591
+ );
5592
+
5582
5593
return Ok(true);
5583
5594
}
5584
5595
}
@@ -9130,7 +9141,7 @@ where
9130
9141
// and send it immediately instead of waiting for a best_block_updated call (which may have
9131
9142
// already happened for this block).
9132
9143
let is_funding_tx_confirmed = self.context.check_for_funding_tx_confirmed(
9133
- &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx,
9144
+ &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
9134
9145
)?;
9135
9146
9136
9147
if is_funding_tx_confirmed {
@@ -9162,7 +9173,7 @@ where
9162
9173
#[cfg(splicing)]
9163
9174
for (index, funding) in self.pending_funding.iter_mut().enumerate() {
9164
9175
if self.context.check_for_funding_tx_confirmed(
9165
- funding, block_hash, height, index_in_block, &mut confirmed_tx,
9176
+ funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
9166
9177
)? {
9167
9178
if funding_already_confirmed || confirmed_funding_index.is_some() {
9168
9179
let err_reason = "splice tx of another pending funding already confirmed";
0 commit comments