Merge pull request #9474 from ellemouton/nodeAnnConversion

graph/db: correctly handle de(ser)ialisation of `models.LightningNode` opaque addresses

discovery/gossiper.go

@@ -1982,21 +1982,7 @@ func (d *AuthenticatedGossiper) addNode(msg *lnwire.NodeAnnouncement,
 			err)
 	}
 
-	timestamp := time.Unix(int64(msg.Timestamp), 0)
+	return d.cfg.Graph.AddNode(models.NodeFromWireAnnouncement(msg), op...)
-	features := lnwire.NewFeatureVector(msg.Features, lnwire.Features)
-	node := &models.LightningNode{
-		HaveNodeAnnouncement: true,
-		LastUpdate:           timestamp,
-		Addresses:            msg.Addresses,
-		PubKeyBytes:          msg.NodeID,
-		Alias:                msg.Alias.String(),
-		AuthSigBytes:         msg.Signature.ToSignatureBytes(),
-		Features:             features,
-		Color:                msg.RGBColor,
-		ExtraOpaqueData:      msg.ExtraOpaqueData,
-	}
-
-	return d.cfg.Graph.AddNode(node, op...)
 }
 
 // isPremature decides whether a given network message has a block height+delta

docs/release-notes/release-notes-0.19.0.md

@@ -64,6 +64,10 @@
 * [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/9322) that caused
     estimateroutefee to ignore the default payment timeout.
 
