From 1f622cac483e1605a6cd797da40b5e0c4ed065ff Mon Sep 17 00:00:00 2001 From: y0sher Date: Sun, 2 Jun 2024 18:41:18 +0300 Subject: [PATCH] don't pose as an eth2 node --- network/discovery/enode.go | 1 + utils/boot_node/node.go | 23 +---------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/network/discovery/enode.go b/network/discovery/enode.go index beb81f601f..811d125096 100644 --- 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 index 9f3ae9c839..d050f125ee 100644 --- 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)