Merge pull request #1368 from TheBlueMatt/2022-03-fix-post-start-sync
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 22 Mar 2022 19:23:51 +0000 (19:23 +0000)
committerGitHub <noreply@github.com>
Tue, 22 Mar 2022 19:23:51 +0000 (19:23 +0000)
Send a gossip_timestamp_filter on connect to enable gossip sync

1  2 
lightning/src/ln/channelmanager.rs

index 10404195c955325ff33e6e9e2b07be87c2e51c8a,3214bd4deb9403e35a5b3d898c7db4b452ad788f..bf01ee1953cfcc37b8caacd1836199d1b47cd175
@@@ -5505,12 -5505,6 +5505,12 @@@ wher
                let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
                self.do_chain_event(Some(height), |channel| channel.transactions_confirmed(&block_hash, height, txdata, self.genesis_hash.clone(), self.get_our_node_id(), &self.logger)
                        .map(|(a, b)| (a, Vec::new(), b)));
 +
 +              let last_best_block_height = self.best_block.read().unwrap().height();
 +              if height < last_best_block_height {
 +                      let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 +                      self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), self.get_our_node_id(), &self.logger));
 +              }
        }
  
        fn best_block_updated(&self, header: &BlockHeader, height: u32) {
@@@ -5899,6 -5893,7 +5899,7 @@@ impl<Signer: Sign, M: Deref , T: Deref 
                                        &events::MessageSendEvent::SendChannelRangeQuery { .. } => false,
                                        &events::MessageSendEvent::SendShortIdsQuery { .. } => false,
                                        &events::MessageSendEvent::SendReplyChannelRange { .. } => false,
+                                       &events::MessageSendEvent::SendGossipTimestampFilter { .. } => false,
                                }
                        });
                }