Add list_channels_by_counterparty method#2079

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 8, 2023
Merged

Add list_channels_by_counterparty method #2079

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
124 changes: 76 additions & 48 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
pub fn get_outbound_payment_scid(&self) -> Option<u64> {
self.short_channel_id.or(self.outbound_scid_alias)
}

fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
best_block_height: u32, latest_features: InitFeatures) -> Self {

let balance = channel.get_available_balances();
let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
channel.get_holder_counterparty_selected_channel_reserve_satoshis();
ChannelDetails {
channel_id: channel.channel_id(),
counterparty: ChannelCounterparty {
node_id: channel.get_counterparty_node_id(),
features: latest_features,
unspendable_punishment_reserve: to_remote_reserve_satoshis,
forwarding_info: channel.counterparty_forwarding_info(),
// Ensures that we have actually received the `htlc_minimum_msat` value
// from the counterparty through the `OpenChannel` or `AcceptChannel`
// message (as they are always the first message from the counterparty).
// Else `Channel::get_counterparty_htlc_minimum_msat` could return the
// default `0` value set by `Channel::new_outbound`.
outbound_htlc_minimum_msat: if channel.have_received_message() {
Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
},
funding_txo: channel.get_funding_txo(),
// Note that accept_channel (or open_channel) is always the first message, so
// `have_received_message` indicates that type negotiation has completed.
channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
short_channel_id: channel.get_short_channel_id(),
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(),
unspendable_punishment_reserve: to_self_reserve_satoshis,
balance_msat: balance.balance_msat,
inbound_capacity_msat: balance.inbound_capacity_msat,
outbound_capacity_msat: balance.outbound_capacity_msat,
next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
user_channel_id: channel.get_user_id(),
confirmations_required: channel.minimum_depth(),
confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
is_outbound: channel.is_outbound(),
is_channel_ready: channel.is_usable(),
is_usable: channel.is_live(),
is_public: channel.should_announce(),
inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
config: Some(channel.config()),
}
}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
let peer_state = &mut *peer_state_lock;
for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
let balance = channel.get_available_balances();
let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
channel.get_holder_counterparty_selected_channel_reserve_satoshis();
res.push(ChannelDetails {
channel_id: (*channel_id).clone(),
counterparty: ChannelCounterparty {
node_id: channel.get_counterparty_node_id(),
features: peer_state.latest_features.clone(),
unspendable_punishment_reserve: to_remote_reserve_satoshis,
forwarding_info: channel.counterparty_forwarding_info(),
// Ensures that we have actually received the `htlc_minimum_msat` value
// from the counterparty through the `OpenChannel` or `AcceptChannel`
// message (as they are always the first message from the counterparty).
// Else `Channel::get_counterparty_htlc_minimum_msat` could return the
// default `0` value set by `Channel::new_outbound`.
outbound_htlc_minimum_msat: if channel.have_received_message() {
Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
},
funding_txo: channel.get_funding_txo(),
// Note that accept_channel (or open_channel) is always the first message, so
// `have_received_message` indicates that type negotiation has completed.
channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
short_channel_id: channel.get_short_channel_id(),
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(),
unspendable_punishment_reserve: to_self_reserve_satoshis,
balance_msat: balance.balance_msat,
inbound_capacity_msat: balance.inbound_capacity_msat,
outbound_capacity_msat: balance.outbound_capacity_msat,
next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
user_channel_id: channel.get_user_id(),
confirmations_required: channel.minimum_depth(),
confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
is_outbound: channel.is_outbound(),
is_channel_ready: channel.is_usable(),
is_usable: channel.is_live(),
is_public: channel.should_announce(),
inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
config: Some(channel.config()),
});
for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
let details = ChannelDetails::from_channel(channel, best_block_height,
peer_state.latest_features.clone());
res.push(details);
}
}
}
Expand All@@ -1786,6 +1794,24 @@ where
self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
}

/// Gets the list of channels we have with a given counterparty, in random order.
pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {

@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?

@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.

let best_block_height = self.best_block.read().unwrap().height();
let per_peer_state = self.per_peer_state.read().unwrap();

if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
let peer_state = &mut *peer_state_lock;
let features = &peer_state.latest_features;
return peer_state.channel_by_id
.iter()
.map(|(_, channel)|
ChannelDetails::from_channel(channel, best_block_height, features.clone()))
.collect();
}
vec![]
}

/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
/// successful path, or have unresolved HTLCs.
///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
// to connect messages with new values
chan.0.contents.fee_base_msat *= 2;
chan.1.contents.fee_base_msat *= 2;
let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
&nodes[1].node.get_our_node_id()).pop().unwrap();
let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
&nodes[0].node.get_our_node_id()).pop().unwrap();

// The first two nodes (which opened a channel) should now require fresh persistence
assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
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
Add list_channels_by_counterparty method#2079

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 8, 2023
 Merged


Add list_channels_by_counterparty method
#2079
 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


