Update Bootnode to v0.11.2 (#5767)

* update to v0.11.2 * fix test * docker * Update BUILD.bazel * Update BUILD.bazel Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
prysmaticlabs · May 7, 2020 · f6090d0 · f6090d0
1 parent 87c3599
commit f6090d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/tools/bootnode/BUILD.bazel b/tools/bootnode/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/tools/bootnode",
     visibility = ["//visibility:private"],
     deps = [
+        "//beacon-chain/core/helpers:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",
         "//shared/iputils:go_default_library",
         "//shared/logutil:go_default_library",
@@ -42,20 +43,20 @@ go_library(
 go_image(
     name = "image",
     srcs = ["bootnode.go"],
-    base = "//tools:go_image",
+    base = "//tools:cc_image",
     goarch = "amd64",
     goos = "linux",
     importpath = "github.com/prysmaticlabs/prysm/tools/bootnode",
-    pure = "on",
     race = "off",
     tags = ["manual"],
     visibility = ["//visibility:private"],
     deps = [
+        "//beacon-chain/core/helpers:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",
+        "//shared/iputils:go_default_library",
         "//shared/logutil:go_default_library",
         "//shared/params:go_default_library",
         "//shared/runutil:go_default_library",
-        "//shared/iputils:go_default_library",
         "//shared/version:go_default_library",
         "@com_github_btcsuite_btcd//btcec:go_default_library",
         "@com_github_ethereum_go_ethereum//log:go_default_library",

diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go
@@ -40,6 +40,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prysmaticlabs/go-bitfield"
 	"github.com/prysmaticlabs/go-ssz"
+	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/iputils"
 	"github.com/prysmaticlabs/prysm/shared/logutil"
@@ -232,11 +233,15 @@ func createLocalNode(privKey *ecdsa.PrivateKey, ipAddr net.IP, port int) (*enode
 	if *externalIP == "" {
 		external = ipAddr
 	}
+	digest, err := helpers.ComputeForkDigest(params.BeaconConfig().GenesisForkVersion, params.BeaconConfig().ZeroHash[:])
+	if err != nil {
+		return nil, errors.Wrap(err, "Could not compute fork digest")
+	}
 
 	forkID := &pb.ENRForkID{
-		CurrentForkDigest: []byte{0, 0, 0, 0},
-		NextForkVersion:   params.BeaconConfig().NextForkVersion,
-		NextForkEpoch:     params.BeaconConfig().NextForkEpoch,
+		CurrentForkDigest: digest[:],
+		NextForkVersion:   params.BeaconConfig().GenesisForkVersion,
+		NextForkEpoch:     params.BeaconConfig().FarFutureEpoch,
 	}
 	forkEntry, err := ssz.Marshal(forkID)
 	if err != nil {