status-im
/
go-waku
mirror of https://github.com/status-im/go-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: discV5 enr update

This commit is contained in:
Richard Ramos 2022-11-22 17:52:51 -04:00 committed by RichΛrd
parent 22404a0608
commit df4e182266
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
waku/v2/node/localnode.go
View File

@ -23,6 +23,16 @@ func (w *WakuNode) newLocalnode(priv *ecdsa.PrivateKey, wsAddr []ma.Multiaddr, i
return nil, err return nil, err
} }
localnode := enode.NewLocalNode(db, priv) localnode := enode.NewLocalNode(db, priv)
err = w.updateLocalNode(localnode, priv, wsAddr, ipAddr, udpPort, wakuFlags, advertiseAddr, log)
if err != nil {
return nil, err
}
return localnode, nil
}
func (w *WakuNode) updateLocalNode(localnode *enode.LocalNode, priv *ecdsa.PrivateKey, wsAddr []ma.Multiaddr, ipAddr *net.TCPAddr, udpPort int, wakuFlags utils.WakuEnrBitfield, advertiseAddr *net.IP, log *zap.Logger) error {
localnode.SetFallbackUDP(udpPort) localnode.SetFallbackUDP(udpPort)
localnode.Set(enr.WithEntry(utils.WakuENRField, wakuFlags)) localnode.Set(enr.WithEntry(utils.WakuENRField, wakuFlags))
localnode.SetFallbackIP(net.IP{127, 0, 0, 1}) localnode.SetFallbackIP(net.IP{127, 0, 0, 1})
@ -48,12 +58,12 @@ func (w *WakuNode) newLocalnode(priv *ecdsa.PrivateKey, wsAddr []ma.Multiaddr, i
for _, addr := range wsAddr { for _, addr := range wsAddr {
p2p, err := addr.ValueForProtocol(ma.P_P2P) p2p, err := addr.ValueForProtocol(ma.P_P2P)
if err != nil { if err != nil {
return nil, err return err
} }
p2pAddr, err := ma.NewMultiaddr("/p2p/" + p2p) p2pAddr, err := ma.NewMultiaddr("/p2p/" + p2p)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not create p2p addr: %w", err) return fmt.Errorf("could not create p2p addr: %w", err)
} }
maRaw := addr.Decapsulate(p2pAddr).Bytes() maRaw := addr.Decapsulate(p2pAddr).Bytes()
@ -68,7 +78,7 @@ func (w *WakuNode) newLocalnode(priv *ecdsa.PrivateKey, wsAddr []ma.Multiaddr, i
localnode.Set(enr.WithEntry(utils.MultiaddrENRField, fieldRaw)) localnode.Set(enr.WithEntry(utils.MultiaddrENRField, fieldRaw))
} }
return localnode, nil return nil
} }
func isPrivate(addr candidateAddr) bool { func isPrivate(addr candidateAddr) bool {
@ -220,12 +230,20 @@ func (w *WakuNode) setupENR(addrs []ma.Multiaddr) error {
// TODO: make this optional depending on DNS Disc being enabled // TODO: make this optional depending on DNS Disc being enabled
if w.opts.privKey != nil { if w.opts.privKey != nil {
localNode, err := w.newLocalnode(w.opts.privKey, wsAddresses, ipAddr, w.opts.udpPort, w.wakuFlag, w.opts.advertiseAddr, w.log) if w.localNode != nil {
if err != nil { err := w.updateLocalNode(w.localNode, w.opts.privKey, wsAddresses, ipAddr, w.opts.udpPort, w.wakuFlag, w.opts.advertiseAddr, w.log)
w.log.Error("obtaining ENR record from multiaddress", logging.MultiAddrs("multiaddr", extAddr), zap.Error(err)) if err != nil {
return err w.log.Error("obtaining ENR record from multiaddress", logging.MultiAddrs("multiaddr", extAddr), zap.Error(err))
return err
} else {
w.log.Info("enr record", logging.ENode("enr", w.localNode.Node()))
}
} else { } else {
if w.localNode == nil || w.localNode.Node().String() != localNode.Node().String() { localNode, err := w.newLocalnode(w.opts.privKey, wsAddresses, ipAddr, w.opts.udpPort, w.wakuFlag, w.opts.advertiseAddr, w.log)
if err != nil {
w.log.Error("obtaining ENR record from multiaddress", logging.MultiAddrs("multiaddr", extAddr), zap.Error(err))
return err
} else {
w.localNode = localNode w.localNode = localNode
w.log.Info("enr record", logging.ENode("enr", w.localNode.Node())) w.log.Info("enr record", logging.ENode("enr", w.localNode.Node()))
} }