Add more properties to ChannelConfig from LDK original struct
#165
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbesraa
commented
Sep 27, 2023
jbesraa
force-pushed
the
add-props-to-ChannelConfig
branch
2 times, most recently
from
f19c9d1
to
8ba527b
Compare
|
@tnull how do I fix the |
tnull
reviewed
Sep 27, 2023
src/types.rs
Outdated
| /// The smallest value HTLC (in msat) the remote peer will accept, for this channel. This field | ||
| /// is only `None` before we have received either the `OpenChannel` or `AcceptChannel` message | ||
| /// from the remote peer, or for `ChannelCounterparty` objects serialized prior to LDK 0.0.107. | ||
| pub counterparty_outbound_htlc_minimum_msat: Option<u64>, |
There was a problem hiding this comment.
As LDK Node 0.1 depends on 0.0.115, we can unwrap all these Options here and below that are only None for versions prior to that, i.e., make this u64 and remove the corresponding part of the comment.
src/types.rs
Outdated
| pub counterparty_forwarding_info_fee_base_msat: Option<u32>, | ||
| /// Amount in millionths of a satoshi the channel will charge per transferred satoshi. | ||
| pub counterparty_forwarding_info_fee_proportional_millionths: Option<u32>, | ||
| /// The minimum difference in cltv_expiry between an ingoing HTLC and its outgoing counterpart, |
There was a problem hiding this comment.
Suggested change
| /// The minimum difference in cltv_expiry between an ingoing HTLC and its outgoing counterpart, | |
| /// The minimum difference in CLTV expiry between an ingoing HTLC and its outgoing counterpart, |
src/types.rs
Outdated
| /// Amount in millionths of a satoshi the channel will charge per transferred satoshi. | ||
| pub counterparty_forwarding_info_fee_proportional_millionths: Option<u32>, | ||
| /// The minimum difference in cltv_expiry between an ingoing HTLC and its outgoing counterpart, | ||
| /// such that the outgoing HTLC is forwardable to this counterparty. See `msgs::ChannelUpdate`'s |
There was a problem hiding this comment.
Let's drop the "See ..." sentence as it doesn't make sense in the LDK Node context.
src/types.rs
Outdated
| /// | ||
| /// This value will be `None` for outbound channels until the counterparty accepts the channel. | ||
| pub force_close_spend_delay: Option<u16>, | ||
| /// The stage of the channel's shutdown. |
There was a problem hiding this comment.
This and the next line belong to another field and should be removed.
src/types.rs
Outdated
| /// `None` for `ChannelDetails` serialized on LDK versions prior to 0.0.116. | ||
| /// The smallest value HTLC (in msat) we will accept, for this channel. This field | ||
| /// is only `None` for `ChannelDetails` objects serialized prior to LDK 0.0.107 | ||
| pub inbound_htlc_minimum_msat: Option<u64>, |
There was a problem hiding this comment.
As noted above, this is another case which we can make u64.
src/types.rs
Outdated
| /// Set of configurable parameters that affect channel operation. | ||
| /// | ||
| /// This field is only `None` for `ChannelDetails` objects serialized prior to LDK 0.0.109. | ||
| pub config: Option<ChannelConfig>, |
There was a problem hiding this comment.
Unfortunately we need to make this an Arc<ChannelConfig> to accommodate bindings.
tnull
reviewed
Sep 27, 2023
src/types.rs
Outdated
| .counterparty | ||
| .forwarding_info | ||
| .as_ref() | ||
| .and_then(|f| Some(f.fee_base_msat)), |
There was a problem hiding this comment.
nit: We can just use map instead of and_then(.. Some(..)) here and elsewhere.
No, unfortunately we just need to define the field as |
jbesraa
force-pushed
the
add-props-to-ChannelConfig
branch
from
8ba527b
to
c92608b
Compare
jbesraa
commented
Sep 28, 2023
jbesraa
commented
Sep 28, 2023
tnull
reviewed
Oct 12, 2023
src/types.rs
Outdated
| pub counterparty_outbound_htlc_maximum_msat: Option<u64>, | ||
| /// Base routing fee in millisatoshis. | ||
| pub counterparty_forwarding_info_fee_base_msat: Option<u32>, | ||
| /// Amount in millionths of a satoshi the channel will charge per transferred satoshi. |
There was a problem hiding this comment.
nit:
Suggested change
| /// Amount in millionths of a satoshi the channel will charge per transferred satoshi. | |
| /// Proportional fee, in millionths of a satoshi, the channel will charge per transferred satoshi. |
jbesraa
force-pushed
the
add-props-to-ChannelConfig
branch
6 times, most recently
from
88c90c8
to
3d3fb22
Compare
Adds: `counterparty_unspendable_punishment_reserve`,
`counterparty_outbound_htlc_minimum_msat`
`counterparty_outbound_htlc_maximum_msat`
`counterparty_forwarding_info_fee_base_msat`
`counterparty_forwarding_info_fee_proportional_millionths`
`counterparty_forwarding_info_cltv_expiry_delta`
`next_outbound_htlc_limit_msat`
`next_outbound_htlc_minimum_msat`
`force_close_spend_delay`
`inbound_htlc_minimum_msat`
`inbound_htlc_maximum_msat`
`config`
jbesraa
force-pushed
the
add-props-to-ChannelConfig
branch
from
3d3fb22
to
16e990e
Compare
tnull
approved these changes
Oct 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves #163
Adds:
counterparty_unspendable_punishment_reserve,counterparty_outbound_htlc_minimum_msatcounterparty_outbound_htlc_maximum_msatcounterparty_forwarding_info_fee_base_msatcounterparty_forwarding_info_fee_proportional_millionthscounterparty_forwarding_info_cltv_expiry_deltanext_outbound_htlc_limit_msatnext_outbound_htlc_minimum_msatforce_close_spend_delayinbound_htlc_minimum_msatinbound_htlc_maximum_msatconfig