f move ser to tlvs

Author: valentinewallace

lightning/src/ln/channel.rs

@@ -6560,9 +6560,10 @@ impl<Signer: WriteableEcdsaChannelSigner> Writeable for Channel<Signer> {
 		}
 
 		let mut preimages: Vec<&Option<PaymentPreimage>> = vec![];
+		let mut pending_outbound_skimmed_fees: Vec<Option<u64>> = Vec::new();
 
 		(self.pending_outbound_htlcs.len() as u64).write(writer)?;
-		for htlc in self.pending_outbound_htlcs.iter() {
+		for (idx, htlc) in self.pending_outbound_htlcs.iter().enumerate() {
 			htlc.htlc_id.write(writer)?;
 			htlc.amount_msat.write(writer)?;
 			htlc.cltv_expiry.write(writer)?;
@@ -6598,23 +6599,37 @@ impl<Signer: WriteableEcdsaChannelSigner> Writeable for Channel<Signer> {
 					reason.write(writer)?;
 				}
 			}
-			htlc.skimmed_fee_msat.write(writer)?;
+			if let Some(skimmed_fee) = htlc.skimmed_fee_msat {
+				if pending_outbound_skimmed_fees.is_empty() {
+					for _ in 0..idx { pending_outbound_skimmed_fees.push(None); }
+				}
+				pending_outbound_skimmed_fees.push(Some(skimmed_fee));
+			} else if !pending_outbound_skimmed_fees.is_empty() {
+				pending_outbound_skimmed_fees.push(None);
+			}
 		}
 
+		let mut holding_cell_skimmed_fees: Vec<Option<u64>> = Vec::new();
 		(self.holding_cell_htlc_updates.len() as u64).write(writer)?;
-		for update in self.holding_cell_htlc_updates.iter() {
+		for (idx, update) in self.holding_cell_htlc_updates.iter().enumerate() {
 			match update {
 				&HTLCUpdateAwaitingACK::AddHTLC {
 					ref amount_msat, ref cltv_expiry, ref payment_hash, ref source, ref onion_routing_packet,
-					ref skimmed_fee_msat,
+					skimmed_fee_msat,
 				} => {
 					0u8.write(writer)?;
 					amount_msat.write(writer)?;
 					cltv_expiry.write(writer)?;
 					payment_hash.write(writer)?;
 					source.write(writer)?;
 					onion_routing_packet.write(writer)?;
-					skimmed_fee_msat.write(writer)?;
+
+					if let Some(skimmed_fee) = skimmed_fee_msat {
+						if holding_cell_skimmed_fees.is_empty() {
+							for _ in 0..idx { holding_cell_skimmed_fees.push(None); }
+						}
+						holding_cell_skimmed_fees.push(Some(skimmed_fee));
+					} else if !holding_cell_skimmed_fees.is_empty() { holding_cell_skimmed_fees.push(None); }
 				},
 				&HTLCUpdateAwaitingACK::ClaimHTLC { ref payment_preimage, ref htlc_id } => {
 					1u8.write(writer)?;
@@ -6781,6 +6796,8 @@ impl<Signer: WriteableEcdsaChannelSigner> Writeable for Channel<Signer> {
 			(29, self.temporary_channel_id, option),
 			(31, channel_pending_event_emitted, option),
 			(33, self.pending_monitor_updates, vec_type),
+			(35, pending_outbound_skimmed_fees, optional_vec),
+			(37, holding_cell_skimmed_fees, optional_vec),
 		});
 
 		Ok(())
@@ -6891,7 +6908,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 					},
 					_ => return Err(DecodeError::InvalidValue),
 				},
-				skimmed_fee_msat: Readable::read(reader)?,
+				skimmed_fee_msat: None,
 			});
 		}
 
@@ -6905,7 +6922,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 					payment_hash: Readable::read(reader)?,
 					source: Readable::read(reader)?,
 					onion_routing_packet: Readable::read(reader)?,
-					skimmed_fee_msat: Readable::read(reader)?,
+					skimmed_fee_msat: None,
 				},
 				1 => HTLCUpdateAwaitingACK::ClaimHTLC {
 					payment_preimage: Readable::read(reader)?,
@@ -7061,6 +7078,9 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 
 		let mut pending_monitor_updates = Some(Vec::new());
 
+		let mut pending_outbound_skimmed_fees_opt: Option<Vec<Option<u64>>> = None;
+		let mut holding_cell_skimmed_fees_opt: Option<Vec<Option<u64>>> = None;
+
 		read_tlv_fields!(reader, {
 			(0, announcement_sigs, option),
 			(1, minimum_depth, option),
@@ -7084,6 +7104,8 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 			(29, temporary_channel_id, option),
 			(31, channel_pending_event_emitted, option),
 			(33, pending_monitor_updates, vec_type),
+			(35, pending_outbound_skimmed_fees_opt, optional_vec),
+			(37, holding_cell_skimmed_fees_opt, optional_vec),
 		});
 
 		let (channel_keys_id, holder_signer) = if let Some(channel_keys_id) = channel_keys_id {
@@ -7138,6 +7160,25 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 
 		let holder_max_accepted_htlcs = holder_max_accepted_htlcs.unwrap_or(DEFAULT_MAX_HTLCS);
 
+		if let Some(skimmed_fees) = pending_outbound_skimmed_fees_opt {
+			let mut iter = skimmed_fees.into_iter();
+			for htlc in pending_outbound_htlcs.iter_mut() {
+				htlc.skimmed_fee_msat = iter.next().ok_or(DecodeError::InvalidValue)?;
+			}
+			// We expect all skimmed fees to be consumed above
+			if iter.next().is_some() { return Err(DecodeError::InvalidValue) }
+		}
+		if let Some(skimmed_fees) = holding_cell_skimmed_fees_opt {
+			let mut iter = skimmed_fees.into_iter();
+			for htlc in holding_cell_htlc_updates.iter_mut() {
+				if let HTLCUpdateAwaitingACK::AddHTLC { ref mut skimmed_fee_msat, .. } = htlc {
+					*skimmed_fee_msat = iter.next().ok_or(DecodeError::InvalidValue)?;
+				}
+			}
+			// We expect all skimmed fees to be consumed above
+			if iter.next().is_some() { return Err(DecodeError::InvalidValue) }
+		}
+
 		Ok(Channel {
 			user_id,