Skip to content

Store a cached NodeId for each Peer#2022

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

Store a cached NodeId for each Peer#2022

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: 0 additions & 1 deletion lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down
53 changes: 29 additions & 24 deletions lightning/src/ln/peer_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
channel_encryptor: PeerChannelEncryptor,
their_node_id: Option<PublicKey>,
/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
their_node_id: Option<(PublicKey, NodeId)>,
their_features: Option<InitFeatures>,
their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
}

fn set_their_node_id(&mut self, node_id: PublicKey) {
self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
return None;
}
p.their_node_id
}).collect()
}).map(|(node_id, _)| node_id).collect()
}

fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
while !peer.awaiting_write_event {
if peer.should_buffer_onion_message() {
if let Some(peer_node_id) = peer.their_node_id {
if let Some((peer_node_id, _)) = peer.their_node_id {
if let Some(next_onion_message) =
self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
/// Append a message to a peer's pending outbound/write buffer
fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
if is_gossip_msg(message.type_id()) {
log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
} else {
log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
}
peer.msgs_sent_since_pong += 1;
peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

macro_rules! insert_node_id {
() => {
match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
hash_map::Entry::Occupied(_) => {
log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
return Err(PeerHandleError{ no_connection_possible: false })
},
hash_map::Entry::Vacant(entry) => {
log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
entry.insert(peer_descriptor.clone())
},
};
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
peer.pending_read_is_header = true;

peer.their_node_id = Some(their_node_id);
peer.set_their_node_id(their_node_id);
insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
.or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
peer.pending_read_is_header = true;
peer.their_node_id = Some(their_node_id);
peer.set_their_node_id(their_node_id);
insert_node_id!();
let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
.or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
}

for msg in msgs_to_forward.drain(..) {
self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
}

Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
mut peer_lock: MutexGuard<Peer>,
message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
peer_lock.received_message_since_timer_tick = true;

// Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
continue;
}
if let Some(their_node_id) = peer.their_node_id {
let their_node_id = NodeId::from_pubkey(&their_node_id);
if let Some((_, their_node_id)) = peer.their_node_id {
if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
continue;
}
}
if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
continue;
}
self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
continue;
}
if let Some(their_node_id) = peer.their_node_id {
if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
if let Some((_, their_node_id)) = peer.their_node_id {
if their_node_id == msg.contents.node_id {
continue;
}
}
if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
continue;
}
self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
continue;
}
if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
continue;
}
self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
},
Some(peer_lock) => {
let peer = peer_lock.lock().unwrap();
if let Some(node_id) = peer.their_node_id {
if let Some((node_id, _)) = peer.their_node_id {
log_trace!(self.logger,
"Handling disconnection of peer {}, with {}future connection to the peer possible.",
log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
self.node_id_to_descriptor.lock().unwrap().clear();
let peers = &mut *peers_lock;
for (mut descriptor, peer) in peers.drain() {
if let Some(node_id) = peer.lock().unwrap().their_node_id {
if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
self.message_handler.chan_handler.peer_disconnected(&node_id, false);
self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
let mut peers_lock = self.peers.write().unwrap();
for descriptor in descriptors_needing_disconnect.iter() {
if let Some(peer) = peers_lock.remove(descriptor) {
if let Some(node_id) = peer.lock().unwrap().their_node_id {
if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Store a cached `NodeId` for each `Peer` by alecchendev · Pull Request #2022 · lightningdevkit/rust-lightning · GitHub
Skip to content
Store a cached NodeId for each Peer#2022

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Store a cached `NodeId` for each `Peer` by alecchendev · Pull Request #2022 · lightningdevkit/rust-lightning · GitHub
Skip to content
Store a cached NodeId for each Peer#2022

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

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

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

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

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Store a cached `NodeId` for each `Peer` by alecchendev · Pull Request #2022 · lightningdevkit/rust-lightning · GitHub
Skip to content
Store a cached NodeId for each Peer#2022

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Store a cached `NodeId` for each `Peer` by alecchendev · Pull Request #2022 · lightningdevkit/rust-lightning · GitHub
Skip to content
Store a cached NodeId for each Peer#2022

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down

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

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

Feb 8, 2023
 Merged


Store a cached NodeId for each Peer#2022
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: 0 additions & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ use bitcoin::hash_types::{Txid, PubkeyHash};

use crate::ln::{PaymentHash, PaymentPreimage};
use crate::ln::msgs::DecodeError;
use crate::routing::gossip::NodeId;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::util::transaction_utils;

Expand Down

53 changes: 29 additions & 24 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,9 @@ const BUFFER_DRAIN_MSGS_PER_TICK: usize = 32;

struct Peer {
	channel_encryptor: PeerChannelEncryptor,
	their_node_id: Option<PublicKey>,
	/// We cache a `NodeId` here to avoid serializing peers' keys every time we forward gossip
	/// messages in `PeerManager`. Use `Peer::set_their_node_id` to modify this field.
	their_node_id: Option<(PublicKey, NodeId)>,
	their_features: Option<InitFeatures>,
	their_net_address: Option<NetAddress>,

Expand DownExpand Up@@ -481,6 +483,10 @@ impl Peer {
 total_outbound_buffered > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
 self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
	}

	fn set_their_node_id(&mut self, node_id: PublicKey) {
 self.their_node_id = Some((node_id, NodeId::from_pubkey(&node_id)));
	}
}

/// SimpleArcPeerManager is useful when you need a PeerManager with a static lifetime, e.g.
Expand DownExpand Up@@ -651,10 +657,10 @@ impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref, NS: Deref> PeerManager<D
/// This works around `format!()` taking a reference to each argument, preventing
/// `if let Some(node_id) = peer.their_node_id { format!(.., node_id) } else { .. }` from compiling
/// due to lifetime errors.
struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
struct OptionalFromDebugger<'a>(&'a Option<(PublicKey, NodeId)>);
impl core::fmt::Display for OptionalFromDebugger<'_> {
	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
 if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
 if let Some((node_id, _)) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
	}
}

Expand DownExpand Up@@ -741,7 +747,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 return None;
 }
 p.their_node_id
 }).collect()
 }).map(|(node_id, _)| node_id).collect()
	}

	fn get_ephemeral_key(&self) -> SecretKey {
Expand DownExpand Up@@ -849,7 +855,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	fn do_attempt_write_data(&self, descriptor: &mut Descriptor, peer: &mut Peer) {
 while !peer.awaiting_write_event {
 if peer.should_buffer_onion_message() {
 if let Some(peer_node_id) = peer.their_node_id {
 if let Some((peer_node_id, _)) = peer.their_node_id {
 if let Some(next_onion_message) =
 self.message_handler.onion_message_handler.next_onion_message_for_peer(peer_node_id) {
 self.enqueue_message(peer, &next_onion_message);
Expand DownExpand Up@@ -978,9 +984,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
	/// Append a message to a peer's pending outbound/write buffer
	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 if is_gossip_msg(message.type_id()) {
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
 log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0));
 } else {
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
 log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap().0))
 }
 peer.msgs_sent_since_pong += 1;
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
Expand DownExpand Up@@ -1065,14 +1071,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM

 macro_rules! insert_node_id {
 () => {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap()) {
 match self.node_id_to_descriptor.lock().unwrap().entry(peer.their_node_id.unwrap().0) {
 hash_map::Entry::Occupied(_) => {
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 log_trace!(self.logger, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap().0));
 peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 return Err(PeerHandleError{ no_connection_possible: false })
 },
 hash_map::Entry::Vacant(entry) => {
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
 log_debug!(self.logger, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap().0));
 entry.insert(peer_descriptor.clone())
 },
 };
Expand All@@ -1096,7 +1102,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;

 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand All@@ -1110,7 +1116,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]));
 peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 peer.pending_read_is_header = true;
 peer.their_node_id = Some(their_node_id);
 peer.set_their_node_id(their_node_id);
 insert_node_id!();
 let features = self.message_handler.chan_handler.provided_init_features(&their_node_id)
 .or(self.message_handler.route_handler.provided_init_features(&their_node_id))