+* [Fix a bug](https://github.com/lightningnetwork/lnd/pull/9474) where LND would
+  fail to persist (and hence, propagate) node announcements containing address 
+  types (such as a DNS hostname) unknown to LND.
+
 # New Features
 
 * [Support](https://github.com/lightningnetwork/lnd/pull/8390) for 

graph/db/addr.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net"
 
+	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/tor"
 )
 
@@ -26,6 +27,10 @@ const (
 
 	// v3OnionAddr denotes a version 3 Tor (prop224) onion service address.
 	v3OnionAddr addressType = 3
+
+	// opaqueAddrs denotes an address (or a set of addresses) that LND was
+	// not able to parse since LND is not yet aware of the address type.
+	opaqueAddrs addressType = 4
 )
 
 // encodeTCPAddr serializes a TCP address into its compact raw bytes
@@ -121,6 +126,27 @@ func encodeOnionAddr(w io.Writer, addr *tor.OnionAddr) error {
 	return nil
 }
 
+// encodeOpaqueAddrs serializes the lnwire.OpaqueAddrs type to a raw set of
+// bytes that we will persist.
+func encodeOpaqueAddrs(w io.Writer, addr *lnwire.OpaqueAddrs) error {
+	// Write the type byte.
+	if _, err := w.Write([]byte{byte(opaqueAddrs)}); err != nil {
+		return err
+	}
+
+	// Write the length of the payload.
+	var l [2]byte
+	binary.BigEndian.PutUint16(l[:], uint16(len(addr.Payload)))
+	if _, err := w.Write(l[:]); err != nil {
+		return err
+	}
+
+	// Write the payload.
+	_, err := w.Write(addr.Payload)
+
+	return err
+}
+
 // DeserializeAddr reads the serialized raw representation of an address and
 // deserializes it into the actual address. This allows us to avoid address
 // resolution within the channeldb package.
@@ -147,6 +173,7 @@ func DeserializeAddr(r io.Reader) (net.Addr, error) {
 			IP:   net.IP(ip[:]),
 			Port: int(binary.BigEndian.Uint16(port[:])),
 		}
+
 	case tcp6Addr:
 		var ip [16]byte
 		if _, err := r.Read(ip[:]); err != nil {
@@ -162,6 +189,7 @@ func DeserializeAddr(r io.Reader) (net.Addr, error) {
 			IP:   net.IP(ip[:]),
 			Port: int(binary.BigEndian.Uint16(port[:])),
 		}
+
 	case v2OnionAddr:
 		var h [tor.V2DecodedLen]byte
 		if _, err := r.Read(h[:]); err != nil {
@@ -181,6 +209,7 @@ func DeserializeAddr(r io.Reader) (net.Addr, error) {
 			OnionService: onionService,
 			Port:         port,
 		}
+
 	case v3OnionAddr:
 		var h [tor.V3DecodedLen]byte
 		if _, err := r.Read(h[:]); err != nil {
@@ -200,6 +229,24 @@ func DeserializeAddr(r io.Reader) (net.Addr, error) {
 			OnionService: onionService,
 			Port:         port,
 		}
+
+	case opaqueAddrs:
+		// Read the length of the payload.
+		var l [2]byte
+		if _, err := r.Read(l[:]); err != nil {
+			return nil, err
+		}
+
+		// Read the payload.
+		payload := make([]byte, binary.BigEndian.Uint16(l[:]))
+		if _, err := r.Read(payload); err != nil {
+			return nil, err
+		}
+
+		address = &lnwire.OpaqueAddrs{
+			Payload: payload,
+		}
+
 	default:
 		return nil, ErrUnknownAddressType
 	}
@@ -215,6 +262,8 @@ func SerializeAddr(w io.Writer, address net.Addr) error {
 		return encodeTCPAddr(w, addr)
 	case *tor.OnionAddr:
 		return encodeOnionAddr(w, addr)
+	case *lnwire.OpaqueAddrs:
+		return encodeOpaqueAddrs(w, addr)
 	default:
 		return ErrUnknownAddressType
 	}

graph/db/graph_test.go

@@ -4063,3 +4063,56 @@ func TestClosedScid(t *testing.T) {
 	require.Nil(t, err)
 	require.True(t, exists)
 }
+
+// testNodeAnn is a serialized node announcement message which contains an
+// address type (6) that LND is not aware of.
+var testNodeAnn = "01012674c2e7ef68c73a086b7de2603f4ef1567358df84bb4edaa06c" +
+	"f2132965b14e2434faab04170f0089216accbd79188fa3d40dbb0438bd89782cae" +
+	"27cc656bf60007800088082a69a2625e7a2a024b9a1fa8e006f1e3937f65f66c40" +
+	"8e6da8e1ca728ea43222a7381df1cc449605024b9a424c554549524f4e2d76302e" +
+	"31312e307263332d362d67663963613934650000001d0180c7caa8260702240061" +
+	"80000000d0000000005cd2a001260706204c"
+
+// TestLightningNodePersistence takes a raw serialized node announcement
+// message, converts it to our internal models.LightningNode type, persists it
+// to disk, reads it again and converts it back to a wire message and asserts
+// that the two messages are equal.
+func TestLightningNodePersistence(t *testing.T) {
+	t.Parallel()
+
+	// Create a new test graph instance.
+	graph, err := MakeTestGraph(t)
+	require.NoError(t, err)
+
+	nodeAnnBytes, err := hex.DecodeString(testNodeAnn)
+	require.NoError(t, err)
+
+	// Use the raw serialized node announcement message create an
+	// lnwire.NodeAnnouncement instance.
+	msg, err := lnwire.ReadMessage(bytes.NewBuffer(nodeAnnBytes), 0)
+	require.NoError(t, err)
+	na, ok := msg.(*lnwire.NodeAnnouncement)
+	require.True(t, ok)
+
+	// Convert the wire message to our internal node representation.
+	node := models.NodeFromWireAnnouncement(na)
+
+	// Persist the node to disk.
+	err = graph.AddLightningNode(node)
+	require.NoError(t, err)
+
+	// Read the node from disk.
+	diskNode, err := graph.FetchLightningNode(node.PubKeyBytes)
+	require.NoError(t, err)
+
+	// Convert it back to a wire message.
+	wireMsg, err := diskNode.NodeAnnouncement(true)
+	require.NoError(t, err)
+
+	// Encode it and compare against the original.
+	var b bytes.Buffer
+	_, err = lnwire.WriteMessage(&b, wireMsg, 0)
+	require.NoError(t, err)
+
+	require.Equal(t, nodeAnnBytes, b.Bytes())
+}

graph/db/models/node.go

@@ -131,3 +131,22 @@ func (l *LightningNode) NodeAnnouncement(signed bool) (*lnwire.NodeAnnouncement,
 
 	return nodeAnn, nil
 }
+
+// NodeFromWireAnnouncement creates a LightningNode instance from an
+// lnwire.NodeAnnouncement message.
+func NodeFromWireAnnouncement(msg *lnwire.NodeAnnouncement) *LightningNode {
+	timestamp := time.Unix(int64(msg.Timestamp), 0)
+	features := lnwire.NewFeatureVector(msg.Features, lnwire.Features)
+
+	return &LightningNode{
+		HaveNodeAnnouncement: true,
+		LastUpdate:           timestamp,
+		Addresses:            msg.Addresses,
+		PubKeyBytes:          msg.NodeID,
+		Alias:                msg.Alias.String(),
+		AuthSigBytes:         msg.Signature.ToSignatureBytes(),
+		Features:             features,
+		Color:                msg.RGBColor,
+		ExtraOpaqueData:      msg.ExtraOpaqueData,
+	}
+}

lnwire/lnwire_test.go

@@ -356,8 +356,8 @@ func TestChanUpdateChanFlags(t *testing.T) {
 	}
 }
 
-// TestDecodeUnknownAddressType shows that an unknown address type is currently
+// TestDecodeUnknownAddressType shows that an unknown address type is correctly
-// incorrectly dealt with.
+// decoded and encoded.
 func TestDecodeUnknownAddressType(t *testing.T) {
 	// Add a normal, clearnet address.
 	tcpAddr := &net.TCPAddr{