Skip to content

Do not fail to apply RGS updates for removed channels#2046

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
wpaulino merged 3 commits into from
Feb 28, 2023
Merged

Do not fail to apply RGS updates for removed channels #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8eecd1
Do not fail to apply RGS updates for removed channels
TheBlueMatt Feb 23, 2023
df20bcf
Make log macros more usable outside of the `lightning` crate
TheBlueMatt Feb 23, 2023
d2f5dc0
Add some basic logging to Rapid Gossip Sync processing
TheBlueMatt Feb 23, 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
2 changes: 1 addition & 1 deletion fuzz/src/process_network_graph.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
let logger = test_logger::TestLogger::new("".to_owned(), out);
let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let _ = rapid_sync.update_network_graph(data);
}

Expand Down
2 changes: 1 addition & 1 deletion lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
let params = ChainParameters { network, best_block };
let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down
12 changes: 7 additions & 5 deletions lightning-rapid-gossip-sync/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
network_graph: NG,
logger: L,
is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
/// Instantiate a new [`RapidGossipSync`] instance.
pub fn new(network_graph: NG) -> Self {
pub fn new(network_graph: NG, logger: L) -> Self {
Self {
network_graph,
logger,
is_initial_sync_complete: AtomicBool::new(false)
}
}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let start = std::time::Instant::now();
let sync_result = rapid_sync
.sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
let logger = TestLogger::new();
b.iter(|| {
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down
69 changes: 25 additions & 44 deletions lightning-rapid-gossip-sync/src/processing.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
// everything is fine, just a duplicate channel announcement
} else {
log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
return Err(lightning_error.into());
}
}
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
if (channel_flags & 0b_1000_0000) != 0 {
// incremental update, field flags will indicate mutated values
let read_only_network_graph = network_graph.read_only();
if let Some(channel) = read_only_network_graph
.channels()
.get(&short_channel_id) {

let directional_info = channel
.get_directional_info(channel_flags)
.ok_or(LightningError {
err: "Couldn't find previous directional data for update".to_owned(),
action: ErrorAction::IgnoreError,
})?;

if let Some(directional_info) =

@arik-soarik-soFeb 24, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?

read_only_network_graph.channels().get(&short_channel_id)
.and_then(|channel| channel.get_directional_info(channel_flags))
{
synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
synthetic_update.fee_base_msat = directional_info.fees.base_msat;
synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

} else {
log_trace!(self.logger,
"Skipping application of channel update for chan {} with flags {} as original data is missing.",
short_channel_id, channel_flags);
skip_update_for_unknown_channel = true;
}
};
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
match network_graph.update_channel_unsigned(&synthetic_update) {
Ok(_) => {},
Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
},
Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
Err(e) => return Err(e.into()),
}
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
0, 3, 232, 0, 0, 0,
];
let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph(&example_input[..]);
assert!(update_result.is_err());
if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
assert!(update_result.is_ok());
}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
assert!(update_result.is_err());
if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
assert_eq!(
lightning_error.err,
"Couldn't find previous directional data for update"
);
} else {
panic!("Unexpected update result: {:?}", update_result)
}
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
}

#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
if initialization_result.is_err() {
panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
68, 226, 0, 6, 11, 0, 1, 128,
];
let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
assert!(update_result.is_err());
if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
assert_eq!(
lightning_error.err,
"Couldn't find previous directional data for update"
);
} else {
panic!("Unexpected update result: {:?}", update_result)
}
rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
}

