Skip to content

Commit 620d96c

Browse files
authored
fix: don't limit peer exchange to dns-discovered peers (#6941)
1 parent a8589ec commit 620d96c

File tree

1 file changed

+9
-26
lines changed

1 file changed

+9
-26
lines changed

messaging/waku/gowaku.go

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -626,32 +626,15 @@ func (w *Waku) runPeerExchangeLoop() {
626626
w.logger.Debug("Peer exchange loop stopped")
627627
return
628628
case <-ticker.C:
629-
w.logger.Info("Running peer exchange loop")
630-
631-
// We select only the nodes discovered via DNS Discovery that support peer exchange
632-
// We assume that those peers are running peer exchange according to infra config,
633-
// If not, the peer selection process in go-waku will filter them out anyway
634-
w.dnsAddressCacheLock.RLock()
635-
var peers peer.IDSlice
636-
for _, record := range w.dnsAddressCache {
637-
for _, discoveredNode := range record {
638-
if len(discoveredNode.PeerInfo.Addrs) == 0 {
639-
continue
640-
}
641-
// Attempt to connect to the peers.
642-
// Peers will be added to the libp2p peer store thanks to identify
643-
go w.connect(discoveredNode.PeerInfo, discoveredNode.ENR, wps.DNSDiscovery)
644-
peers = append(peers, discoveredNode.PeerID)
645-
}
646-
}
647-
w.dnsAddressCacheLock.RUnlock()
648-
649-
if len(peers) != 0 {
650-
err := w.node.PeerExchange().Request(w.ctx, w.cfg.DiscoveryLimit, peer_exchange.WithAutomaticPeerSelection(peers...),
651-
peer_exchange.FilterByShard(int(w.defaultShardInfo.ClusterID), int(w.defaultShardInfo.ShardIDs[0])))
652-
if err != nil {
653-
w.logger.Error("couldnt request peers via peer exchange", zap.Error(err))
654-
}
629+
w.logger.Debug("Running peer exchange loop")
630+
err := w.node.PeerExchange().Request(
631+
w.ctx,
632+
w.cfg.DiscoveryLimit,
633+
peer_exchange.WithAutomaticPeerSelection(),
634+
peer_exchange.FilterByShard(int(w.defaultShardInfo.ClusterID), int(w.defaultShardInfo.ShardIDs[0])),
635+
)
636+
if err != nil {
637+
w.logger.Error("could not request peers via peer exchange", zap.Error(err))
655638
}
656639
}
657640
}

0 commit comments

Comments
 (0)