Miscellaneous Packages from Shared Into Proper Folders (#9638)

* slashutil

* builds

* interop

* viz

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>

beacon-chain/core/BUILD.bazel

@@ -9,9 +9,9 @@ go_library(
         "//fuzz:__pkg__",
         "//network/forks:__pkg__",
         "//proto/prysm/v1alpha1/attestation:__pkg__",
+        "//runtime/interop:__pkg__",
         "//shared/attestationutil:__pkg__",
         "//shared/depositutil:__pkg__",
-        "//shared/interop:__pkg__",
         "//shared/keystore:__pkg__",
         "//shared/testutil:__pkg__",
         "//shared/testutil/altair:__pkg__",

beacon-chain/core/blocks/BUILD.bazel

@@ -37,11 +37,11 @@ go_library(
         "//proto/prysm/v1alpha1:go_default_library",
         "//proto/prysm/v1alpha1/attestation:go_default_library",
         "//proto/prysm/v1alpha1/block:go_default_library",
+        "//proto/prysm/v1alpha1/slashings:go_default_library",
         "//runtime/version:go_default_library",
         "//shared/bytesutil:go_default_library",
         "//shared/depositutil:go_default_library",
         "//shared/params:go_default_library",
-        "//shared/slashutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prysmaticlabs_eth2_types//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

beacon-chain/core/blocks/attester_slashing.go

@@ -12,9 +12,9 @@ import (
 	"github.com/prysmaticlabs/prysm/container/slice"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
+	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/slashings"
 	"github.com/prysmaticlabs/prysm/runtime/version"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/prysmaticlabs/prysm/shared/slashutil"
 )
 
 // ProcessAttesterSlashings is one of the operations performed
@@ -128,7 +128,7 @@ func IsSlashableAttestationData(data1, data2 *ethpb.AttestationData) bool {
 	att1 := &ethpb.IndexedAttestation{Data: data1}
 	att2 := &ethpb.IndexedAttestation{Data: data2}
 	// Check if att1 is surrounding att2.
-	isSurroundVote := slashutil.IsSurround(att1, att2)
+	isSurroundVote := slashings.IsSurround(att1, att2)
 	return isDoubleVote || isSurroundVote
 }
 

beacon-chain/core/helpers/BUILD.bazel

@@ -21,9 +21,9 @@ go_library(
         "//fuzz:__pkg__",
         "//network/forks:__pkg__",
         "//proto/prysm/v1alpha1/attestation:__pkg__",
+        "//runtime/interop:__pkg__",
         "//shared/attestationutil:__pkg__",
         "//shared/depositutil:__pkg__",
-        "//shared/interop:__pkg__",
         "//shared/keystore:__pkg__",
         "//shared/testutil:__pkg__",
         "//shared/testutil/altair:__pkg__",

beacon-chain/core/transition/BUILD.bazel

@@ -15,7 +15,7 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/transition",
     visibility = [
         "//beacon-chain:__subpackages__",
-        "//shared/interop:__pkg__",
+        "//runtime/interop:__pkg__",
         "//shared/testutil:__pkg__",
         "//testing/endtoend:__pkg__",
         "//testing/fuzz:__pkg__",

beacon-chain/db/BUILD.bazel

@@ -18,9 +18,9 @@ go_library(
     deps = [
         "//beacon-chain/db/iface:go_default_library",
         "//beacon-chain/db/kv:go_default_library",
+        "//cmd:go_default_library",
         "//io/file:go_default_library",
         "//io/prompt:go_default_library",
-        "//shared/cmd:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
@@ -36,8 +36,8 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//beacon-chain/db/kv:go_default_library",
+        "//cmd:go_default_library",
         "//proto/prysm/v1alpha1/wrapper:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/testutil:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",

beacon-chain/db/restore.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/kv"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/io/file"
 	"github.com/prysmaticlabs/prysm/io/prompt"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/urfave/cli/v2"
 )
 

beacon-chain/db/restore_test.go

@@ -10,8 +10,8 @@ import (
 
 	types "github.com/prysmaticlabs/eth2-types"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/kv"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

beacon-chain/interop-cold-start/BUILD.bazel

@@ -16,7 +16,7 @@ go_library(
         "//beacon-chain/state/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//runtime:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_prysmaticlabs_eth2_types//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

beacon-chain/interop-cold-start/service.go

@@ -17,7 +17,7 @@ import (
 	v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/runtime"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/time/slots"
 )
 

beacon-chain/node/BUILD.bazel

@@ -37,6 +37,7 @@ go_library(
         "//beacon-chain/state/stategen:go_default_library",
         "//beacon-chain/sync:go_default_library",
         "//beacon-chain/sync/initial-sync:go_default_library",
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
         "//config/features:go_default_library",
         "//container/slice:go_default_library",
@@ -47,7 +48,6 @@ go_library(
         "//runtime/debug:go_default_library",
         "//runtime/prereqs:go_default_library",
         "//runtime/version:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
@@ -68,8 +68,8 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//beacon-chain/core/feed/state:go_default_library",
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",

beacon-chain/node/config.go

@@ -2,9 +2,9 @@ package node
 
 import (
 	types "github.com/prysmaticlabs/eth2-types"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
 	tracing2 "github.com/prysmaticlabs/prysm/monitoring/tracing"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/urfave/cli/v2"
 )

beacon-chain/node/config_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	types "github.com/prysmaticlabs/eth2-types"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

beacon-chain/node/node.go

@@ -39,6 +39,7 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
 	regularsync "github.com/prysmaticlabs/prysm/beacon-chain/sync"
 	initialsync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/container/slice"
@@ -48,7 +49,6 @@ import (
 	"github.com/prysmaticlabs/prysm/runtime/debug"
 	"github.com/prysmaticlabs/prysm/runtime/prereqs"
 	"github.com/prysmaticlabs/prysm/runtime/version"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

beacon-chain/node/node_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 	logTest "github.com/sirupsen/logrus/hooks/test"
 	"github.com/urfave/cli/v2"

beacon-chain/node/registration/BUILD.bazel

@@ -10,8 +10,8 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/node/registration",
     visibility = ["//beacon-chain/node:__subpackages__"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "@com_github_ethereum_go_ethereum//common:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
@@ -28,8 +28,8 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",

beacon-chain/node/registration/p2p.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/prysmaticlabs/prysm/shared/cmd"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v2"

beacon-chain/node/registration/p2p_test.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/prysmaticlabs/prysm/shared/cmd"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel

@@ -41,6 +41,7 @@ go_library(
         "//beacon-chain/state:go_default_library",
         "//beacon-chain/state/stategen:go_default_library",
         "//beacon-chain/sync:go_default_library",
+        "//cmd:go_default_library",
         "//config/features:go_default_library",
         "//container/slice:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
@@ -49,7 +50,6 @@ go_library(
         "//proto/prysm/v1alpha1/block:go_default_library",
         "//runtime/version:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_patrickmn_go_cache//:go_default_library",
@@ -97,6 +97,7 @@ go_test(
         "//beacon-chain/state/stategen:go_default_library",
         "//beacon-chain/state/v1:go_default_library",
         "//beacon-chain/sync/initial-sync/testing:go_default_library",
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
         "//config/features:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
@@ -105,7 +106,6 @@ go_test(
         "//proto/prysm/v1alpha1/block:go_default_library",
         "//proto/prysm/v1alpha1/wrapper:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
         "//shared/testutil/assert:go_default_library",

beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go

@@ -8,9 +8,9 @@ import (
 	"github.com/prysmaticlabs/prysm/api/pagination"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"

beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go

@@ -12,12 +12,12 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
 	attaggregation "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation/aggregation/attestations"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/time/slots"
 	"google.golang.org/grpc/codes"

beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go

@@ -20,13 +20,13 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
 	v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
 	attaggregation "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation/aggregation/attestations"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"

beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go

@@ -13,11 +13,11 @@ import (
 	statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block"
 	"github.com/prysmaticlabs/prysm/runtime/version"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go

@@ -17,11 +17,11 @@ import (
 	dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
 	v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"

beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go

@@ -15,10 +15,10 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/validators"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/runtime/version"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go

@@ -21,10 +21,10 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
 	v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
 	mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
+	"github.com/prysmaticlabs/prysm/cmd"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"

beacon-chain/state/stateutil/BUILD.bazel

@@ -55,8 +55,8 @@ go_test(
         "//crypto/hash:go_default_library",
         "//encoding/ssz:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/interop:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
         "//shared/testutil/assert:go_default_library",

beacon-chain/state/stateutil/state_root_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

beacon-chain/state/v1/BUILD.bazel

@@ -31,9 +31,9 @@ go_library(
     visibility = [
         "//beacon-chain:__subpackages__",
         "//proto/testing:__subpackages__",
+        "//runtime/interop:__subpackages__",
         "//shared/aggregation:__subpackages__",
         "//shared/depositutil:__subpackages__",
-        "//shared/interop:__subpackages__",
         "//shared/testutil:__pkg__",
         "//slasher/rpc:__subpackages__",
         "//testing/benchmark:__pkg__",
@@ -88,8 +88,8 @@ go_test(
         "//beacon-chain/state/stateutil:go_default_library",
         "//beacon-chain/state/types:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/interop:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
         "//shared/testutil/assert:go_default_library",

beacon-chain/state/v1/types_test.go

@@ -8,8 +8,8 @@ import (
 
 	v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

cmd/BUILD.bazel

@@ -11,7 +11,7 @@ go_library(
         "password_reader_mock.go",
         "wrap_flags.go",
     ],
-    importpath = "github.com/prysmaticlabs/prysm/shared/cmd",
+    importpath = "github.com/prysmaticlabs/prysm/cmd",
     visibility = ["//visibility:public"],
     deps = [
         "//io/file:go_default_library",

cmd/beacon-chain/BUILD.bazel

@@ -16,6 +16,7 @@ go_library(
     visibility = ["//beacon-chain:__subpackages__"],
     deps = [
         "//beacon-chain/node:go_default_library",
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/db:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
         "//config/features:go_default_library",
@@ -26,7 +27,6 @@ go_library(
         "//runtime/maxprocs:go_default_library",
         "//runtime/tos:go_default_library",
         "//runtime/version:go_default_library",
-        "//shared/cmd:go_default_library",
         "@com_github_ethereum_go_ethereum//log:go_default_library",
         "@com_github_ipfs_go_log_v2//:go_default_library",
         "@com_github_joonix_log//:go_default_library",

cmd/beacon-chain/db/BUILD.bazel

@@ -7,8 +7,8 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//beacon-chain/db:go_default_library",
+        "//cmd:go_default_library",
         "//runtime/tos:go_default_library",
-        "//shared/cmd:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
     ],

cmd/beacon-chain/db/db.go

@@ -2,8 +2,8 @@ package db
 
 import (
 	beacondb "github.com/prysmaticlabs/prysm/beacon-chain/db"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )

cmd/beacon-chain/flags/BUILD.bazel

@@ -16,7 +16,7 @@ go_library(
         "//testing/endtoend:__subpackages__",
     ],
     deps = [
-        "//shared/cmd:go_default_library",
+        "//cmd:go_default_library",
         "//shared/params:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/beacon-chain/flags/config.go

@@ -1,7 +1,7 @@
 package flags
 
 import (
-	"github.com/prysmaticlabs/prysm/shared/cmd"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/urfave/cli/v2"
 )
 

cmd/beacon-chain/main.go

@@ -12,6 +12,7 @@ import (
 	golog "github.com/ipfs/go-log/v2"
 	joonix "github.com/joonix/log"
 	"github.com/prysmaticlabs/prysm/beacon-chain/node"
+	"github.com/prysmaticlabs/prysm/cmd"
 	dbcommands "github.com/prysmaticlabs/prysm/cmd/beacon-chain/db"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
@@ -22,7 +23,6 @@ import (
 	_ "github.com/prysmaticlabs/prysm/runtime/maxprocs"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
 	"github.com/prysmaticlabs/prysm/runtime/version"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"

cmd/beacon-chain/usage.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"sort"
 
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/runtime/debug"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/urfave/cli/v2"
 )
 

cmd/client-stats/BUILD.bazel

@@ -11,12 +11,12 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/client-stats",
     visibility = ["//visibility:private"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/client-stats/flags:go_default_library",
         "//io/logs:go_default_library",
         "//monitoring/clientstats:go_default_library",
         "//monitoring/journald:go_default_library",
         "//runtime/version:go_default_library",
-        "//shared/cmd:go_default_library",
         "@com_github_joonix_log//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/client-stats/main.go

@@ -7,12 +7,12 @@ import (
 	"time"
 
 	joonix "github.com/joonix/log"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/client-stats/flags"
 	"github.com/prysmaticlabs/prysm/io/logs"
 	"github.com/prysmaticlabs/prysm/monitoring/clientstats"
 	"github.com/prysmaticlabs/prysm/monitoring/journald"
 	"github.com/prysmaticlabs/prysm/runtime/version"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"

cmd/client-stats/usage.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"sort"
 
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/client-stats/flags"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/urfave/cli/v2"
 )
 

cmd/password_reader_mock.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/connorwstein/prysm/shared/cmd (interfaces: PasswordReader)
+// Source: github.com/connorwstein/prysm/cmd (interfaces: PasswordReader)
 
 // Package mock_cmd is a generated GoMock package.
 package cmd

cmd/validator/BUILD.bazel

@@ -15,6 +15,7 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/validator",
     visibility = ["//validator:__subpackages__"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/validator/accounts:go_default_library",
         "//cmd/validator/db:go_default_library",
         "//cmd/validator/flags:go_default_library",
@@ -28,7 +29,6 @@ go_library(
         "//runtime/maxprocs:go_default_library",
         "//runtime/tos:go_default_library",
         "//runtime/version:go_default_library",
-        "//shared/cmd:go_default_library",
         "//validator/node:go_default_library",
         "@com_github_joonix_log//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

cmd/validator/accounts/BUILD.bazel

@@ -6,10 +6,10 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/validator/accounts",
     visibility = ["//visibility:public"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/validator/flags:go_default_library",
         "//config/features:go_default_library",
         "//runtime/tos:go_default_library",
-        "//shared/cmd:go_default_library",
         "//validator/accounts:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/validator/accounts/accounts.go

@@ -3,10 +3,10 @@ package accounts
 import (
 	"os"
 
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/validator/accounts"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

cmd/validator/db/BUILD.bazel

@@ -6,8 +6,8 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/validator/db",
     visibility = ["//visibility:public"],
     deps = [
+        "//cmd:go_default_library",
         "//runtime/tos:go_default_library",
-        "//shared/cmd:go_default_library",
         "//validator/db:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/validator/db/db.go

@@ -1,8 +1,8 @@
 package db
 
 import (
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	validatordb "github.com/prysmaticlabs/prysm/validator/db"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

cmd/validator/main.go

@@ -11,6 +11,7 @@ import (
 	runtimeDebug "runtime/debug"
 
 	joonix "github.com/joonix/log"
+	"github.com/prysmaticlabs/prysm/cmd"
 	accountcommands "github.com/prysmaticlabs/prysm/cmd/validator/accounts"
 	dbcommands "github.com/prysmaticlabs/prysm/cmd/validator/db"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
@@ -24,7 +25,6 @@ import (
 	_ "github.com/prysmaticlabs/prysm/runtime/maxprocs"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
 	"github.com/prysmaticlabs/prysm/runtime/version"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/validator/node"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

cmd/validator/slashing-protection/BUILD.bazel

@@ -6,10 +6,10 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/validator/slashing-protection",
     visibility = ["//visibility:public"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/validator/flags:go_default_library",
         "//config/features:go_default_library",
         "//runtime/tos:go_default_library",
-        "//shared/cmd:go_default_library",
         "//validator/slashing-protection:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/validator/slashing-protection/slashing-protection.go

@@ -1,10 +1,10 @@
 package slashing_protection
 
 import (
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	slashingprotection "github.com/prysmaticlabs/prysm/validator/slashing-protection"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

cmd/validator/usage.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"sort"
 
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/runtime/debug"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/urfave/cli/v2"
 )
 

cmd/validator/wallet/BUILD.bazel

@@ -6,10 +6,10 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/cmd/validator/wallet",
     visibility = ["//visibility:public"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/validator/flags:go_default_library",
         "//config/features:go_default_library",
         "//runtime/tos:go_default_library",
-        "//shared/cmd:go_default_library",
         "//validator/accounts:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",

cmd/validator/wallet/wallet.go

@@ -1,10 +1,10 @@
 package wallet
 
 import (
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	"github.com/prysmaticlabs/prysm/runtime/tos"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/validator/accounts"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

contracts/deposit-contract/BUILD.bazel

@@ -33,7 +33,7 @@ go_test(
     deps = [
         ":go_default_library",
         "//container/trie:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",

contracts/deposit-contract/depositContract_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	depositcontract "github.com/prysmaticlabs/prysm/contracts/deposit-contract"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 )

contracts/deposit-contract/deposit_tree_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/prysmaticlabs/prysm/container/trie"
 	depositcontract "github.com/prysmaticlabs/prysm/contracts/deposit-contract"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"

proto/prysm/v1alpha1/slashings/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "double_votes.go",
         "surround_votes.go",
     ],
-    importpath = "github.com/prysmaticlabs/prysm/shared/slashutil",
+    importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/slashings",
     visibility = ["//visibility:public"],
     deps = [
         "//proto/prysm/v1alpha1:go_default_library",

proto/prysm/v1alpha1/slashings/double_votes.go

@@ -1,4 +1,4 @@
-package slashutil
+package slashings
 
 import "github.com/prysmaticlabs/prysm/shared/params"
 

proto/prysm/v1alpha1/slashings/double_votes_test.go

@@ -1,4 +1,4 @@
-package slashutil
+package slashings
 
 import (
 	"testing"

proto/prysm/v1alpha1/slashings/surround_votes.go

@@ -1,4 +1,4 @@
-package slashutil
+package slashings
 
 import ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 

proto/prysm/v1alpha1/slashings/surround_votes_test.go

@@ -1,4 +1,4 @@
-package slashutil
+package slashings
 
 import (
 	"testing"

runtime/interop/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "generate_genesis_state.go",
         "generate_keys.go",
     ],
-    importpath = "github.com/prysmaticlabs/prysm/shared/interop",
+    importpath = "github.com/prysmaticlabs/prysm/runtime/interop",
     visibility = ["//visibility:public"],
     deps = [
         "//async:go_default_library",

runtime/interop/generate_genesis_state_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/container/trie"
 	eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
@@ -19,11 +19,11 @@ func TestGenerateGenesisState(t *testing.T) {
 	require.NoError(t, err)
 	depositDataItems, depositDataRoots, err := interop.DepositDataFromKeys(privKeys, pubKeys)
 	require.NoError(t, err)
-	trie, err := trie.GenerateTrieFromItems(depositDataRoots, params.BeaconConfig().DepositContractTreeDepth)
+	tr, err := trie.GenerateTrieFromItems(depositDataRoots, params.BeaconConfig().DepositContractTreeDepth)
 	require.NoError(t, err)
-	deposits, err := interop.GenerateDepositsFromData(depositDataItems, trie)
+	deposits, err := interop.GenerateDepositsFromData(depositDataItems, tr)
 	require.NoError(t, err)
-	root := trie.HashTreeRoot()
+	root := tr.HashTreeRoot()
 	genesisState, err := transition.GenesisBeaconState(context.Background(), deposits, 0, &eth.Eth1Data{
 		DepositRoot:  root[:],
 		DepositCount: uint64(len(deposits)),

runtime/interop/generate_keys_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/bazelbuild/rules_go/go/tools/bazel"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/go-yaml/yaml"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 )

runtime/tos/BUILD.bazel

@@ -6,9 +6,9 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/runtime/tos",
     visibility = ["//visibility:public"],
     deps = [
+        "//cmd:go_default_library",
         "//io/file:go_default_library",
         "//io/prompt:go_default_library",
-        "//shared/cmd:go_default_library",
         "@com_github_logrusorgru_aurora//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
@@ -21,7 +21,7 @@ go_test(
     srcs = ["tos_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//shared/cmd:go_default_library",
+        "//cmd:go_default_library",
         "//shared/testutil/require:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
     ],

runtime/tos/tos.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/logrusorgru/aurora"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/io/file"
 	"github.com/prysmaticlabs/prysm/io/prompt"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )

runtime/tos/tos_test.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/prysmaticlabs/prysm/shared/cmd"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 	"github.com/urfave/cli/v2"
 )

shared/testutil/BUILD.bazel

@@ -34,9 +34,9 @@ go_library(
         "//proto/eth/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//proto/prysm/v1alpha1/wrapper:go_default_library",
+        "//runtime/interop:go_default_library",
         "//runtime/version:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/interop:go_default_library",
         "//shared/params:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",

shared/testutil/deposits.go

@@ -13,8 +13,8 @@ import (
 	"github.com/prysmaticlabs/prysm/crypto/bls"
 	"github.com/prysmaticlabs/prysm/crypto/hash"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 

testing/endtoend/components/BUILD.bazel

@@ -14,12 +14,12 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/testing/endtoend/components",
     visibility = ["//testing/endtoend:__subpackages__"],
     deps = [
+        "//cmd:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
         "//cmd/validator/flags:go_default_library",
         "//config/features:go_default_library",
         "//contracts/deposit-contract:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
         "//testing/endtoend/helpers:go_default_library",

testing/endtoend/components/beacon_node.go

@@ -12,9 +12,9 @@ import (
 	"strings"
 
 	"github.com/bazelbuild/rules_go/go/tools/bazel"
+	cmdshared "github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
-	cmdshared "github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/testing/endtoend/helpers"
 	e2e "github.com/prysmaticlabs/prysm/testing/endtoend/params"

testing/endtoend/components/validator.go

@@ -17,11 +17,11 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
+	cmdshared "github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/config/features"
 	contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	cmdshared "github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/testing/endtoend/helpers"

tools/benchmark-files-gen/BUILD.bazel

@@ -16,7 +16,7 @@ go_library(
         "//io/file:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//proto/prysm/v1alpha1/wrapper:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/params:go_default_library",
         "//shared/testutil:go_default_library",
         "//testing/benchmark:go_default_library",

tools/benchmark-files-gen/main.go

@@ -18,7 +18,7 @@ import (
 	"github.com/prysmaticlabs/prysm/io/file"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/testutil"
 	"github.com/prysmaticlabs/prysm/testing/benchmark"

tools/genesis-state-gen/BUILD.bazel

@@ -12,7 +12,7 @@ go_library(
     deps = [
         "//io/file:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/params:go_default_library",
         "@com_github_ghodss_yaml//:go_default_library",
     ],
@@ -57,7 +57,7 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//crypto/bls:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",
     ],

tools/genesis-state-gen/main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/prysmaticlabs/prysm/io/file"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 

tools/genesis-state-gen/main_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/crypto/bls"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 )

tools/unencrypted-keys-gen/BUILD.bazel

@@ -10,7 +10,7 @@ go_library(
     ],
     deps = [
         "//crypto/bls:go_default_library",
-        "//shared/interop:go_default_library",
+        "//runtime/interop:go_default_library",
         "//tools/unencrypted-keys-gen/keygen:go_default_library",
     ],
 )

tools/unencrypted-keys-gen/main.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/prysmaticlabs/prysm/crypto/bls"
-	"github.com/prysmaticlabs/prysm/shared/interop"
+	"github.com/prysmaticlabs/prysm/runtime/interop"
 	"github.com/prysmaticlabs/prysm/tools/unencrypted-keys-gen/keygen"
 )
 

validator/accounts/BUILD.bazel

@@ -25,16 +25,16 @@ go_library(
     deps = [
         "//api/grpc:go_default_library",
         "//beacon-chain/core/blocks:go_default_library",
+        "//cmd:go_default_library",
         "//cmd/validator/flags:go_default_library",
         "//crypto/bls:go_default_library",
         "//io/file:go_default_library",
         "//io/prompt:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/params:go_default_library",
-        "//shared/petnames:go_default_library",
         "//validator/accounts/iface:go_default_library",
+        "//validator/accounts/petnames:go_default_library",
         "//validator/accounts/userprompt:go_default_library",
         "//validator/accounts/wallet:go_default_library",
         "//validator/client:go_default_library",
@@ -78,12 +78,12 @@ go_test(
         "//proto/prysm/v1alpha1/validator-client:go_default_library",
         "//shared/bytesutil:go_default_library",
         "//shared/params:go_default_library",
-        "//shared/petnames:go_default_library",
         "//shared/testutil/assert:go_default_library",
         "//shared/testutil/require:go_default_library",
         "//testing/mock:go_default_library",
         "//time:go_default_library",
         "//validator/accounts/iface:go_default_library",
+        "//validator/accounts/petnames:go_default_library",
         "//validator/accounts/wallet:go_default_library",
         "//validator/keymanager:go_default_library",
         "//validator/keymanager/derived:go_default_library",

validator/accounts/accounts_backup.go

@@ -17,8 +17,8 @@ import (
 	"github.com/prysmaticlabs/prysm/io/file"
 	"github.com/prysmaticlabs/prysm/io/prompt"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
+	"github.com/prysmaticlabs/prysm/validator/accounts/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/userprompt"
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"

validator/accounts/accounts_exit.go

@@ -11,11 +11,11 @@ import (
 	"github.com/pkg/errors"
 	grpcutil "github.com/prysmaticlabs/prysm/api/grpc"
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
+	"github.com/prysmaticlabs/prysm/cmd"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	"github.com/prysmaticlabs/prysm/io/prompt"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
 	"github.com/prysmaticlabs/prysm/validator/accounts/userprompt"

validator/accounts/accounts_list.go

@@ -11,8 +11,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/shared/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
+	"github.com/prysmaticlabs/prysm/validator/accounts/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/derived"

validator/accounts/accounts_list_test.go

@@ -18,10 +18,10 @@ import (
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 	validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/petnames"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
 	"github.com/prysmaticlabs/prysm/shared/testutil/require"
 	"github.com/prysmaticlabs/prysm/testing/mock"
+	"github.com/prysmaticlabs/prysm/validator/accounts/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/derived"

validator/accounts/petnames/BUILD.bazel

@@ -3,8 +3,8 @@ load("@prysm//tools/go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["names.go"],
-    importpath = "github.com/prysmaticlabs/prysm/shared/petnames",
+    importpath = "github.com/prysmaticlabs/prysm/validator/accounts/petnames",
-    visibility = ["//visibility:public"],
+    visibility = ["//validator:__subpackages__"],
     deps = [
         "//crypto/hash:go_default_library",
         "//crypto/rand:go_default_library",

validator/client/BUILD.bazel

@@ -36,12 +36,12 @@ go_library(
         "//monitoring/tracing:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
         "//proto/prysm/v1alpha1/block:go_default_library",
+        "//proto/prysm/v1alpha1/slashings:go_default_library",
         "//proto/prysm/v1alpha1/validator-client:go_default_library",
         "//proto/prysm/v1alpha1/wrapper:go_default_library",
         "//runtime/version:go_default_library",
         "//shared/bytesutil:go_default_library",
         "//shared/params:go_default_library",
-        "//shared/slashutil:go_default_library",
         "//time:go_default_library",
         "//time/slots:go_default_library",
         "//validator/accounts/iface:go_default_library",