Skip to content

Commit d926de5

Browse files
committed
Always use chain hash based on config.
1 parent 0ffee72 commit d926de5

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/serialization.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::collections::HashMap;
33
use std::time::{SystemTime, UNIX_EPOCH};
44

55
use bitcoin::BlockHash;
6-
use bitcoin::hashes::Hash;
76
use lightning::ln::msgs::{UnsignedChannelAnnouncement, UnsignedChannelUpdate};
87
use lightning::util::ser::{BigSize, Writeable};
98
use crate::config;
109

10+
use crate::config;
1111
use crate::lookup::{DeltaSet, DirectedUpdateDelta};
1212

1313
pub(super) struct SerializationSet {
@@ -105,16 +105,15 @@ struct FullUpdateValueHistograms {
105105
}
106106

107107
pub(super) fn serialize_delta_set(delta_set: DeltaSet, last_sync_timestamp: u32) -> SerializationSet {
108+
let chain_hash = bitcoin::blockdata::constants::genesis_block(config::network()).block_hash();
108109
let mut serialization_set = SerializationSet {
109110
announcements: vec![],
110111
updates: vec![],
111112
full_update_defaults: Default::default(),
112-
chain_hash: BlockHash::all_zeros(),
113+
chain_hash,
113114
latest_seen: 0,
114115
};
115116

116-
let mut chain_hash_set = false;
117-
118117
let mut full_update_histograms = FullUpdateValueHistograms {
119118
cltv_expiry_delta: Default::default(),
120119
htlc_minimum_msat: Default::default(),
@@ -138,11 +137,6 @@ pub(super) fn serialize_delta_set(delta_set: DeltaSet, last_sync_timestamp: u32)
138137

139138
// any announcement chain hash is gonna be the same value. Just set it from the first one.
140139
let channel_announcement_delta = channel_delta.announcement.as_ref().unwrap();
141-
if !chain_hash_set {
142-
chain_hash_set = true;
143-
serialization_set.chain_hash = channel_announcement_delta.announcement.chain_hash.clone();
144-
}
145-
146140
let current_announcement_seen = channel_announcement_delta.seen;
147141
let is_new_announcement = current_announcement_seen >= last_sync_timestamp;
148142
let is_newly_included_announcement = if let Some(first_update_seen) = channel_delta.first_bidirectional_updates_seen {

0 commit comments

Comments
 (0)