use std::cmp::max;
use std::collections::HashMap;
+use std::time::{SystemTime, UNIX_EPOCH};
-use bitcoin::BlockHash;
-use bitcoin::hashes::Hash;
+use bitcoin::Network;
+use bitcoin::blockdata::constants::ChainHash;
use lightning::ln::msgs::{UnsignedChannelAnnouncement, UnsignedChannelUpdate};
use lightning::util::ser::{BigSize, Writeable};
+use crate::config;
use crate::lookup::{DeltaSet, DirectedUpdateDelta};
pub(super) updates: Vec<UpdateSerialization>,
pub(super) full_update_defaults: DefaultUpdateValues,
pub(super) latest_seen: u32,
- pub(super) chain_hash: BlockHash,
+ pub(super) chain_hash: ChainHash,
}
pub(super) struct DefaultUpdateValues {
announcements: vec![],
updates: vec![],
full_update_defaults: Default::default(),
- chain_hash: BlockHash::all_zeros(),
+ chain_hash: ChainHash::using_genesis_block(Network::Bitcoin),
latest_seen: 0,
};
*full_update_histograms.htlc_maximum_msat.entry(full_update.htlc_maximum_msat).or_insert(0) += 1;
};
+ // if the previous seen update happened more than 6 days ago, the client may have pruned it, and an incremental update wouldn't work
+ let non_incremental_previous_update_threshold_timestamp = SystemTime::now().checked_sub(config::CHANNEL_REMINDER_AGE).unwrap().duration_since(UNIX_EPOCH).unwrap().as_secs() as u32;
+
for (scid, channel_delta) in delta_set.into_iter() {
// any announcement chain hash is gonna be the same value. Just set it from the first one.
let channel_announcement_delta = channel_delta.announcement.as_ref().unwrap();
if !chain_hash_set {
chain_hash_set = true;
- serialization_set.chain_hash = channel_announcement_delta.announcement.chain_hash.clone();
+ serialization_set.chain_hash = channel_announcement_delta.announcement.chain_hash;
}
let current_announcement_seen = channel_announcement_delta.seen;
// announcements and latest updates
serialization_set.latest_seen = max(serialization_set.latest_seen, latest_update_delta.seen);
- if updates.last_update_before_seen.is_some() {
+ if let Some(update_delta) = updates.last_update_before_seen {
let mutated_properties = updates.mutated_properties;
- if mutated_properties.len() == 5 || send_announcement {
+ if send_announcement || mutated_properties.len() == 5 || update_delta.seen <= non_incremental_previous_update_threshold_timestamp {
// all five values have changed, it makes more sense to just
// serialize the update as a full update instead of as a change
// this way, the default values can be computed more efficiently
record_full_update_in_histograms(&latest_update);
serialization_set.updates.push(UpdateSerialization::Full(latest_update));
}
+ } else if is_newly_included_announcement {
+ if let Some(unannounced_update) = updates.last_update_before_seen {
+ serialization_set.updates.push(UpdateSerialization::Full(unannounced_update.update));
+ }
} else if let Some(flags) = updates.serialization_update_flags {
serialization_set.updates.push(UpdateSerialization::Reminder(scid, flags));
}