#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
if update_result.is_err() {
panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
// this is mostly for checking uint underflow issues before the fuzzer does
let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
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);
Expand All@@ -586,7 +567,7 @@ mod tests {
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
assert!(update_result.is_err());
if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

let logger = TestLogger::new();
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

assert!(update_result.is_err());
Expand Down
24 changes: 12 additions & 12 deletions lightning/src/util/macro_logger.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
($logger: expr, $lvl:expr, $($arg:tt)+) => (
match $lvl {
#[cfg(not(any(feature = "max_level_off")))]
$crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
$crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
$crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
$crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
$crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
$crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
$crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

#[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
_ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
($logger: expr, $($arg:tt)*) => (
log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
)
}
, '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" + '
Do not fail to apply RGS updates for removed channels by TheBlueMatt · Pull Request #2046 · lightningdevkit/rust-lightning · GitHub
Skip to content
Do not fail to apply RGS updates for removed channels#2046

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

, '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('^' + ".*" + '
Do not fail to apply RGS updates for removed channels by TheBlueMatt · Pull Request #2046 · lightningdevkit/rust-lightning · GitHub
Skip to content
Do not fail to apply RGS updates for removed channels#2046

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

, '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('^' + ".*" + '
Do not fail to apply RGS updates for removed channels by TheBlueMatt · Pull Request #2046 · lightningdevkit/rust-lightning · GitHub
Skip to content
Do not fail to apply RGS updates for removed channels#2046

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

, '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" + '
Do not fail to apply RGS updates for removed channels by TheBlueMatt · Pull Request #2046 · lightningdevkit/rust-lightning · GitHub
Skip to content
Do not fail to apply RGS updates for removed channels#2046

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

, '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('^' + ".*" + '
Do not fail to apply RGS updates for removed channels by TheBlueMatt · Pull Request #2046 · lightningdevkit/rust-lightning · GitHub
Skip to content
Do not fail to apply RGS updates for removed channels#2046

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

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

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}

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

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

wpaulino
merged 3 commits into

from

Feb 28, 2023
 Merged


Do not fail to apply RGS updates for removed channels
#2046
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b8eecd1

Do not fail to apply RGS updates for removed channels


TheBlueMatt Feb 23, 2023
df20bcf

Make log macros more usable outside of the `lightning` crate


TheBlueMatt Feb 23, 2023
d2f5dc0

Add some basic logging to Rapid Gossip Sync processing


TheBlueMatt Feb 23, 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


2 changes: 1 addition & 1 deletion
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ use crate::utils::test_logger;
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger = test_logger::TestLogger::new("".to_owned(), out);
	let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
	let rapid_sync = RapidGossipSync::new(&network_graph);
	let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
	let _ = rapid_sync.update_network_graph(data);
}

Expand Down

2 changes: 1 addition & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -953,7 +953,7 @@ mod tests {
 let params = ChainParameters { network, best_block };
 let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone()));
 let rapid_gossip_sync = Arc::new(RapidGossipSync::new(network_graph.clone(), logger.clone()));
 let msg_handler = MessageHandler { chan_handler: Arc::new(test_utils::TestChannelMessageHandler::new()), route_handler: Arc::new(test_utils::TestRoutingMessageHandler::new()), onion_message_handler: IgnoringMessageHandler{}};
 let peer_manager = Arc::new(PeerManager::new(msg_handler, 0, &seed, logger.clone(), IgnoringMessageHandler{}, keys_manager.clone()));
 let node = Node { node: manager, p2p_gossip_sync, rapid_gossip_sync, peer_manager, chain_monitor, persister, tx_broadcaster, network_graph, logger, best_block, scorer };
Expand Down

12 changes: 7 additions & 5 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
//! # let logger = FakeLogger {};
//!
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! 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);
//! ```
Expand DownExpand Up@@ -94,14 +94,16 @@ mod processing;
pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
where L::Target: Logger {
	network_graph: NG,
	logger: L,
	is_initial_sync_complete: AtomicBool
}

impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
	/// Instantiate a new [`RapidGossipSync`] instance.
	pub fn new(network_graph: NG) -> Self {
	pub fn new(network_graph: NG, logger: L) -> Self {
 Self {
 network_graph,
 logger,
 is_initial_sync_complete: AtomicBool::new(false)
 }
	}
Expand DownExpand Up@@ -228,7 +230,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);

 if sync_result.is_err() {
Expand DownExpand Up@@ -260,7 +262,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let start = std::time::Instant::now();
 let sync_result = rapid_sync
 .sync_network_graph_with_file_path("./res/full_graph.lngossip");
Expand DownExpand Up@@ -299,7 +301,7 @@ pub mod bench {
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);
Expand Down

69 changes: 25 additions & 44 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ use lightning::ln::msgs::{
};
use lightning::routing::gossip::NetworkGraph;
use lightning::util::logger::Logger;
use lightning::{log_warn, log_trace, log_given_level};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;

Expand DownExpand Up@@ -120,6 +121,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if let ErrorAction::IgnoreDuplicateGossip = lightning_error.action {
 // everything is fine, just a duplicate channel announcement
 } else {
 log_warn!(self.logger, "Failed to process channel announcement: {:?}", lightning_error);
 return Err(lightning_error.into());
 }
 }
