expose feerate_per_kw in ChannelDetails#2094

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
TheBlueMatt merged 1 commit into from
Mar 15, 2023
Merged

expose feerate_per_kw in ChannelDetails#2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
config: None,
feerate_sat_per_1000_weight: None,
});
}
Some(&first_hops_vec[..])
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
})
}

pub fn get_feerate(&self) -> u32 {
pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
self.feerate_per_kw
}

Expand Down
17 changes: 13 additions & 4 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
/// 0.0.113.
pub user_channel_id: u128,
/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
/// which is applied to commitment and HTLC transactions.
///
/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
pub feerate_sat_per_1000_weight: Option<u32>,
/// Our total balance. This is the amount we would get if we close the channel.
/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
inbound_scid_alias: channel.latest_inbound_scid_alias(),
channel_value_satoshis: channel.get_value_satoshis(),
feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
unspendable_punishment_reserve: to_self_reserve_satoshis,
balance_msat: balance.balance_msat,
inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
if !chan.is_outbound() { return NotifyOption::SkipPersist; }
// If the feerate has decreased by less than half, don't bother
if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
return NotifyOption::SkipPersist;
}
if !chan.is_live() {
log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
return NotifyOption::SkipPersist;
}
log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

chan.queue_update_fee(new_feerate, &self.logger);
NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
(33, self.inbound_htlc_minimum_msat, option),
(35, self.inbound_htlc_maximum_msat, option),
(37, user_channel_id_high_opt, option),
(39, self.feerate_sat_per_1000_weight, option),
});
Ok(())
}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
(33, inbound_htlc_minimum_msat, option),
(35, inbound_htlc_maximum_msat, option),
(37, user_channel_id_high_opt, option),
(39, feerate_sat_per_1000_weight, option),
});

// `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
is_public: is_public.0.unwrap(),
inbound_htlc_minimum_msat,
inbound_htlc_maximum_msat,
feerate_sat_per_1000_weight,
})
}
}
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
let mut per_peer_state_lock;
let mut peer_state_lock;
let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
chan.get_feerate()
chan.get_feerate_sat_per_1000_weight()
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions lightning/src/routing/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
config: None,
feerate_sat_per_1000_weight: None

@dunxendunxenMar 10, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?

@tnulltnullMar 10, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).

@dunxendunxenMar 10, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage

@tnulltnullMar 11, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .

@TheBlueMattTheBlueMattMar 13, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.

@tnulltnullMar 13, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️

@dunxendunxenMar 13, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯

@johncantrell97johncantrell97Mar 15, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?

}
}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
config: None,
feerate_sat_per_1000_weight: None,
}
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
expose feerate_per_kw in ChannelDetails#2094

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

TheBlueMatt
merged 1 commit into

from

Mar 15, 2023
 Merged


