Skip to content

Commit f9d7d59

Browse files
committed
Revert TLV type change for original_funding_outpoint
The (de)serialisation for `ChannelTransactionParameters` changed between 0.0.114 and 0.0.116. This type had already been modified by us when adding the `original_funding_outpoint` field. When first introduced, we chose a type value of 14. After the update, we chose to reduce it down to 12 since the type 12 was no longer being used after changes between 0.0.114 and 0.0.116. Unfortunately, this unnecessarily broke channels created before the update. Eventually we will need to settle on a way to handle these possible conflicts with upstream. Tibo already suggested a few options: - Use much larger numbers for `rust-dlc` custom fields. - Move LDK values around as we rebase on top of new changes. - Add a subdomain for `rust-dlc` custom fields.
1 parent 72120d3 commit f9d7d59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lightning/src/ln/chan_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ impl Writeable for ChannelTransactionParameters {
937937
(8, self.funding_outpoint, option),
938938
(10, legacy_deserialization_prevention_marker, option),
939939
(11, self.channel_type_features, required),
940-
(12, self.original_funding_outpoint, option),
940+
(14, self.original_funding_outpoint, option),
941941
});
942942
Ok(())
943943
}
@@ -962,7 +962,7 @@ impl Readable for ChannelTransactionParameters {
962962
(8, funding_outpoint, option),
963963
(10, _legacy_deserialization_prevention_marker, option),
964964
(11, channel_type_features, option),
965-
(12, original_funding_outpoint, option),
965+
(14, original_funding_outpoint, option),
966966
});
967967

968968
let mut additional_features = ChannelTypeFeatures::empty();

0 commit comments

Comments
 (0)