@@ -1382,15 +1382,22 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
1382
1382
/// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly
1383
1383
/// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs
1384
1384
/// have been registered.
1385
- pub fn load_outputs_to_watch < F : Deref > ( & self , filter : & F ) where F :: Target : chain:: Filter {
1385
+ pub fn load_outputs_to_watch < F : Deref , L : Deref > ( & self , filter : & F , logger : & L )
1386
+ where
1387
+ F :: Target : chain:: Filter , L :: Target : Logger ,
1388
+ {
1386
1389
let lock = self . inner . lock ( ) . unwrap ( ) ;
1390
+ let logger = WithChannelMonitor :: from_impl ( logger, & * lock) ;
1391
+ log_trace ! ( & logger, "Registering funding outpoint {}" , & lock. get_funding_txo( ) . 0 ) ;
1387
1392
filter. register_tx ( & lock. get_funding_txo ( ) . 0 . txid , & lock. get_funding_txo ( ) . 1 ) ;
1388
1393
for ( txid, outputs) in lock. get_outputs_to_watch ( ) . iter ( ) {
1389
1394
for ( index, script_pubkey) in outputs. iter ( ) {
1390
1395
assert ! ( * index <= u16 :: max_value( ) as u32 ) ;
1396
+ let outpoint = OutPoint { txid : * txid, index : * index as u16 } ;
1397
+ log_trace ! ( logger, "Registering outpoint {} with the filter for monitoring spends" , outpoint) ;
1391
1398
filter. register_output ( WatchedOutput {
1392
1399
block_hash : None ,
1393
- outpoint : OutPoint { txid : * txid , index : * index as u16 } ,
1400
+ outpoint,
1394
1401
script_pubkey : script_pubkey. clone ( ) ,
1395
1402
} ) ;
1396
1403
}
@@ -3458,9 +3465,11 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
3458
3465
3459
3466
if height > self . best_block . height ( ) {
3460
3467
self . best_block = BestBlock :: new ( block_hash, height) ;
3468
+ log_trace ! ( logger, "Connecting new block {} at height {}" , block_hash, height) ;
3461
3469
self . block_confirmed ( height, block_hash, vec ! [ ] , vec ! [ ] , vec ! [ ] , & broadcaster, & fee_estimator, logger)
3462
3470
} else if block_hash != self . best_block . block_hash ( ) {
3463
3471
self . best_block = BestBlock :: new ( block_hash, height) ;
3472
+ log_trace ! ( logger, "Best block re-orged, replaced with new block {} at height {}" , block_hash, height) ;
3464
3473
self . onchain_events_awaiting_threshold_conf . retain ( |ref entry| entry. height <= height) ;
3465
3474
self . onchain_tx_handler . block_disconnected ( height + 1 , broadcaster, fee_estimator, logger) ;
3466
3475
Vec :: new ( )
@@ -3497,6 +3506,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
3497
3506
let mut claimable_outpoints = Vec :: new ( ) ;
3498
3507
' tx_iter: for tx in & txn_matched {
3499
3508
let txid = tx. txid ( ) ;
3509
+ log_trace ! ( logger, "Transaction {} confirmed in block {}" , txid , block_hash) ;
3500
3510
// If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
3501
3511
if Some ( txid) == self . funding_spend_confirmed {
3502
3512
log_debug ! ( logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed" , txid) ;
0 commit comments