add ssv enr key

ssvlabs · Jun 2, 2024 · 5e4fce5 · 5e4fce5
1 parent 1f622ca
commit 5e4fce5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/network/discovery/dv5_filters.go b/network/discovery/dv5_filters.go
@@ -2,6 +2,7 @@ package discovery
 
 import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/ethereum/go-ethereum/p2p/enr"
 	libp2pnetwork "github.com/libp2p/go-libp2p/core/network"
 	"github.com/ssvlabs/ssv/network/records"
 	"go.uber.org/zap"
@@ -34,6 +35,18 @@ func (dvs *DiscV5Service) badNodeFilter(logger *zap.Logger) func(node *enode.Nod
 	}
 }
 
+// badNodeFilter checks if the node was pruned or have a bad score
+func (dvs *DiscV5Service) ssvNodeFilter(logger *zap.Logger) func(node *enode.Node) bool {
+	return func(node *enode.Node) bool {
+		var isSSV *bool
+		if err := node.Record().Load(enr.WithEntry("ssv", isSSV)); err != nil {
+			logger.Warn("could not read ssv entry from node record", zap.Error(err))
+			return false
+		}
+		return isSSV != nil && *isSSV
+	}
+}
+
 // subnetFilter checks if the node has an interest in the given subnet
 func (dvs *DiscV5Service) subnetFilter(subnets ...uint64) func(node *enode.Node) bool {
 	return func(node *enode.Node) bool {

diff --git a/network/discovery/dv5_routing.go b/network/discovery/dv5_routing.go
@@ -52,7 +52,7 @@ func (dvs *DiscV5Service) FindPeers(ctx context.Context, ns string, opt ...disco
 
 	dvs.discover(ctx, func(e PeerEvent) {
 		cn <- e.AddrInfo
-	}, time.Millisecond, dvs.badNodeFilter(logger), dvs.subnetFilter(uint64(subnet)))
+	}, time.Millisecond, dvs.ssvNodeFilter(logger), dvs.badNodeFilter(logger), dvs.subnetFilter(uint64(subnet)))
 
 	return cn, nil
 }
diff --git a/network/discovery/dv5_service.go b/network/discovery/dv5_service.go
@@ -315,7 +315,7 @@ func (dvs *DiscV5Service) publishENR(logger *zap.Logger) {
 		}
 		metricPublishEnrPongs.Inc()
 		// logger.Debug("ping success", logging.TargetNodeEnr(e.Node))
-	}, time.Millisecond*100, dvs.badNodeFilter(logger))
+	}, time.Millisecond*100, dvs.ssvNodeFilter(logger), dvs.badNodeFilter(logger))
 }
 
 func (dvs *DiscV5Service) createLocalNode(logger *zap.Logger, discOpts *Options, ipAddr net.IP) (*enode.LocalNode, error) {