Prune stale channels from network graph after RGS sync#2161

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
arik-so merged 2 commits into from
Apr 8, 2023
Merged

Prune stale channels from network graph after RGS sync #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff1b4b
Prune stale channels from network graph after RGS sync
benthecarman Apr 6, 2023
b336b2e
Lift std check to function definition
benthecarman Apr 6, 2023
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
4 changes: 2 additions & 2 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
];
$nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

// this should have added two channels
assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
// this should have added two channels and pruned the previous one.
assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

$receive.expect("Network graph not pruned within deadline");

Expand Down
6 changes: 5 additions & 1 deletion lightning-rapid-gossip-sync/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
///
/// `update_data`: `&[u8]` binary stream that comprises the update data
#[cfg(feature = "std")]
pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
let mut read_cursor = io::Cursor::new(update_data);
self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down
48 changes: 46 additions & 2 deletions lightning-rapid-gossip-sync/src/processing.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
#[cfg(feature = "std")]
pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
&self,
read_cursor: &mut R,
) -> Result<u32, GraphSyncError> {
#[allow(unused_mut, unused_assignments)]
let mut current_time_unix = None;
#[cfg(all(feature = "std", not(test)))]
#[cfg(not(test))]
{
// Note that many tests rely on being able to set arbitrarily old timestamps, thus we
// disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
}

self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

if let Some(time) = current_time_unix {
self.network_graph.remove_stale_channels_and_tracking_with_time(time)
}

self.is_initial_sync_complete.store(true, Ordering::Release);
log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
use bitcoin::Network;

#[cfg(feature = "std")]
use lightning::ln::msgs::DecodeError;

use lightning::routing::gossip::NetworkGraph;
use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

#[test]
#[cfg(feature = "std")]
fn network_graph_fails_to_update_from_clipped_input() {
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn incremental_only_update_ignores_missing_channel() {
let incremental_update_input = vec![
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn incremental_only_update_fails_without_prior_updates() {
let announced_update_input = vec![
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn incremental_only_update_fails_without_prior_same_direction_updates() {
let initialization_input = vec![
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
let initialization_input = vec![
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn update_succeeds_when_duplicate_gossip_is_applied() {
let initialization_input = vec![
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
}

#[test]
#[cfg(feature = "std")]
fn full_update_succeeds() {
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
assert_eq!(network_graph.read_only().channels().len(), 2);
}

#[test]
fn prunes_after_update() {
// this is the timestamp encoded in the binary data of valid_input below
let logger = TestLogger::new();

let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

{
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
assert!(update_result.is_ok());
assert_eq!(network_graph.read_only().channels().len(), 2);
}

{
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
assert!(update_result.is_ok());
assert_eq!(network_graph.read_only().channels().len(), 0);
}
}

#[test]
fn timestamp_edge_cases_are_handled_correctly() {
// this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
assert!(update_result.is_ok());
assert_eq!(network_graph.read_only().channels().len(), 2);
assert_eq!(network_graph.read_only().channels().len(), 0);
}

{
Expand All@@ -591,6 +634,7 @@ mod tests {
}

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down

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

Skip to content
Prune stale channels from network graph after RGS sync#2161

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

arik-so
merged 2 commits into

from

Apr 8, 2023
 Merged


Prune stale channels from network graph after RGS sync
#2161
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
cff1b4b

Prune stale channels from network graph after RGS sync


benthecarman Apr 6, 2023
b336b2e

Lift std check to function definition


benthecarman Apr 6, 2023

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


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1429,8 +1429,8 @@ mod tests {
 ];
 $nodes[0].rapid_gossip_sync.update_network_graph_no_std(&initialization_input[..], Some(1642291930)).unwrap();

 // this should have added two channels
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 3);
 // this should have added two channels and pruned the previous one.
 assert_eq!($nodes[0].network_graph.read_only().channels().len(), 2);

 $receive.expect("Network graph not pruned within deadline");

Expand Down

6 changes: 5 additions & 1 deletion
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,10 @@
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
//! // In no-std you need to provide the current time in unix epoch seconds
//! // otherwise you can use update_network_graph
//! let current_time_unix = 0;
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph_no_std(snapshot_contents, Some(current_time_unix));
//! ```

#![cfg_attr(all(not(feature = "std"), not(test)), no_std)]
Expand DownExpand Up@@ -128,6 +131,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
	///
	/// `update_data`: `&[u8]` binary stream that comprises the update data
	#[cfg(feature = "std")]
	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 let mut read_cursor = io::Cursor::new(update_data);
 self.update_network_graph_from_byte_stream(&mut read_cursor)
Expand Down

48 changes: 46 additions & 2 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,13 +38,14 @@ const MAX_INITIAL_NODE_ID_VECTOR_CAPACITY: u32 = 50_000;
const STALE_RGS_UPDATE_AGE_LIMIT_SECS: u64 = 60 * 60 * 24 * 14;

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	#[cfg(feature = "std")]
	pub(crate) fn update_network_graph_from_byte_stream<R: io::Read>(
 &self,
 read_cursor: &mut R,
	) -> Result<u32, GraphSyncError> {
 #[allow(unused_mut, unused_assignments)]
 let mut current_time_unix = None;
 #[cfg(all(feature = "std", not(test)))]
 #[cfg(not(test))]
 {
 // Note that many tests rely on being able to set arbitrarily old timestamps, thus we
 // disable this check during tests!
Expand DownExpand Up@@ -237,6 +238,11 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 }

 self.network_graph.set_last_rapid_gossip_sync_timestamp(latest_seen_timestamp);

 if let Some(time) = current_time_unix {
 self.network_graph.remove_stale_channels_and_tracking_with_time(time)
 }

 self.is_initial_sync_complete.store(true, Ordering::Release);
 log_trace!(self.logger, "Done processing RGS data from {}", latest_seen_timestamp);
 Ok(latest_seen_timestamp)
Expand All@@ -247,7 +253,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use bitcoin::Network;

	#[cfg(feature = "std")]
	use lightning::ln::msgs::DecodeError;

	use lightning::routing::gossip::NetworkGraph;
	use lightning::util::test_utils::TestLogger;

Expand DownExpand Up@@ -275,6 +283,7 @@ mod tests {
	const VALID_BINARY_TIMESTAMP: u64 = 1642291930;

	#[test]
	#[cfg(feature = "std")]
	fn network_graph_fails_to_update_from_clipped_input() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -306,6 +315,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_ignores_missing_channel() {
 let incremental_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand All@@ -326,6 +336,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_updates() {
 let announced_update_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -353,6 +364,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_only_update_fails_without_prior_same_direction_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -408,6 +420,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn incremental_update_succeeds_with_prior_announcements_and_full_updates() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -467,6 +480,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn update_succeeds_when_duplicate_gossip_is_applied() {
 let initialization_input = vec![
 76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand DownExpand Up@@ -510,6 +524,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	fn full_update_succeeds() {
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
Expand DownExpand Up@@ -554,6 +569,34 @@ mod tests {
 assert_eq!(network_graph.read_only().channels().len(), 2);
	}

	#[test]
	fn prunes_after_update() {
 // this is the timestamp encoded in the binary data of valid_input below
 let logger = TestLogger::new();

 let latest_nonpruning_time = VALID_BINARY_TIMESTAMP + 60 * 60 * 24 * 7;

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 }

 {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_nonpruning_time + 1));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }
	}

	#[test]
	fn timestamp_edge_cases_are_handled_correctly() {
 // this is the timestamp encoded in the binary data of valid_input below
Expand All@@ -569,7 +612,7 @@ mod tests {
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(latest_succeeding_time));
 assert!(update_result.is_ok());
 assert_eq!(network_graph.read_only().channels().len(), 2);
 assert_eq!(network_graph.read_only().channels().len(), 0);
 }

 {
Expand All@@ -591,6 +634,7 @@ mod tests {
	}

	#[test]
	#[cfg(feature = "std")]
	pub fn update_fails_with_unknown_version() {
 let unknown_version_input = vec![
 76, 68, 75, 2, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
Expand Down