expose feerate_per_kw in ChannelDetails#2094
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 });
 }
 Some(&first_hops_vec[..])
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4777,7 +4777,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 })
	}

	pub fn get_feerate(&self) -> u32 {
	pub fn get_feerate_sat_per_1000_weight(&self) -> u32 {
 self.feerate_per_kw
	}

Expand Down

17 changes: 13 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1118,6 +1118,11 @@ pub struct ChannelDetails {
	/// inbound. This may be zero for inbound channels serialized with LDK versions prior to
	/// 0.0.113.
	pub user_channel_id: u128,
	/// The currently negotiated fee rate denominated in satoshi per 1000 weight units,
	/// which is applied to commitment and HTLC transactions.
	///
	/// This value will be `None` for objects serialized with LDK versions prior to 0.0.115.
	pub feerate_sat_per_1000_weight: Option<u32>,
	/// Our total balance. This is the amount we would get if we close the channel.
	/// This value is not exact. Due to various in-flight changes and feerate changes, exactly this
	/// amount is not likely to be recoverable on close.
Expand DownExpand Up@@ -1260,6 +1265,7 @@ impl ChannelDetails {
 outbound_scid_alias: if channel.is_usable() { Some(channel.outbound_scid_alias()) } else { None },
 inbound_scid_alias: channel.latest_inbound_scid_alias(),
 channel_value_satoshis: channel.get_value_satoshis(),
 feerate_sat_per_1000_weight: Some(channel.get_feerate_sat_per_1000_weight()),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
Expand DownExpand Up@@ -3500,18 +3506,18 @@ where
	fn update_channel_fee(&self, chan_id: &[u8; 32], chan: &mut Channel<<SP::Target as SignerProvider>::Signer>, new_feerate: u32) -> NotifyOption {
 if !chan.is_outbound() { return NotifyOption::SkipPersist; }
 // If the feerate has decreased by less than half, don't bother
 if new_feerate <= chan.get_feerate() && new_feerate * 2 > chan.get_feerate() {
 if new_feerate <= chan.get_feerate_sat_per_1000_weight() && new_feerate * 2 > chan.get_feerate_sat_per_1000_weight() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 if !chan.is_live() {
 log_trace!(self.logger, "Channel {} does not qualify for a feerate change from {} to {} as it cannot currently be updated (probably the peer is disconnected).",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);
 return NotifyOption::SkipPersist;
 }
 log_trace!(self.logger, "Channel {} qualifies for a feerate change from {} to {}.",
 log_bytes!(chan_id[..]), chan.get_feerate(), new_feerate);
 log_bytes!(chan_id[..]), chan.get_feerate_sat_per_1000_weight(), new_feerate);

 chan.queue_update_fee(new_feerate, &self.logger);
 NotifyOption::DoPersist
Expand DownExpand Up@@ -6570,6 +6576,7 @@ impl Writeable for ChannelDetails {
 (33, self.inbound_htlc_minimum_msat, option),
 (35, self.inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, self.feerate_sat_per_1000_weight, option),
 });
 Ok(())
	}
Expand DownExpand Up@@ -6605,6 +6612,7 @@ impl Readable for ChannelDetails {
 (33, inbound_htlc_minimum_msat, option),
 (35, inbound_htlc_maximum_msat, option),
 (37, user_channel_id_high_opt, option),
 (39, feerate_sat_per_1000_weight, option),
 });

 // `user_channel_id` used to be a single u64 value. In order to remain backwards compatible with
Expand DownExpand Up@@ -6638,6 +6646,7 @@ impl Readable for ChannelDetails {
 is_public: is_public.0.unwrap(),
 inbound_htlc_minimum_msat,
 inbound_htlc_maximum_msat,
 feerate_sat_per_1000_weight,
 })
	}
}
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -697,7 +697,7 @@ macro_rules! get_feerate {
 let mut per_peer_state_lock;
 let mut peer_state_lock;
 let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 chan.get_feerate()
 chan.get_feerate_sat_per_1000_weight()
 }
	}
}
Expand Down

2 changes: 2 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2208,6 +2208,7 @@ mod tests {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None
@dunxendunxenMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Maybe very nit picky, but should it not be "sats"?
@tnulltnullMar 10, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, as it's FeeEstimator::get_est_sat_per_1000_weight already and the unit symbol is sat (cf. https://bitcoin.design/guide/designing-products/units-and-symbols/).
@dunxendunxenMar 10, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right for unit symbol makes sense, also didn't remember existing usage
@tnulltnullMar 11, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johncantrell97 On that note, as you're already touching ChannelManager, you could also rename the target_feerate_sats_per_1000_weight argument of ChannelManager::close_channel_with_target_feerate to target_feerate_sat_per_1000_weight .
@TheBlueMattTheBlueMattMar 13, 2023

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, it's plural, the design guide linked says explicitly plural is "sats"? Not like it matters tho.
@tnulltnullMar 13, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my, you're actually right. I read the guide and seem to have switched it around in my head. I still think units should be singular (you wouldn't use "USDs" or "BTCs"), but will now shut up and eat my words on the basis of the guide I linked to myself. 🤦‍♂️
@dunxendunxenMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no hard opinion on this to be honest ¯_(ツ)_/¯
@johncantrell97johncantrell97Mar 15, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer sats but am now seeing that it's indeed already mixed usage in the code base so maybe it's a future cleanup that is needed?
 }
	}

Expand DownExpand Up@@ -5737,6 +5738,7 @@ mod benches {
 inbound_htlc_minimum_msat: None,
 inbound_htlc_maximum_msat: None,
 config: None,
 feerate_sat_per_1000_weight: None,
 }
	}

Expand Down