Skip to content

Commit 8be3dec

Browse files
committed
Always use chain hash based on config.
1 parent 9a3b42d commit 8be3dec

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
@@ -2,10 +2,10 @@ use std::cmp::max;
22
use std::collections::HashMap;
33

44
use bitcoin::BlockHash;
5-
use bitcoin::hashes::Hash;
65
use lightning::ln::msgs::{UnsignedChannelAnnouncement, UnsignedChannelUpdate};
76
use lightning::util::ser::{BigSize, Writeable};
87

8+
use crate::config;
99
use crate::lookup::{DeltaSet, DirectedUpdateDelta};
1010

1111
pub(super) struct SerializationSet {
@@ -103,16 +103,15 @@ struct FullUpdateValueHistograms {
103103
}
104104

105105
pub(super) fn serialize_delta_set(delta_set: DeltaSet, last_sync_timestamp: u32) -> SerializationSet {
106+
let chain_hash = bitcoin::blockdata::constants::genesis_block(config::network()).block_hash();
106107
let mut serialization_set = SerializationSet {
107108
announcements: vec![],
108109
updates: vec![],
109110
full_update_defaults: Default::default(),
110-
chain_hash: BlockHash::all_zeros(),
111+
chain_hash,
111112
latest_seen: 0,
112113
};
113114

114-
let mut chain_hash_set = false;
115-
116115
let mut full_update_histograms = FullUpdateValueHistograms {
117116
cltv_expiry_delta: Default::default(),
118117
htlc_minimum_msat: Default::default(),
@@ -133,11 +132,6 @@ pub(super) fn serialize_delta_set(delta_set: DeltaSet, last_sync_timestamp: u32)
133132

134133
// any announcement chain hash is gonna be the same value. Just set it from the first one.
135134
let channel_announcement_delta = channel_delta.announcement.as_ref().unwrap();
136-
if !chain_hash_set {
137-
chain_hash_set = true;
138-
serialization_set.chain_hash = channel_announcement_delta.announcement.chain_hash.clone();
139-
}
140-
141135
let current_announcement_seen = channel_announcement_delta.seen;
142136
let is_new_announcement = current_announcement_seen >= last_sync_timestamp;
143137
let is_newly_included_announcement = if let Some(first_update_seen) = channel_delta.first_bidirectional_updates_seen {

0 commit comments

Comments
 (0)