Revert "Merge branch 'renovate/major-libp2p' of github.com:prysmaticl…

…abs/prysm into update-renovates" This reverts commit b9c7645, reversing changes made to 31a0533.
prysmaticlabs · Jun 24, 2019 · 5eae82b · 5eae82b
1 parent 73e905c
commit 5eae82b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 39 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -9,8 +9,8 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "f04d2373bcaf8aa09bccb08a98a57e721306c8f6043a2a0ee610fd6853dcde3d",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.6/rules_go-0.18.6.tar.gz",
+    sha256 = "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz",
 )
 
 http_archive(
@@ -41,9 +41,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_k8s",
-    sha256 = "95b0df98360dd3c0dd7b30d1aac2fd286dff65186721772ead1eafafa1f0cddb",
-    strip_prefix = "rules_k8s-cddc0353968df2500f1ab8969a53283e52425a6e",
-    url = "https://github.com/bazelbuild/rules_k8s/archive/cddc0353968df2500f1ab8969a53283e52425a6e.tar.gz",
+    sha256 = "4c4fea5c7fb0768bd440e6bf0a893bdb0449f3f41707522eaa9ada3d1152402f",
+    strip_prefix = "rules_k8s-7475ba20133e4a3f585a3648db6d055e7d1c5f78",
+    url = "https://github.com/bazelbuild/rules_k8s/archive/7475ba20133e4a3f585a3648db6d055e7d1c5f78.tar.gz",
 )
 
 load(
@@ -141,9 +141,9 @@ buildifier_dependencies()
 
 http_archive(
     name = "com_github_prysmaticlabs_go_ssz",
-    sha256 = "7eab76ede97db187dd508b5d8d75aba3b2da818fd62e9a6a8c9219606f6e8e47",
-    strip_prefix = "go-ssz-0fdbce2fb193117d6236c1ccf65a6683ce9d3e49",
-    url = "https://github.com/prysmaticlabs/go-ssz/archive/0fdbce2fb193117d6236c1ccf65a6683ce9d3e49.tar.gz",
+    sha256 = "f6fd5d623a988337810b956ddaf612dce771d9d0f9256934c8f4b1379f1cb2f6",
+    strip_prefix = "go-ssz-2e84733edbac32aca6d47feafc4441e43b10047f",
+    url = "https://github.com/prysmaticlabs/go-ssz/archive/2e84733edbac32aca6d47feafc4441e43b10047f.tar.gz",
 )
 
 load("@com_github_prysmaticlabs_go_ssz//:deps.bzl", "go_ssz_dependencies")
@@ -222,7 +222,7 @@ go_repository(
 
 go_repository(
     name = "com_github_multiformats_go_multiaddr",
-    commit = "5b1de2f51ff2368d5ce94a659f15ef26be273cd0",  # v0.0.4
+    commit = "d250ee73c20036583482e12755fabe721c54087b",  # v0.0.4
     importpath = "github.com/multiformats/go-multiaddr",
 )
 
@@ -234,7 +234,7 @@ go_repository(
 
 go_repository(
     name = "com_github_multiformats_go_multihash",
-    commit = "0e239d8fa37b597bd150660e5b6845570aa5b833",  # v0.0.6
+    commit = "043d98569fdc31461b049f0c9fe267291fcbc087",  # v0.0.5
     importpath = "github.com/multiformats/go-multihash",
 )
 
@@ -252,7 +252,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_peerstore",
-    commit = "c11298943ef400535dac08ec6cbeff747cbe7e99",  # v0.1.1
+    commit = "4353646945045d89f77d0b362cb5e5533cbd117e",  # v0.1.0
     importpath = "github.com/libp2p/go-libp2p-peerstore",
 )
 
@@ -379,7 +379,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_nat",
-    commit = "c50c291a61bceccb914366d93eb24f58594e9134",  # v0.0.4
+    commit = "7790752804f5e7c2356fed9352686f1e45939459",  # v0.0.4
     importpath = "github.com/libp2p/go-libp2p-nat",
 )
 
@@ -499,7 +499,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_msgio",
-    commit = "9142103f7d8dc5a74a91116b8f927fe8d8bf4a96",  # v0.0.4
+    commit = "3bd868a861a46320636054c3cb439e69a4870f29",  # v0.0.3
     importpath = "github.com/libp2p/go-msgio",
 )
 
