discovery: update UpdatesInHorizon

Author: ellemouton

discovery/chan_series.go

@@ -30,8 +30,8 @@ type ChannelGraphTimeSeries interface {
 	// update timestamp between the start time and end time. We'll use this
 	// to catch up a remote node to the set of channel updates that they
 	// may have missed out on within the target chain.
-	UpdatesInHorizon(chain chainhash.Hash,
-		startTime time.Time, endTime time.Time) ([]lnwire.Message, error)
+	UpdatesInHorizon(startTime time.Time, endTime time.Time, startBlock,
+		endBlock uint32) ([]lnwire.Message, error)
 
 	// FilterKnownChanIDs takes a target chain, and a set of channel ID's,
 	// and returns a filtered set of chan ID's. This filtered set of chan
@@ -105,15 +105,15 @@ func (c *ChanSeries) HighestChanID(chain chainhash.Hash) (*lnwire.ShortChannelID
 // within the target chain.
 //
 // NOTE: This is part of the ChannelGraphTimeSeries interface.
-func (c *ChanSeries) UpdatesInHorizon(chain chainhash.Hash,
-	startTime time.Time, endTime time.Time) ([]lnwire.Message, error) {
+func (c *ChanSeries) UpdatesInHorizon(startTime, endTime time.Time, startBlock,
+	endBlock uint32) ([]lnwire.Message, error) {
 
 	var updates []lnwire.Message
 
 	// First, we'll query for all the set of channels that have an update
 	// that falls within the specified horizon.
 	chansInHorizon, err := c.graph.ChanUpdatesInHorizon(
-		startTime, endTime, 0, 0,
+		startTime, endTime, startBlock, endBlock,
 	)
 	if err != nil {
 		return nil, err

discovery/syncer.go

@@ -1288,6 +1288,13 @@ func (g *GossipSyncer) ApplyGossipFilter(filter *lnwire.GossipTimestampRange) er
 		time.Duration(g.remoteUpdateHorizon.TimestampRange) * time.Second,
 	)
 
+	var (
+		startBlock = tlv.ZeroRecordT[tlv.TlvType2, uint32]()
+		endBlock   = tlv.ZeroRecordT[tlv.TlvType4, uint32]()
+	)
+	startBlock = g.remoteUpdateHorizon.FirstBlockHeight.UnwrapOr(startBlock)
+	endBlock = g.remoteUpdateHorizon.BlockRange.UnwrapOr(endBlock)
+
 	g.Unlock()
 
 	// If requested, don't reply with historical gossip data when the remote
@@ -1299,7 +1306,7 @@ func (g *GossipSyncer) ApplyGossipFilter(filter *lnwire.GossipTimestampRange) er
 	// Now that the remote peer has applied their filter, we'll query the
 	// database for all the messages that are beyond this filter.
 	newUpdatestoSend, err := g.cfg.channelSeries.UpdatesInHorizon(
-		g.cfg.chainHash, startTime, endTime,
+		startTime, endTime, startBlock.Val, endBlock.Val,
 	)
 	if err != nil {
 		return err

discovery/syncer_test.go

@@ -28,10 +28,12 @@ var (
 )
 
 type horizonQuery struct {
-	chain chainhash.Hash
-	start time.Time
-	end   time.Time
+	start      time.Time
+	end        time.Time
+	startBlock uint32
+	endBlock   uint32
 }
+
 type filterRangeReq struct {
 	startHeight, endHeight uint32
 }
@@ -81,11 +83,12 @@ func newMockChannelGraphTimeSeries(
 func (m *mockChannelGraphTimeSeries) HighestChanID(chain chainhash.Hash) (*lnwire.ShortChannelID, error) {
 	return &m.highestID, nil
 }
-func (m *mockChannelGraphTimeSeries) UpdatesInHorizon(chain chainhash.Hash,
-	startTime time.Time, endTime time.Time) ([]lnwire.Message, error) {
+func (m *mockChannelGraphTimeSeries) UpdatesInHorizon(startTime time.Time,
+	endTime time.Time, startBlock, endBlock uint32) ([]lnwire.Message,
+	error) {
 
 	m.horizonReq <- horizonQuery{
-		chain, startTime, endTime,
+		startTime, endTime, startBlock, endBlock,
 	}
 
 	return <-m.horizonResp, nil