Skip to content

Replace opt_anchors with ChannelTypeFeatures #2361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 23, 2023
Merged

Replace opt_anchors with ChannelTypeFeatures #2361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d406d9
Introduce nonzero fee anchors feature.
arik-so Jun 19, 2023
38a2186
Document nonzero anchors in features module.
arik-so Jun 22, 2023
bf22182
Reference-rhs bitwise operations for features.
arik-so Jun 22, 2023
06a720f
Define `ChannelTypeFeatures` methods for anchors logic.
arik-so Jun 19, 2023
970b174
Method for `ChannelTypeFeatures` serialization compatibility.
arik-so Jun 21, 2023
1d9a709
Replace `opt_anchors` with `ChannelTypeFeatures`
arik-so Jun 19, 2023
ed5f9f6
Verify channel type features for decoding.
arik-so Jun 20, 2023
82b5359
Sync `ChannelTransactionParameters` features to `ChannelContext`.
arik-so Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8732,8 +8732,8 @@ mod tests {
let simple_anchors_raw_features = static_remote_key_required | simple_anchors_required;
let simple_anchors_init = InitFeatures::from_le_bytes(simple_anchors_raw_features.to_le_bytes().to_vec());
let simple_anchors_channel_type = ChannelTypeFeatures::from_le_bytes(simple_anchors_raw_features.to_le_bytes().to_vec());
assert!(simple_anchors_init.requires_unknown_bits());
assert!(simple_anchors_channel_type.requires_unknown_bits());
assert!(!simple_anchors_init.requires_unknown_bits());
assert!(!simple_anchors_channel_type.requires_unknown_bits());

// First, we'll try to open a channel between A and B where A requests a channel type for
// the original `option_anchors` feature (non zero fee htlc tx). This should be rejected by
Expand Down
9 changes: 6 additions & 3 deletions lightning/src/ln/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ mod sealed {
// Byte 1
VariableLengthOnion | StaticRemoteKey | PaymentSecret,
// Byte 2
BasicMPP | Wumbo | AnchorsZeroFeeHtlcTx,
BasicMPP | Wumbo | AnchorsNonzeroFeeHtlcTx | AnchorsZeroFeeHtlcTx,
// Byte 3
ShutdownAnySegwit,
// Byte 4
Expand All @@ -150,7 +150,7 @@ mod sealed {
// Byte 1
VariableLengthOnion | StaticRemoteKey | PaymentSecret,
// Byte 2
BasicMPP | Wumbo | AnchorsZeroFeeHtlcTx,
BasicMPP | Wumbo | AnchorsNonzeroFeeHtlcTx | AnchorsZeroFeeHtlcTx,
// Byte 3
ShutdownAnySegwit,
// Byte 4
Expand Down Expand Up @@ -196,7 +196,7 @@ mod sealed {
// Byte 1
StaticRemoteKey,
// Byte 2
AnchorsZeroFeeHtlcTx,
AnchorsNonzeroFeeHtlcTx | AnchorsZeroFeeHtlcTx,
// Byte 3
,
// Byte 4
Expand Down Expand Up @@ -378,6 +378,9 @@ mod sealed {
define_feature!(19, Wumbo, [InitContext, NodeContext],
"Feature flags for `option_support_large_channel` (aka wumbo channels).", set_wumbo_optional, set_wumbo_required,
supports_wumbo, requires_wumbo);
define_feature!(21, AnchorsNonzeroFeeHtlcTx, [InitContext, NodeContext, ChannelTypeContext],
"Feature flags for `option_anchors_nonzero_fee_htlc_tx`.", set_anchors_nonzero_fee_htlc_tx_optional,
set_anchors_nonzero_fee_htlc_tx_required, supports_anchors_nonzero_fee_htlc_tx, requires_anchors_nonzero_fee_htlc_tx);
define_feature!(23, AnchorsZeroFeeHtlcTx, [InitContext, NodeContext, ChannelTypeContext],
"Feature flags for `option_anchors_zero_fee_htlc_tx`.", set_anchors_zero_fee_htlc_tx_optional,
set_anchors_zero_fee_htlc_tx_required, supports_anchors_zero_fee_htlc_tx, requires_anchors_zero_fee_htlc_tx);
Expand Down