From 98757e759c1a6755a3b5f68683842b9f800c3440 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Sat, 27 Jun 2020 01:59:02 +0800 Subject: [PATCH] Update Geth (#6422) * update geth * Merge refs/heads/master into removeSlowdown --- deps.bzl | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps.bzl b/deps.bzl index 08dab8f3f1..c889289a65 100644 --- a/deps.bzl +++ b/deps.bzl @@ -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:6TlvcghiASejE0zd3ZEhd2ZQ+e+S2EALSgixivLzi8Q=", - version = "v0.0.0-20200622172343-b50bad5c6f58", + sum = "h1:9JrPtwqCvV38DXYaHbB855KUIHYMwjJBE88lL8lMu8Q=", + version = "v0.0.0-20200626171358-a933315235ec", ) # 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 = "b50bad5c6f5855d5821c9b6b6f0fee9c79aa350b", # keep + commit = "a933315235ecf4469b5784b62713bc40f979c19d", # 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 diff --git a/go.mod b/go.mod index ab95a737df..b2d9276486 100644 --- a/go.mod +++ b/go.mod @@ -115,6 +115,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-20200622172343-b50bad5c6f58 +replace github.com/ethereum/go-ethereum => github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200626171358-a933315235ec replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b diff --git a/go.sum b/go.sum index 5ca016d607..bf6b97fd7e 100644 --- a/go.sum +++ b/go.sum @@ -890,8 +890,8 @@ github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSg github.com/protolambda/zssz v0.1.3/go.mod h1:a4iwOX5FE7/JkKA+J/PH0Mjo9oXftN6P8NZyL28gpag= github.com/protolambda/zssz v0.1.4 h1:4jkt8sqwhOVR8B1JebREU/gVX0Ply4GypsV8+RWrDuw= github.com/protolambda/zssz v0.1.4/go.mod h1:a4iwOX5FE7/JkKA+J/PH0Mjo9oXftN6P8NZyL28gpag= -github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200622172343-b50bad5c6f58 h1:6TlvcghiASejE0zd3ZEhd2ZQ+e+S2EALSgixivLzi8Q= -github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200622172343-b50bad5c6f58/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= +github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200626171358-a933315235ec h1:9JrPtwqCvV38DXYaHbB855KUIHYMwjJBE88lL8lMu8Q= +github.com/prysmaticlabs/bazel-go-ethereum v0.0.0-20200626171358-a933315235ec/go.mod h1:oP8FC5+TbICUyftkTWs+8JryntjIJLJvWvApK3z2AYw= github.com/prysmaticlabs/ethereumapis v0.0.0-20200617012222-f52a0eff2886 h1:0zB+DtS1NdwgYtto4JcvV3OX3m1wmM7ocjLvveNaMgA= github.com/prysmaticlabs/ethereumapis v0.0.0-20200617012222-f52a0eff2886/go.mod h1:rs05kpTfWKl0KflsBWzBQFstoyPFMTWQTbxSAyGHe78= github.com/prysmaticlabs/go-bitfield v0.0.0-20191017011753-53b773adde52/go.mod h1:hCwmef+4qXWjv0jLDbQdWnL0Ol7cS7/lCSS26WR+u6s=