Add more properties to `ChannelConfig` from LDK original struct #165

jbesraa · 2023-09-27T07:27:02Z

resolves #163
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

src/types.rs

jbesraa · 2023-09-27T10:15:28Z

@tnull how do I fix the Arc<ChannelConfig> thingy in the uniffi? should I edit the LDKNode.swift file?

tnull

Thanks!

tnull · 2023-09-27T11:37:11Z

src/types.rs

+	/// 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>,


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.

tnull · 2023-09-27T11:39:37Z

src/types.rs

+	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,


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,

tnull · 2023-09-27T11:40:14Z

src/types.rs

+	/// 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


Let's drop the "See ..." sentence as it doesn't make sense in the LDK Node context.

tnull · 2023-09-27T11:42:19Z

src/types.rs

+	///
+	/// 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.


This and the next line belong to another field and should be removed.

tnull · 2023-09-27T11:42:47Z

src/types.rs

+	/// `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>,


As noted above, this is another case which we can make u64.

tnull · 2023-09-27T11:44:42Z

src/types.rs

+	/// 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>,


Unfortunately we need to make this an Arc<ChannelConfig> to accommodate bindings.

tnull · 2023-09-27T11:50:59Z

src/types.rs

+				.counterparty
+				.forwarding_info
+				.as_ref()
+				.and_then(|f| Some(f.fee_base_msat)),


nit: We can just use map instead of and_then(.. Some(..)) here and elsewhere.

tnull · 2023-09-27T11:51:46Z

@tnull how do I fix the Arc<ChannelConfig> thingy in the uniffi? should I edit the LDKNode.swift file?

No, unfortunately we just need to define the field as Arc<ChannelConfig>, see #165 (comment).

src/types.rs

tnull

One doc nit, otherwise LGTM!

src/types.rs

tnull · 2023-10-12T09:14:20Z

src/types.rs

+	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.


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.

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 commented Sep 27, 2023

View reviewed changes

src/types.rs Show resolved Hide resolved

jbesraa force-pushed the add-props-to-ChannelConfig branch 2 times, most recently from f19c9d1 to 8ba527b Compare September 27, 2023 10:14

tnull reviewed Sep 27, 2023

View reviewed changes

jbesraa force-pushed the add-props-to-ChannelConfig branch from 8ba527b to c92608b Compare September 28, 2023 08:53

jbesraa commented Sep 28, 2023

View reviewed changes

src/types.rs Show resolved Hide resolved

jbesraa commented Sep 28, 2023

View reviewed changes

src/types.rs Outdated Show resolved Hide resolved

tnull reviewed Oct 12, 2023

View reviewed changes

jbesraa force-pushed the add-props-to-ChannelConfig branch 6 times, most recently from 88c90c8 to 3d3fb22 Compare October 21, 2023 08:38

jbesraa force-pushed the add-props-to-ChannelConfig branch from 3d3fb22 to 16e990e Compare October 21, 2023 10:46

tnull approved these changes Oct 23, 2023

View reviewed changes

tnull merged commit d9a8c8a into lightningdevkit:main Oct 23, 2023

jbesraa deleted the add-props-to-ChannelConfig branch October 24, 2023 06:17

tnull mentioned this pull request Nov 15, 2023

Expose more ChannelDetails fields #90

Closed

	/// 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,

	/// 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.

Add more properties to ChannelConfig from LDK original struct #165

Add more properties to ChannelConfig from LDK original struct #165

Uh oh!

Conversation

jbesraa commented Sep 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jbesraa commented Sep 27, 2023

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tnull commented Sep 27, 2023

Uh oh!

Uh oh!

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Add more properties to `ChannelConfig` from LDK original struct #165

Add more properties to `ChannelConfig` from LDK original struct #165

jbesraa commented Sep 27, 2023 •

edited

Loading