Expand DownExpand Up@@ -169,24 +171,19 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 if (channel_flags & 0b_1000_0000) != 0 {
 // incremental update, field flags will indicate mutated values
 let read_only_network_graph = network_graph.read_only();
 if let Some(channel) = read_only_network_graph
 .channels()
 .get(&short_channel_id) {

 let directional_info = channel
 .get_directional_info(channel_flags)
 .ok_or(LightningError {
 err: "Couldn't find previous directional data for update".to_owned(),
 action: ErrorAction::IgnoreError,
 })?;

 if let Some(directional_info) =
@arik-soarik-soFeb 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

it's probably just me, but I think the right-hand-side of an if let expression shouldn't have 4 chained expressions, plus one nested one. Can we extract a variable or two?
 read_only_network_graph.channels().get(&short_channel_id)
 .and_then(|channel| channel.get_directional_info(channel_flags))
 {
 synthetic_update.cltv_expiry_delta = directional_info.cltv_expiry_delta;
 synthetic_update.htlc_minimum_msat = directional_info.htlc_minimum_msat;
 synthetic_update.htlc_maximum_msat = directional_info.htlc_maximum_msat;
 synthetic_update.fee_base_msat = directional_info.fees.base_msat;
 synthetic_update.fee_proportional_millionths = directional_info.fees.proportional_millionths;

 } else {
 log_trace!(self.logger,
 "Skipping application of channel update for chan {} with flags {} as original data is missing.",
 short_channel_id, channel_flags);
 skip_update_for_unknown_channel = true;
 }
 };
Expand DownExpand Up@@ -223,7 +220,9 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 match network_graph.update_channel_unsigned(&synthetic_update) {
 Ok(_) => {},
 Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(_), .. }) => {},
 Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
 log_given_level!(self.logger, level, "Failed to apply channel update: {:?}", err);
 },
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 Err(e) => return Err(e.into()),
 }
Expand DownExpand Up@@ -287,7 +286,7 @@ mod tests {
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 58, 85, 116, 216, 255, 2, 68, 226, 0, 6, 11, 0, 1, 24, 0,
 0, 3, 232, 0, 0, 0,
 ];
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&example_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::DecodeError(DecodeError::ShortRead)) = update_result {
Expand All@@ -312,7 +311,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&incremental_update_input[..]);
 assert!(update_result.is_ok());
	}
Expand DownExpand Up@@ -340,17 +339,8 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&announced_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 rapid_sync.update_network_graph(&announced_update_input[..]).unwrap();
	}

	#[test]
Expand All@@ -376,7 +366,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 if initialization_result.is_err() {
 panic!(
Expand DownExpand Up@@ -405,16 +395,7 @@ mod tests {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 8, 153, 192, 0, 2, 27, 0, 0, 136, 0, 0, 0, 221, 255, 2,
 68, 226, 0, 6, 11, 0, 1, 128,
 ];
 let update_result = rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]);
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
 assert_eq!(
 lightning_error.err,
 "Couldn't find previous directional data for update"
 );
 } else {
 panic!("Unexpected update result: {:?}", update_result)
 }
 rapid_sync.update_network_graph(&opposite_direction_incremental_update_input[..]).unwrap();
	}

	#[test]
Expand DownExpand Up@@ -442,7 +423,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand DownExpand Up@@ -501,7 +482,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let initialization_result = rapid_sync.update_network_graph(&initialization_input[..]);
 assert!(initialization_result.is_ok());

Expand All@@ -526,7 +507,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&VALID_RGS_BINARY);
 if update_result.is_err() {
 panic!("Unexpected update result: {:?}", update_result)
Expand DownExpand Up@@ -557,7 +538,7 @@ mod tests {

 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 // this is mostly for checking uint underflow issues before the fuzzer does
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(0));
 assert!(update_result.is_ok());
Expand All@@ -576,7 +557,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 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);
Expand All@@ -586,7 +567,7 @@ mod tests {
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph_no_std(&VALID_RGS_BINARY, Some(earliest_failing_time));
 assert!(update_result.is_err());
 if let Err(GraphSyncError::LightningError(lightning_error)) = update_result {
Expand DownExpand Up@@ -622,7 +603,7 @@ mod tests {

 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

 assert!(update_result.is_err());
Expand Down

24 changes: 12 additions & 12 deletions
lightning/src/util/macro_logger.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,17 @@ macro_rules! log_given_level {
	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 match $lvl {
 #[cfg(not(any(feature = "max_level_off")))]
 $crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
 $crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
 $crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
 $crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
 $crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
 $crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
 $crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),

 #[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 _ => {
Expand All@@ -191,46 +191,46 @@ macro_rules! log_given_level {
#[macro_export]
macro_rules! log_error {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
	)
}

/// Log at the `WARN` level.
#[macro_export]
macro_rules! log_warn {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
	)
}

/// Log at the `INFO` level.
#[macro_export]
macro_rules! log_info {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
	)
}

/// Log at the `DEBUG` level.
#[macro_export]
macro_rules! log_debug {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
	)
}

/// Log at the `TRACE` level.
#[macro_export]
macro_rules! log_trace {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
	)
}

/// Log at the `GOSSIP` level.
#[macro_export]
macro_rules! log_gossip {
	($logger: expr, $($arg:tt)*) => (
 log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
	)
}