wip2

Author: joostjager

lightning/src/ln/channel.rs

@@ -8561,6 +8561,13 @@ where
 		self.context.counterparty_next_commitment_point = Some(msg.next_per_commitment_point);
 		self.context.counterparty_next_commitment_transaction_number -= 1;
 
+		log_trace!(
+			logger,
+			"FundedChannel {} new counterparty_next_commitment_transaction_number: {}",
+			self.context.channel_id(),
+			self.context.counterparty_next_commitment_transaction_number
+		);
+
 		if self.context.announcement_sigs_state == AnnouncementSigsState::Committed {
 			self.context.announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 		}
@@ -8773,13 +8780,13 @@ where
 		};
 		macro_rules! return_with_htlcs_to_fail {
 			($htlcs_to_fail: expr) => {
-				monitor_update.encoded_channel = Some(self.encode());
 				if !release_monitor {
 					self.context
 						.blocked_monitor_updates
 						.push(PendingChannelMonitorUpdate { update: monitor_update });
 					return Ok(($htlcs_to_fail, static_invoices, None));
 				} else {
+					monitor_update.encoded_channel = Some(self.encode());
 					return Ok(($htlcs_to_fail, static_invoices, Some(monitor_update)));
 				}
 			};
@@ -10854,10 +10861,9 @@ where
 		if self.context.blocked_monitor_updates.is_empty() {
 			return None;
 		}
-		Some((
-			self.context.blocked_monitor_updates.remove(0).update,
-			!self.context.blocked_monitor_updates.is_empty(),
-		))
+		let mut update = self.context.blocked_monitor_updates.remove(0).update;
+		update.encoded_channel = Some(self.encode());
+		Some((update, !self.context.blocked_monitor_updates.is_empty()))
 	}
 
 	/// Pushes a new monitor update into our monitor update queue, returning it if it should be