mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 06:35:07 +01:00
Code Issues Projects Releases Wiki Activity

discovery/gossiper: extract adding nodeAnnouncement into method

Browse source
This commit is contained in:
Johan T. Halseth 2019-09-10 14:37:16 +02:00
parent 35027e52fc
commit 3d8f194670
No known key found for this signature in database
GPG key ID: 15BAADA29DA20D26
1 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
discovery/gossiper.go
View file

@ -1454,6 +1454,33 @@ func (d *AuthenticatedGossiper) processRejectedEdge(
return announcements, nil return announcements, nil
} }
// addNode processes the given node announcement, and adds it to our channel
// graph.
func (d *AuthenticatedGossiper) addNode(msg *lnwire.NodeAnnouncement) error {
if err := routing.ValidateNodeAnn(msg); err != nil {
return fmt.Errorf("unable to validate node announcement: %v",
err)
}
timestamp := time.Unix(int64(msg.Timestamp), 0)
features := lnwire.NewFeatureVector(
msg.Features, lnwire.GlobalFeatures,
)
node := &channeldb.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.Router.AddNode(node)
}
// processNetworkAnnouncement processes a new network relate authenticated // processNetworkAnnouncement processes a new network relate authenticated
// channel or node announcement or announcements proofs. If the announcement // channel or node announcement or announcements proofs. If the announcement
// didn't affect the internal state due to either being out of date, invalid, // didn't affect the internal state due to either being out of date, invalid,
@ -1487,30 +1514,7 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement(
return nil return nil
} }
if err := routing.ValidateNodeAnn(msg); err != nil { if err := d.addNode(msg); err != nil {
err := fmt.Errorf("unable to validate "+
"node announcement: %v", err)
log.Error(err)
nMsg.err <- err
return nil
}
features := lnwire.NewFeatureVector(
msg.Features, lnwire.GlobalFeatures,
)
node := &channeldb.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,
}
if err := d.cfg.Router.AddNode(node); err != nil {
if routing.IsError(err, routing.ErrOutdated, if routing.IsError(err, routing.ErrOutdated,
routing.ErrIgnored) { routing.ErrIgnored) {
@ -1526,10 +1530,10 @@ func (d *AuthenticatedGossiper) processNetworkAnnouncement(
// In order to ensure we don't leak unadvertised nodes, we'll // In order to ensure we don't leak unadvertised nodes, we'll
// make a quick check to ensure this node intends to publicly // make a quick check to ensure this node intends to publicly
// advertise itself to the network. // advertise itself to the network.
isPublic, err := d.cfg.Router.IsPublicNode(node.PubKeyBytes) isPublic, err := d.cfg.Router.IsPublicNode(msg.NodeID)
if err != nil { if err != nil {
log.Errorf("Unable to determine if node %x is "+ log.Errorf("Unable to determine if node %x is "+
"advertised: %v", node.PubKeyBytes, err) "advertised: %v", msg.NodeID, err)
nMsg.err <- err nMsg.err <- err
return nil return nil
} }