@@ -5514,10 +5514,13 @@ where
5514
5514
}
5515
5515
5516
5516
#[rustfmt::skip]
5517
- fn check_for_funding_tx_confirmed(
5517
+ fn check_for_funding_tx_confirmed<L: Deref> (
5518
5518
&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
5519
- index_in_block: usize, tx: &mut ConfirmedTransaction,
5520
- ) -> Result<bool, ClosureReason> {
5519
+ index_in_block: usize, tx: &mut ConfirmedTransaction, logger: &L,
5520
+ ) -> Result<bool, ClosureReason>
5521
+ where
5522
+ L::Target: Logger,
5523
+ {
5521
5524
let funding_txo = match funding.get_funding_txo() {
5522
5525
Some(funding_txo) => funding_txo,
5523
5526
None => {
@@ -5567,6 +5570,14 @@ where
5567
5570
Err(_) => panic!("Block was bogus - either height was > 16 million, had > 16 million transactions, or had > 65k outputs"),
5568
5571
};
5569
5572
5573
+ log_info!(
5574
+ logger,
5575
+ "Funding txid {} for channel {} confirmed in block {}",
5576
+ funding_txo.txid,
5577
+ &self.channel_id(),
5578
+ block_hash,
5579
+ );
5580
+
5570
5581
return Ok(true);
5571
5582
}
5572
5583
}
@@ -9086,7 +9097,7 @@ where
9086
9097
// and send it immediately instead of waiting for a best_block_updated call (which may have
9087
9098
// already happened for this block).
9088
9099
let is_funding_tx_confirmed = self.context.check_for_funding_tx_confirmed(
9089
- &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx,
9100
+ &mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
9090
9101
)?;
9091
9102
9092
9103
if is_funding_tx_confirmed {
@@ -9118,7 +9129,7 @@ where
9118
9129
#[cfg(splicing)]
9119
9130
for (index, funding) in self.pending_funding.iter_mut().enumerate() {
9120
9131
if self.context.check_for_funding_tx_confirmed(
9121
- funding, block_hash, height, index_in_block, &mut confirmed_tx,
9132
+ funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
9122
9133
)? {
9123
9134
if funding_already_confirmed || confirmed_funding_index.is_some() {
9124
9135
let err_reason = "splice tx of another pending funding already confirmed";
0 commit comments