Expand DownExpand Up@@ -1212,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 }

 for msg in msgs_to_forward.drain(..) {
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref());
 self.forward_broadcast_msg(&*peers, &msg, peer_node_id.as_ref().map(|(pk, _)| pk));
 }

 Ok(pause_read)
Expand All@@ -1226,7 +1232,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 mut peer_lock: MutexGuard<Peer>,
 message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages");
 let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
 peer_lock.received_message_since_timer_tick = true;

 // Need an Init as first message
Expand DownExpand Up@@ -1467,13 +1473,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 let their_node_id = NodeId::from_pubkey(&their_node_id);
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1493,12 +1498,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if let Some(their_node_id) = peer.their_node_id {
 if NodeId::from_pubkey(&their_node_id) == msg.contents.node_id {
 if let Some((_, their_node_id)) = peer.their_node_id {
 if their_node_id == msg.contents.node_id {
 continue;
 }
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand All@@ -1518,7 +1523,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
 continue;
 }
 if except_node.is_some() && peer.their_node_id.as_ref() == except_node {
 if except_node.is_some() && peer.their_node_id.as_ref().map(|(pk, _)| pk) == except_node {
 continue;
 }
 self.enqueue_encoded_gossip_broadcast(&mut *peer, encoded_msg.clone());
Expand DownExpand Up@@ -1837,7 +1842,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 },
 Some(peer_lock) => {
 let peer = peer_lock.lock().unwrap();
 if let Some(node_id) = peer.their_node_id {
 if let Some((node_id, _)) = peer.their_node_id {
 log_trace!(self.logger,
 "Handling disconnection of peer {}, with {}future connection to the peer possible.",
 log_pubkey!(node_id), if no_connection_possible { "no " } else { "" });
Expand DownExpand Up@@ -1877,7 +1882,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 self.node_id_to_descriptor.lock().unwrap().clear();
 let peers = &mut *peers_lock;
 for (mut descriptor, peer) in peers.drain() {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to client request to disconnect all peers", node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
 self.message_handler.onion_message_handler.peer_disconnected(&node_id, false);
Expand DownExpand Up@@ -1967,7 +1972,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 let mut peers_lock = self.peers.write().unwrap();
 for descriptor in descriptors_needing_disconnect.iter() {
 if let Some(peer) = peers_lock.remove(descriptor) {
 if let Some(node_id) = peer.lock().unwrap().their_node_id {
 if let Some((node_id, _)) = peer.lock().unwrap().their_node_id {
 log_trace!(self.logger, "Disconnecting peer with id {} due to ping timeout", node_id);
 self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 self.message_handler.chan_handler.peer_disconnected(&node_id, false);
Expand Down