@@ -535,7 +535,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_reuseport_transport",
-    commit = "c7583c88df654a2ecd621e863f661783d79b64d1",  # v0.0.2
+    commit = "613b9f8934b2fa21208fe052314c82d296577c37",  # v0.0.2
     importpath = "github.com/libp2p/go-reuseport-transport",
 )
 
@@ -553,13 +553,13 @@ go_repository(
 
 go_repository(
     name = "com_github_syndtr_goleveldb",
-    commit = "9d007e481048296f09f59bd19bb7ae584563cd95",  # v1.0.0
+    commit = "4217c9f31f5816db02addc94e56061da77f288d8",
     importpath = "github.com/syndtr/goleveldb",
 )
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_blankhost",
-    commit = "a50d1c7d55c7bbc52879616e7e0c8cdf38747c1a",  # v0.1.3
+    commit = "faf05082a8ce97f46ab18c0455e141b28bcf0318",  # v0.1.1
     importpath = "github.com/libp2p/go-libp2p-blankhost",
 )
 
@@ -615,7 +615,7 @@ go_repository(
 
 go_repository(
     name = "com_github_prometheus_client_golang",
-    commit = "4ab88e80c249ed361d3299e2930427d9ac43ef8d",  # v1.0.0
+    commit = "662e8a9ffaaa74a4d050023c2cb26902cd9bab63",  # v0.9.3
     importpath = "github.com/prometheus/client_golang",
 )
 
@@ -663,7 +663,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_buffer_pool",
-    commit = "c4a5988a1e475884367015e1a2d0bd5fa4c491f4",  # v0.0.2
+    commit = "e648d396dc83d0f1bddda8520042ae2380501dca",  # v0.0.2
     importpath = "github.com/libp2p/go-buffer-pool",
 )
 
