Update Go-Ethereum Fork (#7303)

* update
* tidy
* Merge refs/heads/master into updateGeth
* remove metaData
* remove cloudflare
* Revert "remove cloudflare"

This reverts commit 687210f70f.
This commit is contained in:
Nishant Das
2020-09-22 21:23:45 +08:00
committed by GitHub
parent 719e99ffd9
commit 09640ae22d
4 changed files with 95 additions and 52 deletions

11
go.mod
View File

@@ -18,13 +18,12 @@ require (
github.com/dgraph-io/ristretto v0.0.3
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/elastic/gosigar v0.10.5 // indirect
github.com/emicklei/dot v0.11.0
github.com/ethereum/go-ethereum v0.0.0-00010101000000-000000000000
github.com/fatih/color v1.9.0 // indirect
github.com/ferranbt/fastssz v0.0.0-20200826142241-3a913c5a1313
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5
github.com/fsnotify/fsnotify v1.4.7
github.com/fsnotify/fsnotify v1.4.9
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-yaml/yaml v2.1.0+incompatible
@@ -33,8 +32,8 @@ require (
github.com/golang/gddo v0.0.0-20200528160355-8d077c1d8f4c
github.com/golang/mock v1.4.3
github.com/golang/protobuf v1.4.2
github.com/golang/snappy v0.0.1
github.com/google/gofuzz v1.1.0
github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26
github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa
github.com/google/uuid v1.1.1
github.com/gorilla/websocket v1.4.2
github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9 // indirect
@@ -113,8 +112,6 @@ require (
go.uber.org/automaxprocs v1.3.0
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/exp v0.0.0-20200513190911-00229845015e
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 // indirect
golang.org/x/tools v0.0.0-20200528185414-6be401e3f76e
google.golang.org/genproto v0.0.0-20200730144737-007c33dbd381
google.golang.org/grpc v1.29.1
@@ -128,6 +125,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-20200626171358-a933315235ec
replace github.com/ethereum/go-ethereum => github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200922100503-3794d0d7ca25
replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b