f - make multiplier an odd TLV + option not required

Author: alecchendev

lightning/src/util/config.rs

@@ -496,13 +496,13 @@ impl_writeable_tlv_based!(ChannelConfig, {
 	(0, forwarding_fee_proportional_millionths, required),
 	(1, accept_underpaying_htlcs, (default_value, false)),
 	(2, forwarding_fee_base_msat, required),
+	(3, max_dust_htlc_exposure_multiplier_thousandths, option),
 	(4, cltv_expiry_delta, required),
 	(6, max_dust_htlc_exposure_msat, required),
 	// ChannelConfig serialized this field with a required type of 8 prior to the introduction of
 	// LegacyChannelConfig. To make sure that serialization is not compatible with this one, we use
 	// the next required type of 10, which if seen by the old serialization will always fail.
 	(10, force_close_avoidance_max_fee_satoshis, required),
-	(12, max_dust_htlc_exposure_multiplier_thousandths, required)
 });
 
 /// A parallel struct to [`ChannelConfig`] to define partial updates.
@@ -575,9 +575,9 @@ impl crate::util::ser::Writeable for LegacyChannelConfig {
 			(2, self.options.cltv_expiry_delta, required),
 			(3, self.options.force_close_avoidance_max_fee_satoshis, (default_value, 1000)),
 			(4, self.announced_channel, required),
+			(5, self.options.max_dust_htlc_exposure_multiplier_thousandths, option),
 			(6, self.commit_upfront_shutdown_pubkey, required),
 			(8, self.options.forwarding_fee_base_msat, required),
-			(10, self.options.max_dust_htlc_exposure_multiplier_thousandths, option),
 		});
 		Ok(())
 	}
@@ -599,9 +599,9 @@ impl crate::util::ser::Readable for LegacyChannelConfig {
 			(2, cltv_expiry_delta, required),
 			(3, force_close_avoidance_max_fee_satoshis, (default_value, 1000u64)),
 			(4, announced_channel, required),
+			(5, max_dust_htlc_exposure_multiplier_thousandths, option),
 			(6, commit_upfront_shutdown_pubkey, required),
 			(8, forwarding_fee_base_msat, required),
-			(10, max_dust_htlc_exposure_multiplier_thousandths, option),
 		});
 		Ok(Self {
 			options: ChannelConfig {