don't pose as an eth2 node

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

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/network/discovery/enode.go b/network/discovery/enode.go
@@ -28,6 +28,7 @@ func createLocalNode(privKey *ecdsa.PrivateKey, storagePath string, ipAddr net.I
 	localNode.Set(enr.TCP(tcpPort))
 	localNode.SetFallbackIP(ipAddr)
 	localNode.SetFallbackUDP(udpPort)
+	localNode.Set(enr.WithEntry("ssv", true))
 
 	return localNode, nil
 }

diff --git a/utils/boot_node/node.go b/utils/boot_node/node.go
@@ -15,11 +15,9 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/prysm/v4/network"
 	"go.uber.org/zap"
 
-	"github.com/ssvlabs/ssv/beacon/goclient"
 	"github.com/ssvlabs/ssv/logging"
 	"github.com/ssvlabs/ssv/logging/fields"
 	"github.com/ssvlabs/ssv/networkconfig"
@@ -187,8 +185,6 @@ func (n *bootNode) createLocalNode(logger *zap.Logger, privKey *ecdsa.PrivateKey
 		logger.Info("Running with External IP", zap.String("external-ip", n.externalIP))
 	}
 
-	fVersion := n.network.ForkVersion()
-
 	// if *forkVersion != "" {
 	//	fVersion, err = hex.DecodeString(*forkVersion)
 	//	if err != nil {
@@ -198,7 +194,6 @@ func (n *bootNode) createLocalNode(logger *zap.Logger, privKey *ecdsa.PrivateKey
 	//		return nil, errors.Errorf("Invalid fork version size expected %d but got %d", 4, len(fVersion))
 	//	}
 	//}
-	genRoot := [32]byte{}
 	// if *genesisValidatorRoot != "" {
 	//	retRoot, err := hex.DecodeString(*genesisValidatorRoot)
 	//	if err != nil {
@@ -210,24 +205,8 @@ func (n *bootNode) createLocalNode(logger *zap.Logger, privKey *ecdsa.PrivateKey
 	//	genRoot = bytesutil.ToBytes32(retRoot)
 	//}
 
-	digest, err := goclient.ComputeForkDigest(fVersion, genRoot)
-	if err != nil {
-		return nil, errors.Wrap(err, "Could not compute fork digest")
-	}
-
-	forkID := &ENRForkID{
-		CurrentForkDigest: digest[:],
-		NextForkVersion:   fVersion[:],
-		NextForkEpoch:     goclient.FarFutureEpoch,
-	}
-	forkEntry, err := forkID.MarshalSSZ()
-	if err != nil {
-		return nil, errors.Wrap(err, "Could not marshal fork id")
-	}
-
 	localNode := enode.NewLocalNode(db, privKey)
-	localNode.Set(enr.WithEntry("eth2", forkEntry))
-	localNode.Set(enr.WithEntry("attnets", bitfield.NewBitvector64()))
+	localNode.Set(enr.WithEntry("ssv", true))
 	localNode.SetFallbackIP(external)
 	localNode.SetFallbackUDP(port)