Skip to content

Add optional rapid sync timestamp field to NetworkGraph #1500

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.

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
Changes from all commits
Commits
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
28 changes: 26 additions & 2 deletions lightning/src/routing/network_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ impl Readable for NodeId {

/// Represents the network as nodes and channels between them
pub struct NetworkGraph {
/// The unix timestamp in UTC provided by the most recent rapid gossip sync
/// It will be set by the rapid sync process after every sync completion
pub last_rapid_gossip_sync_timestamp: Option<u32>,
genesis_hash: BlockHash,
// Lock order: channels -> nodes
channels: RwLock<BTreeMap<u64, ChannelInfo>>,
Expand All @@ -137,6 +140,7 @@ impl Clone for NetworkGraph {
genesis_hash: self.genesis_hash.clone(),
channels: RwLock::new(channels.clone()),
nodes: RwLock::new(nodes.clone()),
last_rapid_gossip_sync_timestamp: self.last_rapid_gossip_sync_timestamp.clone(),
}
}
}
Expand Down Expand Up @@ -990,7 +994,9 @@ impl Writeable for NetworkGraph {
node_info.write(writer)?;
}

write_tlv_fields!(writer, {});
write_tlv_fields!(writer, {
(1, self.last_rapid_gossip_sync_timestamp, option),
});
Ok(())
}
}
Expand All @@ -1014,12 +1020,17 @@ impl Readable for NetworkGraph {
let node_info = Readable::read(reader)?;
nodes.insert(node_id, node_info);
}
read_tlv_fields!(reader, {});

let mut last_rapid_gossip_sync_timestamp: Option<u32> = None;
read_tlv_fields!(reader, {
(1, last_rapid_gossip_sync_timestamp, option),
});

Ok(NetworkGraph {
genesis_hash,
channels: RwLock::new(channels),
nodes: RwLock::new(nodes),
last_rapid_gossip_sync_timestamp,
})
}
}
Expand Down Expand Up @@ -1053,6 +1064,7 @@ impl NetworkGraph {
genesis_hash,
channels: RwLock::new(BTreeMap::new()),
nodes: RwLock::new(BTreeMap::new()),
last_rapid_gossip_sync_timestamp: None,
}
}

Expand Down Expand Up @@ -2359,6 +2371,18 @@ mod tests {
assert!(<NetworkGraph>::read(&mut io::Cursor::new(&w.0)).unwrap() == network_graph);
}

#[test]
fn network_graph_tlv_serialization() {
let mut network_graph = create_network_graph();
network_graph.last_rapid_gossip_sync_timestamp.replace(42);

let mut w = test_utils::TestVecWriter(Vec::new());
network_graph.write(&mut w).unwrap();
let reassembled_network_graph: NetworkGraph = Readable::read(&mut io::Cursor::new(&w.0)).unwrap();
assert!(reassembled_network_graph == network_graph);
assert_eq!(reassembled_network_graph.last_rapid_gossip_sync_timestamp.unwrap(), 42);
}

#[test]
#[cfg(feature = "std")]
fn calling_sync_routing_table() {
Expand Down