Fix Discovery Panic (#6261)

* fix dv5 panic
* add back
This commit is contained in:
Nishant Das
2020-06-15 12:22:29 +08:00
committed by GitHub
parent a9070ad725
commit 9d8420b20c
2 changed files with 5 additions and 5 deletions

View File

@@ -53,15 +53,15 @@ def prysm_deps():
build_file_generation = "off",
importpath = "github.com/prysmaticlabs/bazel-go-ethereum",
replace = "github.com/ethereum/go-ethereum",
sum = "h1:X44ghT3epjsrDWm1PRZ/aaQQcrl4y6/jtuge1sD32HY=",
version = "v0.0.0-20200421124922-0beb54b2147b",
sum = "h1:BgFL+G37WhgPOvkQveBXevApdusxtkrRoTzN9O3jnDM=",
version = "v0.0.0-20200615030327-5f59060ced70",
)
# Note: It is required to define com_github_ethereum_go_ethereum like this for some reason...
# Note: The keep directives help gazelle leave this alone.
go_repository(
name = "com_github_ethereum_go_ethereum",
commit = "df74fa9e96217d0fffbe4f25788dd270b25243ed", # keep
commit = "5f59060ced70d1107fd3df26bf248c95af388738", # keep
importpath = "github.com/ethereum/go-ethereum", # keep
# Note: go-ethereum is not bazel-friendly with regards to cgo. We have a
# a fork that has resolved these issues by disabling HID/USB support and

4
go.mod
View File

@@ -52,7 +52,6 @@ require (
github.com/libp2p/go-libp2p v0.9.2
github.com/libp2p/go-libp2p-blankhost v0.1.6
github.com/libp2p/go-libp2p-circuit v0.2.3
github.com/libp2p/go-libp2p-connmgr v0.2.3
github.com/libp2p/go-libp2p-core v0.5.6
github.com/libp2p/go-libp2p-crypto v0.1.0
github.com/libp2p/go-libp2p-host v0.1.0
@@ -72,6 +71,7 @@ require (
github.com/minio/sha256-simd v0.1.1
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/multiformats/go-multiaddr v0.2.2
github.com/multiformats/go-multiaddr-net v0.1.5
github.com/olekukonko/tablewriter v0.0.4 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/paulbellamy/ratecounter v0.2.0
@@ -118,6 +118,6 @@ require (
k8s.io/utils v0.0.0-20200520001619-278ece378a50 // indirect
)
replace github.com/ethereum/go-ethereum => github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200530091827-df74fa9e9621
replace github.com/ethereum/go-ethereum => github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200615030327-5f59060ced70
replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b