added already connected filter

ssvlabs · Dec 8, 2024 · ff03e04 · ff03e04
1 parent 6fbfe8b
commit ff03e04
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/network/discovery/dv5_filters.go b/network/discovery/dv5_filters.go
@@ -49,6 +49,16 @@ func (dvs *DiscV5Service) ssvNodeFilter(logger *zap.Logger) func(node *enode.Nod
 	}
 }
 
+func (dvs *DiscV5Service) alreadyConnectedFilter() func(node *enode.Node) bool {
+	return func(node *enode.Node) bool {
+		pid, err := PeerID(node)
+		if err != nil {
+			return false
+		}
+		return dvs.conns.Connectedness(pid) != libp2pnetwork.Connected
+	}
+}
+
 func (dvs *DiscV5Service) recentlyTrimmedFilter() func(node *enode.Node) bool {
 	return func(node *enode.Node) bool {
 		pid, err := PeerID(node)

diff --git a/network/discovery/dv5_routing.go b/network/discovery/dv5_routing.go
@@ -56,7 +56,7 @@ func (dvs *DiscV5Service) FindPeers(ctx context.Context, ns string, opt ...disco
 
 	dvs.discover(ctx, logger, func(e PeerEvent) {
 		cn <- e.AddrInfo
-	}, time.Millisecond, dvs.ssvNodeFilter(logger), dvs.badNodeFilter(logger), dvs.subnetFilter(subnet), dvs.recentlyTrimmedFilter())
+	}, time.Millisecond, dvs.ssvNodeFilter(logger), dvs.badNodeFilter(logger), dvs.subnetFilter(subnet), dvs.alreadyConnectedFilter(), dvs.recentlyTrimmedFilter())
 
 	return cn, nil
 }
diff --git a/network/discovery/dv5_service.go b/network/discovery/dv5_service.go
@@ -158,7 +158,7 @@ func (dvs *DiscV5Service) Bootstrap(logger *zap.Logger, handler HandleNewPeer) e
 			return
 		}
 		handler(e)
-	}, defaultDiscoveryInterval, dvs.ssvNodeFilter(logger), dvs.sharedSubnetsFilter(1), dvs.badNodeFilter(logger), dvs.recentlyTrimmedFilter())
+	}, defaultDiscoveryInterval, dvs.ssvNodeFilter(logger), dvs.sharedSubnetsFilter(1), dvs.badNodeFilter(logger), dvs.alreadyConnectedFilter(), dvs.recentlyTrimmedFilter())
 
 	return nil
 }