wip3

Author: joostjager

lightning/src/ln/channel.rs

@@ -7393,6 +7393,7 @@ where
 					// to be strictly increasing by one, so decrement it here.
 					self.context.latest_monitor_update_id = monitor_update.update_id;
 					monitor_update.updates.append(&mut additional_update.updates);
+					monitor_update.encoded_channel = Some(self.encode());
 				} else {
 					let blocked_upd = self.context.blocked_monitor_updates.get(0);
 					let new_mon_id = blocked_upd
@@ -7419,7 +7420,6 @@ where
 					Vec::new(),
 					Vec::new(),
 				);
-				monitor_update.encoded_channel = Some(self.encode());
 				UpdateFulfillCommitFetch::NewClaim { monitor_update, htlc_value_msat }
 			},
 			UpdateFulfillFetch::DuplicateClaim {} => UpdateFulfillCommitFetch::DuplicateClaim {},
@@ -8780,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)));
 				}
 			};

lightning/src/ln/channelmanager.rs

@@ -3820,6 +3820,9 @@ macro_rules! handle_new_monitor_update {
 	) => {{
 		eprintln!("MACRO DEBUG called at {}:{}", file!(), line!());
 
+		// let mut update = $update;
+		// update.encoded_channel = Some($chan.encode());
+
 		let (update_completed, all_updates_complete) = handle_new_monitor_update_internal(
 			$self,
 			&mut $peer_state.in_flight_monitor_updates,