124 changes: 76 additions & 48 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ use crate::ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, MAX_VA
use crate::ln::outbound_payment;
use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutboundPayment};
use crate::ln::wire::Encode;
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner};
use crate::chain::keysinterface::{EntropySource, KeysManager, NodeSigner, Recipient, SignerProvider, ChannelSigner, WriteableEcdsaChannelSigner};
use crate::util::config::{UserConfig, ChannelConfig};
use crate::util::events::{Event, EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::events;
Expand DownExpand Up@@ -1229,6 +1229,55 @@ impl ChannelDetails {
	pub fn get_outbound_payment_scid(&self) -> Option<u64> {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	fn from_channel<Signer: WriteableEcdsaChannelSigner>(channel: &Channel<Signer>,
 best_block_height: u32, latest_features: InitFeatures) -> Self {

 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 ChannelDetails {
 channel_id: channel.channel_id(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: latest_features,
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 }
	}
}

/// Used by [`ChannelManager::list_recent_payments`] to express the status of recent payments.
Expand DownExpand Up@@ -1716,51 +1765,10 @@ where
 for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 for (channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let balance = channel.get_available_balances();
 let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 res.push(ChannelDetails {
 channel_id: (*channel_id).clone(),
 counterparty: ChannelCounterparty {
 node_id: channel.get_counterparty_node_id(),
 features: peer_state.latest_features.clone(),
 unspendable_punishment_reserve: to_remote_reserve_satoshis,
 forwarding_info: channel.counterparty_forwarding_info(),
 // Ensures that we have actually received the `htlc_minimum_msat` value
 // from the counterparty through the `OpenChannel` or `AcceptChannel`
 // message (as they are always the first message from the counterparty).
 // Else `Channel::get_counterparty_htlc_minimum_msat` could return the
 // default `0` value set by `Channel::new_outbound`.
 outbound_htlc_minimum_msat: if channel.have_received_message() {
 Some(channel.get_counterparty_htlc_minimum_msat()) } else { None },
 outbound_htlc_maximum_msat: channel.get_counterparty_htlc_maximum_msat(),
 },
 funding_txo: channel.get_funding_txo(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if channel.have_received_message() { Some(channel.get_channel_type().clone()) } else { None },
 short_channel_id: channel.get_short_channel_id(),
 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(),
 unspendable_punishment_reserve: to_self_reserve_satoshis,
 balance_msat: balance.balance_msat,
 inbound_capacity_msat: balance.inbound_capacity_msat,
 outbound_capacity_msat: balance.outbound_capacity_msat,
 next_outbound_htlc_limit_msat: balance.next_outbound_htlc_limit_msat,
 user_channel_id: channel.get_user_id(),
 confirmations_required: channel.minimum_depth(),
 confirmations: Some(channel.get_funding_tx_confirmations(best_block_height)),
 force_close_spend_delay: channel.get_counterparty_selected_contest_delay(),
 is_outbound: channel.is_outbound(),
 is_channel_ready: channel.is_usable(),
 is_usable: channel.is_live(),
 is_public: channel.should_announce(),
 inbound_htlc_minimum_msat: Some(channel.get_holder_htlc_minimum_msat()),
 inbound_htlc_maximum_msat: channel.get_holder_htlc_maximum_msat(),
 config: Some(channel.config()),
 });
 for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 let details = ChannelDetails::from_channel(channel, best_block_height,
 peer_state.latest_features.clone());
 res.push(details);
 }
 }
 }
Expand All@@ -1786,6 +1794,24 @@ where
 self.list_channels_with_filter(|&(_, ref channel)| channel.is_live())
	}

	/// Gets the list of channels we have with a given counterparty, in random order.
	pub fn list_channels_with_counterparty(&self, counterparty_node_id: &PublicKey) -> Vec<ChannelDetails> {
@arik-soarik-soMar 7, 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.

is this significantly faster than just doing a .filter on list_channels?
@tnulltnullMar 7, 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.

It should avoid the allocation of a large Vec<ChannelDetails> that we then filter down again. But really not sure what that does in actual performance. It would be nice to just expose list_channels_with_filter, but we of course can't do that since Channel is not public.
 let best_block_height = self.best_block.read().unwrap().height();
 let per_peer_state = self.per_peer_state.read().unwrap();

 if let Some(peer_state_mutex) = per_peer_state.get(counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let features = &peer_state.latest_features;
 return peer_state.channel_by_id
 .iter()
 .map(|(_, channel)|
 ChannelDetails::from_channel(channel, best_block_height, features.clone()))
 .collect();
 }
 vec![]
	}

	/// Returns in an undefined order recent payments that -- if not fulfilled -- have yet to find a
	/// successful path, or have unresolved HTLCs.
	///
Expand DownExpand Up@@ -7854,8 +7880,10 @@ mod tests {
 // to connect messages with new values
 chan.0.contents.fee_base_msat *= 2;
 chan.1.contents.fee_base_msat *= 2;
 let node_a_chan_info = nodes[0].node.list_channels()[0].clone();
 let node_b_chan_info = nodes[1].node.list_channels()[0].clone();
 let node_a_chan_info = nodes[0].node.list_channels_with_counterparty(
 &nodes[1].node.get_our_node_id()).pop().unwrap();
 let node_b_chan_info = nodes[1].node.list_channels_with_counterparty(
 &nodes[0].node.get_our_node_id()).pop().unwrap();

 // The first two nodes (which opened a channel) should now require fresh persistence
 assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
Expand Down