Skip to content

Commit

Permalink
remove some code from cluster pk manager, gazelle
Browse files Browse the repository at this point in the history
  • Loading branch information
prestonvanloon committed Feb 26, 2020
1 parent ae57c33 commit 8672e0c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 49 deletions.
1 change: 0 additions & 1 deletion proto/beacon/rpc/v1_gateway/BUILD.bazel
Expand Up @@ -7,7 +7,6 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"@com_github_golang_protobuf//proto:go_default_library",
"@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
"@io_bazel_rules_go//proto/wkt:empty_go_proto",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
Expand Down
1 change: 0 additions & 1 deletion tools/cluster-pk-manager/server/BUILD.bazel
Expand Up @@ -18,7 +18,6 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//contracts/deposit-contract:go_default_library",
"//proto/beacon/rpc/v1:go_default_library",
"//proto/cluster:go_default_library",
"//shared/bls:go_default_library",
"//shared/bytesutil:go_default_library",
Expand Down
49 changes: 2 additions & 47 deletions tools/cluster-pk-manager/server/keyChecker.go
@@ -1,70 +1,25 @@
package main

import (
"context"
"fmt"
"time"

pbBeacon "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"go.opencensus.io/plugin/ocgrpc"
"google.golang.org/grpc"
)

var keyInterval = 3 * time.Minute

type keyChecker struct {
db *db
client pbBeacon.ValidatorServiceClient
}

func newkeyChecker(db *db, beaconRPCAddr string) *keyChecker {
// connect to the beacon node
dialOpt := grpc.WithInsecure()
conn, err := grpc.DialContext(context.Background(), beaconRPCAddr, dialOpt, grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
if err != nil {
log.Errorf("Could not dial endpoint: %s, %v", beaconRPCAddr, err)
}
valClient := pbBeacon.NewValidatorServiceClient(conn)
log.Warn("Key checker temporarily disabled during refactor.")

return &keyChecker{
db: db,
client: valClient,
}
}

func (k *keyChecker) checkKeys() error {
pubkeys, keyMap, err := k.db.KeyMap()
if err != nil {
return err
}

log.Debug("Requesting EXITED keys")

req := &pbBeacon.ExitedValidatorsRequest{
PublicKeys: pubkeys,
}

ctx, cancel := context.WithTimeout(context.Background(), keyInterval)
defer cancel()
resp, err := k.client.ExitedValidators(ctx, req)
if err != nil {
return err
}

log.WithField(
"resp_keys", len(resp.PublicKeys),
).WithField(
"req_keys", len(req.PublicKeys),
).Debug("Received EXITED key list")

for _, key := range resp.PublicKeys {
log.WithField("key", fmt.Sprintf("%#x", key)).Debug("Removing EXITED key")
kMap := keyMap[bytesutil.ToBytes48(key)]
if err := k.db.RemovePKFromPod(kMap.podName, kMap.privateKey); err != nil {
return err
}
}
log.Warn("Not checking for EXITED validator keys.")
return nil
}

Expand Down

0 comments on commit 8672e0c

Please sign in to comment.