graph/db/models: keep v2 onion addresses v3-only

Filter out non-v3 onion addresses when setting v2 node addresses,
since v2 gossip only supports v3 onion addresses. Also update the
SQL store to handle v2 node address filtering during persistence
and retrieval.

Author: ellemouton

graph/db/graph.go

@@ -641,6 +641,14 @@ func (c *ChannelGraph) HasV1Node(ctx context.Context,
 	return c.db.HasV1Node(ctx, nodePub)
 }
 
+// ForEachNode iterates through all nodes in the graph across all gossip
+// versions, yielding each unique node exactly once.
+func (c *ChannelGraph) ForEachNode(ctx context.Context,
+	cb func(*models.Node) error, reset func()) error {
+
+	return c.db.ForEachNode(ctx, cb, reset)
+}
+
 // ForEachChannel iterates through all channel edges stored within the graph
 // across all gossip versions.
 func (c *ChannelGraph) ForEachChannel(ctx context.Context,
@@ -907,7 +915,7 @@ func (c *VersionedGraph) FilterKnownChanIDs(ctx context.Context,
 		// alive, and we let it be added to the set of IDs to query
 		// our peer for.
 		err := c.db.MarkEdgeLive(
-			ctx, info.Version,
+			ctx, c.v,
 			info.ShortChannelID.ToUint64(),
 		)
 		// Since there is a chance that the edge could have been

graph/db/models/node.go

@@ -308,7 +308,10 @@ func (n *Node) toNodeAnnouncement2(signed bool) (*lnwire.NodeAnnouncement2,
 			}
 
 		case *tor.OnionAddr:
-			torV3 = append(torV3, a)
+			// Only v3 onion addresses are supported in gossip v2.
+			if len(a.OnionService) == tor.V3Len {
+				torV3 = append(torV3, a)
+			}
 
 		case *lnwire.DNSAddress:
 			nodeAnn.DNSHostName = tlv.SomeRecordT(

graph/db/models/node_test.go

@@ -174,7 +174,7 @@ func TestNodeAnnouncementV2AddressCategorization(t *testing.T) {
 	ipv4Addr := &net.TCPAddr{IP: net.ParseIP("1.2.3.4").To4(), Port: 9735}
 	ipv6Addr := &net.TCPAddr{IP: net.ParseIP("::1"), Port: 9736}
 	torAddr := &tor.OnionAddr{
-		OnionService: "abcdefghijklmnopqrstuvwxyz234567aaaa",
+		OnionService: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.onion",
 		Port:         9737,
 	}
 	dnsAddr := &lnwire.DNSAddress{Hostname: "example.com", Port: 9738}

graph/db/sql_store.go

@@ -1622,7 +1622,7 @@ func (s *SQLStore) ForEachNodeCached(ctx context.Context,
 			// page.
 			allChannels, err := db.ListChannelsForNodeIDs(
 				ctx, sqlc.ListChannelsForNodeIDsParams{
-					Version:  int16(lnwire.GossipVersion1),
+					Version:  int16(v),
 					Node1Ids: nodeIDs,
 					Node2Ids: nodeIDs,
 				},
@@ -3902,7 +3902,21 @@ func (s *sqlNodeTraverser) FetchNodeFeatures(ctx context.Context,
 	nodePub route.Vertex) (
 	*lnwire.FeatureVector, error) {
 
-	return fetchNodeFeatures(ctx, s.db, lnwire.GossipVersion1, nodePub)
+	// Try v2 first, fall back to v1 if the v2 features are empty.
+	for _, v := range []lnwire.GossipVersion{gossipV2, gossipV1} {
+		features, err := fetchNodeFeatures(
+			ctx, s.db, v, nodePub,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		if !features.IsEmpty() {
+			return features, nil
+		}
+	}
+
+	return lnwire.EmptyFeatureVector(), nil
 }
 
 // forEachNodeDirectedChannel iterates through all channels of a given