@@ -695,13 +695,13 @@ go_repository(
 go_repository(
     name = "com_github_libp2p_go_libp2p_kad_dht",
     build_file_proto_mode = "disable_global",
-    commit = "874e3d3fa068272afc6006b29c51ec8529b1b5ea",  # v0.1.1
+    commit = "31765355df17ef818381169dc36180c84c119928",  # v0.1.0
     importpath = "github.com/libp2p/go-libp2p-kad-dht",
 )
 
 go_repository(
     name = "com_github_ipfs_go_datastore",
-    commit = "aa9190c18f1576be98e974359fd08c64ca0b5a94",  # v0.0.5
+    commit = "f8bd98feaffb64c335ac5e74f0a3d3aedbfd13ba",  # v0.0.5
     importpath = "github.com/ipfs/go-datastore",
 )
 
@@ -713,7 +713,7 @@ go_repository(
 
 go_repository(
     name = "com_github_ipfs_go_cid",
-    commit = "b1cc3e404d48791056147f118ea7e7ea94eb946f",  # v0.0.2
+    commit = "b725c78c758dff5f1f2fe297ae4c38b5055a35cd",  # v0.0.2
     importpath = "github.com/ipfs/go-cid",
 )
 
@@ -910,7 +910,7 @@ go_repository(
 
 go_repository(
     name = "com_github_golang_snappy",
-    commit = "2a8bb927dd31d8daada140a5d09578521ce5c36a",  # v0.0.1
+    commit = "2a8bb927dd31d8daada140a5d09578521ce5c36a",
     importpath = "github.com/golang/snappy",
 )
 
@@ -1024,44 +1024,44 @@ go_repository(
 
 go_repository(
     name = "org_uber_go_automaxprocs",
-    commit = "946a8391268aea0a60a86403988ff3ab4b604a83",  # v1.2.0
+    commit = "823363ffcd16c8f3ebaa3a067550d97c70f52194",
     importpath = "go.uber.org/automaxprocs",
 )
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_core",
     build_file_proto_mode = "disable_global",
-    commit = "786c4f4e0f0af96fb69223268da4d0bf123841d8",  # v0.0.6
+    commit = "8f222f4b5a872d9af86f74f2ec0982c7356adce6",
     importpath = "github.com/libp2p/go-libp2p-core",
 )
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_testing",
-    commit = "6d4ca71943f35271918e28f9a9950002e17b4f16",  # v0.0.4
+    commit = "6d4ca71943f35271918e28f9a9950002e17b4f16",
     importpath = "github.com/libp2p/go-libp2p-testing",
 )
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_yamux",
-    commit = "a61e80cb5770aa0d9b1bafe94da1278f58baa2c5",  # v0.2.1
+    commit = "a61e80cb5770aa0d9b1bafe94da1278f58baa2c5",
     importpath = "github.com/libp2p/go-libp2p-yamux",
 )
 
 go_repository(
     name = "com_github_libp2p_go_libp2p_mplex",
-    commit = "811729f15f0af13fe3f0d9e410c22f6a4bc5c686",  # v0.2.1
+    commit = "811729f15f0af13fe3f0d9e410c22f6a4bc5c686",
     importpath = "github.com/libp2p/go-libp2p-mplex",
 )
 
 go_repository(
     name = "com_github_libp2p_go_stream_muxer_multistream",
-    commit = "2439b02deee2de8bb1fe24473d3d8333008a714a",  # v0.2.0
+    commit = "2439b02deee2de8bb1fe24473d3d8333008a714a",
     importpath = "github.com/libp2p/go-stream-muxer-multistream",
 )
 
 go_repository(
     name = "com_github_multiformats_go_multiaddr_fmt",
-    commit = "7d8102a98552c80f8a5ccb9c01e670fac17fd6df",  # v0.0.1
+    commit = "7d8102a98552c80f8a5ccb9c01e670fac17fd6df",
     importpath = "github.com/multiformats/go-multiaddr-fmt",
 )
 
@@ -1073,7 +1073,7 @@ go_repository(
 
 go_repository(
     name = "com_github_libp2p_go_nat",
-    commit = "d13fdefb3bbb2fde2c6fc090a7ea992cec8b26df",  # v0.0.3
+    commit = "02f8b1ee4b2619d4070113f21249f9194e7be6bd",
     importpath = "github.com/libp2p/go-nat",
 )
 

diff --git a/beacon-chain/rpc/validator_server_test.go b/beacon-chain/rpc/validator_server_test.go
@@ -28,7 +28,7 @@ func genesisState(validators uint64) (*pbp2p.BeaconState, error) {
 	genesisTime := time.Unix(0, 0).Unix()
 	deposits := make([]*pbp2p.Deposit, validators)
 	for i := 0; i < len(deposits); i++ {
-		var pubKey [48]byte
+		var pubKey [96]byte
 		copy(pubKey[:], []byte(strconv.Itoa(i)))
 		depositInput := &pbp2p.DepositInput{
 			Pubkey: pubKey[:],
@@ -219,9 +219,6 @@ func TestCommitteeAssignment_OK(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Could not call epoch committee assignment %v", err)
 	}
-	if len(res.Assignment) == 0 {
-		t.Fatal("No assignments returned")
-	}
 	if res.Assignment[0].Shard >= params.BeaconConfig().ShardCount {
 		t.Errorf("Assigned shard %d can't be higher than %d",
 			res.Assignment[0].Shard, params.BeaconConfig().ShardCount)

diff --git a/shared/params/config.go b/shared/params/config.go
@@ -118,7 +118,7 @@ var defaultBeaconConfig = &BeaconChainConfig{
 	MaxExitDequeuesPerEpoch:      4,
 	ValidatorPrivkeyFileName:     "/validatorprivatekey",
 	WithdrawalPrivkeyFileName:    "/shardwithdrawalkey",
-	BLSPubkeyLength:              48,
+	BLSPubkeyLength:              96,
 	DefaultBufferSize:            10000,
 	HashCacheSize:                100000,
 

diff --git a/tools/cluster-pk-manager/server/allocations.go b/tools/cluster-pk-manager/server/allocations.go
@@ -32,8 +32,6 @@ func (s *server) serveAllocationsHTTPPage() {
 	})
 
 	srv := &http.Server{Addr: ":8080", Handler: mux}
-	go func() {
-		log.Fatal(srv.ListenAndServe())
-	}()
+	go log.Fatal(srv.ListenAndServe())
 	log.Info("Serving allocations page at :8080/allocations")
 }
diff --git a/tools/kubesec.bzl b/tools/kubesec.bzl
@@ -20,7 +20,8 @@ k8s_encrypted_secret = rule(
         default = "//tools:kubesec",
       ),
       "template": attr.label(
-          allow_single_file = True, 
+          allow_files = True, 
+          single_file = True, 
           mandatory = True
       ),
       "out": attr.output(mandatory = True),