Update Geth Fork (#5865)

* update workspace * new updates * new commit * fixes * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into updateGeth * test fixes * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into fixCreateconfig # Conflicts: fix test * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into updateGeth * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into fixCreateconfig # Conflicts: update commit * use geth's dep * Merge branch 'master' into updateGeth * update workspace * fix again * Merge branch 'updateGeth' of https://github.com/prysmaticlabs/geth-sharding into updateGeth * Merge branch 'master' into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * fix osx builds * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * add execption and disable nilness * remove redundant deps * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into updateGeth * clean up * go mod * tidy * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Add patch to resolve panic until bazel-contrib/rules_go#2450 can be addressed * Merge branch 'updateGeth' of github.com:prysmaticlabs/prysm into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth * Merge refs/heads/master into updateGeth
prysmaticlabs · Jun 1, 2020 · afbe494 · afbe494
1 parent e715339
commit afbe494
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 240 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -83,6 +83,12 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_go",
+    patch_args = ["-p1"],
+    patches = [
+        # Required until https://github.com/bazelbuild/rules_go/pull/2450 merges otherwise nilness
+        # nogo check fails for certain third_party dependencies.
+        "//third_party:io_bazel_rules_go.patch",
+    ],
     sha256 = "7b9bbe3ea1fccb46dcfa6c3f3e29ba7ec740d8733370e21cdc8937467b4a4349",
     urls = [
         "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.4/rules_go-v0.22.4.tar.gz",
@@ -343,6 +349,10 @@ load("@prysm//third_party/herumi:herumi.bzl", "bls_dependencies")
 
 bls_dependencies()
 
+load("@com_github_ethereum_go_ethereum//:deps.bzl", "geth_dependencies")
+
+geth_dependencies()
+
 # Do NOT add new go dependencies here! Refer to DEPENDENCIES.md!
 
 go_repository(

diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go
@@ -22,9 +22,8 @@ type Listener interface {
 	Self() *enode.Node
 	Close()
 	Lookup(enode.ID) []*enode.Node
-	ReadRandomNodes([]*enode.Node) int
 	Resolve(*enode.Node) *enode.Node
-	LookupRandom() []*enode.Node
+	RandomNodes() enode.Iterator
 	Ping(*enode.Node) error
 	RequestENR(*enode.Node) (*enode.Node, error)
 	LocalNode() *enode.LocalNode

diff --git a/beacon-chain/p2p/service.go b/beacon-chain/p2p/service.go
@@ -411,14 +411,14 @@ func (s *Service) RefreshENR() {
 // subscribed to a particular subnet. Then we try to connect
 // with those peers.
 func (s *Service) FindPeersWithSubnet(index uint64) (bool, error) {
-	nodes := make([]*enode.Node, searchLimit)
 	if s.dv5Listener == nil {
 		// return if discovery isn't set
 		return false, nil
 	}
-	num := s.dv5Listener.ReadRandomNodes(nodes)
+	iterator := s.dv5Listener.RandomNodes()
+	nodes := enode.ReadNodes(iterator, lookupLimit)
 	exists := false
-	for _, node := range nodes[:num] {
+	for _, node := range nodes {
 		if node.IP() == nil {
 			continue
 		}
@@ -509,7 +509,9 @@ func (s *Service) awaitStateInitialized() {
 // listen for new nodes watches for new nodes in the network and adds them to the peerstore.
 func (s *Service) listenForNewNodes() {
 	runutil.RunEvery(s.ctx, pollingPeriod, func() {
-		nodes := s.dv5Listener.LookupRandom()
+		iterator := s.dv5Listener.RandomNodes()
+		nodes := enode.ReadNodes(iterator, lookupLimit)
+		iterator.Close()
 		multiAddresses := s.processPeers(nodes)
 		// do not process a large amount than required peers.
 		if len(multiAddresses) > lookupLimit {

diff --git a/beacon-chain/p2p/service_test.go b/beacon-chain/p2p/service_test.go
@@ -43,10 +43,6 @@ func (mockListener) Resolve(*enode.Node) *enode.Node {
 	panic("implement me")
 }
 
-func (mockListener) LookupRandom() []*enode.Node {
-	panic("implement me")
-}
-
 func (mockListener) Ping(*enode.Node) error {
 	panic("implement me")
 }
@@ -59,6 +55,10 @@ func (mockListener) LocalNode() *enode.LocalNode {
 	panic("implement me")
 }
 
+func (mockListener) RandomNodes() enode.Iterator {
+	panic("implement me")
+}
+
 func createHost(t *testing.T, port int) (host.Host, *ecdsa.PrivateKey, net.IP) {
 	ipAddr, pkey := createAddrAndPrivKey(t)
 	ipAddr = net.ParseIP("127.0.0.1")

diff --git a/contracts/deposit-contract/depositContract.go b/contracts/deposit-contract/depositContract.go