Skip to content

Persist inbound channel peer info#170

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
tnull merged 1 commit into from
Nov 29, 2023
Merged

Persist inbound channel peer info #170

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
35 changes: 35 additions & 0 deletions src/event.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
logger: L,
config: Arc<Config>,
peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
peer_store: Arc<PeerStore<K, L>>,
) -> Self {
Self {
event_queue,
Expand All@@ -273,6 +276,7 @@ where
logger,
runtime,
config,
peer_store,
}
}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
log_error!(self.logger, "Failed to push to event queue: {}", e);
panic!("Failed to push to event queue");
});
let network_graph = self.network_graph.read_only();
let channels =
self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
if let Some(pending_channel) =
channels.into_iter().find(|c| c.channel_id == channel_id)
{
if !pending_channel.is_outbound
&& self.peer_store.get_peer(&counterparty_node_id).is_none()
{
if let Some(address) = network_graph
.nodes()
.get(&NodeId::from_pubkey(&counterparty_node_id))
.and_then(|node_info| node_info.announcement_info.as_ref())
.and_then(|ann_info| ann_info.addresses().first())
{
let peer = PeerInfo {
node_id: counterparty_node_id,
address: address.clone(),
};

self.peer_store.add_peer(peer).unwrap_or_else(|e| {
log_error!(
self.logger,
"Failed to add peer {} to peer store: {}",
counterparty_node_id,
e
);
});
}
}
}
}
LdkEvent::ChannelReady {
channel_id, user_channel_id, counterparty_node_id, ..
Expand Down
14 changes: 11 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
.filter(|id| !pm_peers.contains(id))
{
if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
let _ = do_connect_peer(
let res = do_connect_peer(
peer_info.node_id,
peer_info.address,
Arc::clone(&connect_pm),
Arc::clone(&connect_logger),
)
.await;
).await;
match res {
Ok(_) => {
log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
},
Err(e) => {
log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
}
}
}
}
}
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
Arc::clone(&self.runtime),
Arc::clone(&self.logger),
Arc::clone(&self.config),
Arc::clone(&self.peer_store),
));

// Setup background processing
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" + '
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
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('^' + ".*" + '
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
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('^' + ".*" + '
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
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" + '
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
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('^' + ".*" + '
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
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); }
})();
})();
Persist inbound channel peer info by jbesraa · Pull Request #170 · lightningdevkit/ldk-node · GitHub
Skip to content
Persist inbound channel peer info#170

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

tnull
merged 1 commit into

from

Nov 29, 2023
 Merged


Persist inbound channel peer info
#170
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


35 changes: 35 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use crate::peer_store::{PeerInfo, PeerStore};
use crate::{
	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
};
Expand DownExpand Up@@ -251,6 +252,7 @@ where
	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
	logger: L,
	config: Arc<Config>,
	peer_store: Arc<PeerStore<K, L>>,
}

impl<K: KVStore + Sync + Send + 'static, L: Deref> EventHandler<K, L>
Expand All@@ -262,6 +264,7 @@ where
 channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,
 peer_store: Arc<PeerStore<K, L>>,
	) -> Self {
 Self {
 event_queue,
Expand All@@ -273,6 +276,7 @@ where
 logger,
 runtime,
 config,
 peer_store,
 }
	}

Expand DownExpand Up@@ -739,6 +743,37 @@ where
 log_error!(self.logger, "Failed to push to event queue: {}", e);
 panic!("Failed to push to event queue");
 });
 let network_graph = self.network_graph.read_only();
 let channels =
 self.channel_manager.list_channels_with_counterparty(&counterparty_node_id);
 if let Some(pending_channel) =
 channels.into_iter().find(|c| c.channel_id == channel_id)
 {
 if !pending_channel.is_outbound
 && self.peer_store.get_peer(&counterparty_node_id).is_none()
 {
 if let Some(address) = network_graph
 .nodes()
 .get(&NodeId::from_pubkey(&counterparty_node_id))
 .and_then(|node_info| node_info.announcement_info.as_ref())
 .and_then(|ann_info| ann_info.addresses().first())
 {
 let peer = PeerInfo {
 node_id: counterparty_node_id,
 address: address.clone(),
 };

 self.peer_store.add_peer(peer).unwrap_or_else(|e| {
 log_error!(
 self.logger,
 "Failed to add peer {} to peer store: {}",
 counterparty_node_id,
 e
 );
 });
 }
 }
 }
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
Expand Down

14 changes: 11 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,13 +570,20 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 .filter(|id| !pm_peers.contains(id))
 {
 if let Some(peer_info) = connect_peer_store.get_peer(&node_id) {
 let _ = do_connect_peer(
 let res = do_connect_peer(
 peer_info.node_id,
 peer_info.address,
 Arc::clone(&connect_pm),
 Arc::clone(&connect_logger),
 )
 .await;
 ).await;
 match res {
 Ok(_) => {
 log_info!(connect_logger, "Successfully reconnected to peer {}", node_id);
 },
 Err(e) => {
 log_error!(connect_logger, "Failed to reconnect to peer {}: {}", node_id, e);
 }
 }
 }
 }
 }
Expand DownExpand Up@@ -656,6 +663,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 Arc::clone(&self.runtime),
 Arc::clone(&self.logger),
 Arc::clone(&self.config),
 Arc::clone(&self.peer_store),
 ));

 // Setup background processing
Expand Down