wip

Author: joostjager

lightning/src/chain/chainmonitor.rs

@@ -1417,9 +1417,10 @@ where
 				let logger = WithChannelMonitor::from(&self.logger, &monitor, None);
 				log_trace!(
 					logger,
-					"Updating ChannelMonitor to id {} for channel {}",
+					"Updating ChannelMonitor to id {} for channel {} with updates {:#?}",
 					update.update_id,
-					log_funding_info!(monitor)
+					log_funding_info!(monitor),
+					update.updates
 				);
 
 				// We hold a `pending_monitor_updates` lock through `update_monitor` to ensure we

lightning/src/chain/channelmonitor.rs

@@ -3544,6 +3544,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			return Err("Previous secret did not match new one");
 		}
 
+		println!("Channel monitor current commitment secret index: {}", self.commitment_secrets.get_min_seen_secret());
+
 		// Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 		// events for now-revoked/fulfilled HTLCs.
 		let mut removed_fulfilled_htlcs = false;

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -3584,9 +3584,9 @@ fn do_test_blocked_chan_preimage_release(completion_mode: BlockedUpdateComplMode
 #[cfg(not(feature = "safe_channels"))]
 #[test]
 fn test_blocked_chan_preimage_release() {
-	do_test_blocked_chan_preimage_release(BlockedUpdateComplMode::AtReload);
+	//do_test_blocked_chan_preimage_release(BlockedUpdateComplMode::AtReload);
 	do_test_blocked_chan_preimage_release(BlockedUpdateComplMode::Sync);
-	do_test_blocked_chan_preimage_release(BlockedUpdateComplMode::Async);
+	//do_test_blocked_chan_preimage_release(BlockedUpdateComplMode::Async);
 }
 
 fn do_test_inverted_mon_completion_order(

lightning/src/ln/channelmanager.rs

@@ -3818,6 +3818,8 @@ macro_rules! handle_new_monitor_update {
 		$self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr,
 		$per_peer_state_lock: expr, $chan: expr
 	) => {{
+		eprintln!("MACRO DEBUG called at {}:{}", file!(), line!());
+
 		let (update_completed, all_updates_complete) = handle_new_monitor_update_internal(
 			$self,
 			&mut $peer_state.in_flight_monitor_updates,