localchans: bugfix so that we always use the correct chanID

lightningnetwork · Jan 14, 2025 · e008190 · e008190
1 parent a388c1f
commit e008190
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/routing/localchans/manager.go b/routing/localchans/manager.go
@@ -311,8 +311,16 @@ func (r *Manager) createEdge(channel *channeldb.OpenChannel,
 			err)
 	}
 
+	// We need to make sure we use the real scid for public confirmed
+	// zero-conf channels.
+	shortChanID := channel.ShortChanID()
+	isPublic := channel.ChannelFlags&lnwire.FFAnnounceChannel != 0
+	if isPublic && channel.IsZeroConf() && channel.ZeroConfConfirmed() {
+		shortChanID = channel.ZeroConfRealScid()
+	}
+
 	info := &models.ChannelEdgeInfo{
-		ChannelID:    channel.ShortChanID().ToUint64(),
+		ChannelID:    shortChanID.ToUint64(),
 		ChainHash:    channel.ChainHash,
 		Features:     featureBuf.Bytes(),
 		Capacity:     channel.Capacity,
@@ -328,7 +336,7 @@ func (r *Manager) createEdge(channel *channeldb.OpenChannel,
 	// be updated with the new values in the call to processChan below.
 	timeLockDelta := uint16(r.DefaultRoutingPolicy.TimeLockDelta)
 	edge := &models.ChannelEdgePolicy{
-		ChannelID:                 channel.ShortChanID().ToUint64(),
+		ChannelID:                 shortChanID.ToUint64(),
 		LastUpdate:                timestamp,
 		TimeLockDelta:             timeLockDelta,
 		ChannelFlags:              channelFlags,