From 495e92ce9f0f4f58410d8eb37477d1df61a63617 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 16 Sep 2021 04:46:29 -0500 Subject: [PATCH] Create Runtime Package for Moving Several Packages in Shared/ (#9588) * add maxprocs * add prereqs * add tos and version pkg * add in all runtime packages Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- beacon-chain/blockchain/BUILD.bazel | 2 +- beacon-chain/blockchain/log.go | 2 +- beacon-chain/blockchain/metrics.go | 2 +- beacon-chain/core/BUILD.bazel | 2 +- beacon-chain/core/blocks/BUILD.bazel | 2 +- beacon-chain/core/blocks/attester_slashing.go | 2 +- beacon-chain/core/blocks/proposer_slashing.go | 2 +- beacon-chain/core/slot_epoch.go | 2 +- beacon-chain/core/transition/BUILD.bazel | 4 ++-- beacon-chain/core/transition/transition.go | 2 +- beacon-chain/core/transition/transition_no_verify_sig.go | 2 +- beacon-chain/core/transition/transition_test.go | 2 +- beacon-chain/db/kv/BUILD.bazel | 2 +- beacon-chain/db/kv/blocks.go | 2 +- beacon-chain/node/BUILD.bazel | 6 +++--- beacon-chain/node/node.go | 8 ++++---- beacon-chain/p2p/BUILD.bazel | 4 ++-- beacon-chain/p2p/discovery.go | 2 +- beacon-chain/p2p/discovery_test.go | 2 +- beacon-chain/p2p/options.go | 2 +- beacon-chain/rpc/eth/debug/BUILD.bazel | 2 +- beacon-chain/rpc/eth/debug/debug.go | 2 +- beacon-chain/rpc/eth/node/BUILD.bazel | 4 ++-- beacon-chain/rpc/eth/node/node.go | 2 +- beacon-chain/rpc/eth/node/node_test.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel | 4 ++-- beacon-chain/rpc/prysm/v1alpha1/node/server.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/node/server_test.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel | 2 +- beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go | 2 +- .../rpc/prysm/v1alpha1/validator/proposer_attestations.go | 2 +- beacon-chain/server/BUILD.bazel | 2 +- beacon-chain/server/main.go | 2 +- beacon-chain/state/fieldtrie/BUILD.bazel | 2 +- beacon-chain/state/fieldtrie/field_trie_helpers.go | 2 +- beacon-chain/state/stategen/BUILD.bazel | 4 ++-- beacon-chain/state/stategen/replay.go | 2 +- beacon-chain/state/stategen/replay_test.go | 2 +- beacon-chain/state/types/BUILD.bazel | 2 +- beacon-chain/state/types/types.go | 2 +- beacon-chain/state/v1/BUILD.bazel | 2 +- beacon-chain/state/v1/getters_misc.go | 2 +- beacon-chain/state/v2/BUILD.bazel | 2 +- beacon-chain/state/v2/getters.go | 2 +- beacon-chain/sync/BUILD.bazel | 2 +- beacon-chain/sync/rpc_chunked_response.go | 2 +- beacon-chain/sync/rpc_metadata.go | 2 +- cmd/beacon-chain/BUILD.bazel | 8 ++++---- cmd/beacon-chain/db/BUILD.bazel | 2 +- cmd/beacon-chain/db/db.go | 2 +- cmd/beacon-chain/main.go | 8 ++++---- cmd/beacon-chain/usage.go | 2 +- cmd/client-stats/BUILD.bazel | 2 +- cmd/client-stats/main.go | 2 +- cmd/slasher/BUILD.bazel | 6 +++--- cmd/slasher/main.go | 6 +++--- cmd/slasher/usage.go | 2 +- cmd/validator/BUILD.bazel | 8 ++++---- cmd/validator/accounts/BUILD.bazel | 2 +- cmd/validator/accounts/accounts.go | 2 +- cmd/validator/db/BUILD.bazel | 2 +- cmd/validator/db/db.go | 2 +- cmd/validator/main.go | 8 ++++---- cmd/validator/slashing-protection/BUILD.bazel | 2 +- cmd/validator/slashing-protection/slashing-protection.go | 2 +- cmd/validator/usage.go | 2 +- cmd/validator/wallet/BUILD.bazel | 2 +- cmd/validator/wallet/wallet.go | 2 +- deps.bzl | 4 ++-- monitoring/tracing/BUILD.bazel | 2 +- monitoring/tracing/tracer.go | 2 +- proto/prysm/v1alpha1/wrapper/BUILD.bazel | 4 ++-- proto/prysm/v1alpha1/wrapper/beacon_block.go | 2 +- proto/prysm/v1alpha1/wrapper/beacon_block_test.go | 2 +- proto/prysm/v1alpha1/wrapper/metadata.go | 2 +- {shared => runtime}/debug/BUILD.bazel | 2 +- {shared => runtime}/debug/cgo_symbolizer.go | 0 {shared => runtime}/debug/debug.go | 0 {shared => runtime}/debug/maxprocs_metric.go | 0 {shared => runtime}/maxprocs/BUILD.bazel | 2 +- {shared => runtime}/maxprocs/maxprocs.go | 0 {shared/prereq => runtime/prereqs}/BUILD.bazel | 2 +- {shared/prereq => runtime/prereqs}/prereq.go | 2 +- {shared/prereq => runtime/prereqs}/prereq_test.go | 2 +- {shared => runtime}/tos/BUILD.bazel | 2 +- {shared => runtime}/tos/tos.go | 0 {shared => runtime}/tos/tos_test.go | 0 {shared => runtime}/version/BUILD.bazel | 2 +- {shared => runtime}/version/fork.go | 0 {shared => runtime}/version/metrics.go | 0 {shared => runtime}/version/version.go | 0 shared/testutil/BUILD.bazel | 2 +- shared/testutil/attestation.go | 2 +- shared/testutil/sync_aggregate.go | 2 +- slasher/db/BUILD.bazel | 2 +- slasher/db/cmd.go | 2 +- slasher/node/BUILD.bazel | 6 +++--- slasher/node/node.go | 8 ++++---- tools/bootnode/BUILD.bazel | 6 +++--- tools/bootnode/bootnode.go | 4 ++-- tools/bootnode/bootnode_test.go | 2 +- tools/deployContract/BUILD.bazel | 2 +- tools/deployContract/deployContract.go | 2 +- tools/drainContracts/BUILD.bazel | 2 +- tools/drainContracts/drainContracts.go | 2 +- tools/enr-calculator/BUILD.bazel | 2 +- tools/enr-calculator/main.go | 2 +- tools/eth1exporter/BUILD.bazel | 2 +- tools/eth1exporter/main.go | 2 +- tools/pcli/BUILD.bazel | 2 +- tools/pcli/main.go | 2 +- validator/client/BUILD.bazel | 2 +- validator/client/propose.go | 4 ++-- validator/node/BUILD.bazel | 6 +++--- validator/node/node.go | 8 ++++---- validator/rpc/BUILD.bazel | 2 +- validator/rpc/health.go | 2 +- 120 files changed, 153 insertions(+), 153 deletions(-) rename {shared => runtime}/debug/BUILD.bazel (93%) rename {shared => runtime}/debug/cgo_symbolizer.go (100%) rename {shared => runtime}/debug/debug.go (100%) rename {shared => runtime}/debug/maxprocs_metric.go (100%) rename {shared => runtime}/maxprocs/BUILD.bazel (82%) rename {shared => runtime}/maxprocs/maxprocs.go (100%) rename {shared/prereq => runtime/prereqs}/BUILD.bazel (90%) rename {shared/prereq => runtime/prereqs}/prereq.go (99%) rename {shared/prereq => runtime/prereqs}/prereq_test.go (99%) rename {shared => runtime}/tos/BUILD.bazel (92%) rename {shared => runtime}/tos/tos.go (100%) rename {shared => runtime}/tos/tos_test.go (100%) rename {shared => runtime}/version/BUILD.bazel (89%) rename {shared => runtime}/version/fork.go (100%) rename {shared => runtime}/version/metrics.go (100%) rename {shared => runtime}/version/version.go (100%) diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index d5539476f..c0a171d2b 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -52,11 +52,11 @@ go_library( "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", + "//runtime/version:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/mputil:go_default_library", "//shared/params:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", "@com_github_emicklei_dot//:go_default_library", diff --git a/beacon-chain/blockchain/log.go b/beacon-chain/blockchain/log.go index aca309369..1fe76b725 100644 --- a/beacon-chain/blockchain/log.go +++ b/beacon-chain/blockchain/log.go @@ -8,8 +8,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" 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/params" - "github.com/prysmaticlabs/prysm/shared/version" prysmTime "github.com/prysmaticlabs/prysm/time" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/metrics.go b/beacon-chain/blockchain/metrics.go index a240e9a0c..d59cd6049 100644 --- a/beacon-chain/blockchain/metrics.go +++ b/beacon-chain/blockchain/metrics.go @@ -12,9 +12,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" 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/params" - "github.com/prysmaticlabs/prysm/shared/version" ) var ( diff --git a/beacon-chain/core/BUILD.bazel b/beacon-chain/core/BUILD.bazel index 3f3a67abc..7f08ec05f 100644 --- a/beacon-chain/core/BUILD.bazel +++ b/beacon-chain/core/BUILD.bazel @@ -23,8 +23,8 @@ go_library( ], deps = [ "//beacon-chain/state:go_default_library", + "//runtime/version:go_default_library", "//shared/params:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "@com_github_ethereum_go_ethereum//common/math:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/core/blocks/BUILD.bazel b/beacon-chain/core/blocks/BUILD.bazel index 798012f94..ee621171a 100644 --- a/beacon-chain/core/blocks/BUILD.bazel +++ b/beacon-chain/core/blocks/BUILD.bazel @@ -32,6 +32,7 @@ go_library( "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", + "//runtime/version:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/depositutil:go_default_library", @@ -41,7 +42,6 @@ go_library( "//shared/slashutil:go_default_library", "//shared/sliceutil:go_default_library", "//shared/trieutil:go_default_library", - "//shared/version: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", diff --git a/beacon-chain/core/blocks/attester_slashing.go b/beacon-chain/core/blocks/attester_slashing.go index 23e7c9786..49fc312a5 100644 --- a/beacon-chain/core/blocks/attester_slashing.go +++ b/beacon-chain/core/blocks/attester_slashing.go @@ -10,11 +10,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/shared/sliceutil" - "github.com/prysmaticlabs/prysm/shared/version" ) // ProcessAttesterSlashings is one of the operations performed diff --git a/beacon-chain/core/blocks/proposer_slashing.go b/beacon-chain/core/blocks/proposer_slashing.go index bc8699082..a44bf5c31 100644 --- a/beacon-chain/core/blocks/proposer_slashing.go +++ b/beacon-chain/core/blocks/proposer_slashing.go @@ -10,8 +10,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/slot_epoch.go b/beacon-chain/core/slot_epoch.go index 23a50951a..ce1d9ed10 100644 --- a/beacon-chain/core/slot_epoch.go +++ b/beacon-chain/core/slot_epoch.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" prysmTime "github.com/prysmaticlabs/prysm/time" ) diff --git a/beacon-chain/core/transition/BUILD.bazel b/beacon-chain/core/transition/BUILD.bazel index a7e6db0bf..706a7ab1a 100644 --- a/beacon-chain/core/transition/BUILD.bazel +++ b/beacon-chain/core/transition/BUILD.bazel @@ -42,10 +42,10 @@ go_library( "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", - "//shared/version:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", @@ -86,13 +86,13 @@ go_test( "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "//testing/benchmark:go_default_library", "@com_github_google_gofuzz//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/beacon-chain/core/transition/transition.go b/beacon-chain/core/transition/transition.go index c8f864600..6f0c4fe5e 100644 --- a/beacon-chain/core/transition/transition.go +++ b/beacon-chain/core/transition/transition.go @@ -19,9 +19,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/monitoring/tracing" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/transition/transition_no_verify_sig.go b/beacon-chain/core/transition/transition_no_verify_sig.go index 4722c0357..045d4ff3f 100644 --- a/beacon-chain/core/transition/transition_no_verify_sig.go +++ b/beacon-chain/core/transition/transition_no_verify_sig.go @@ -16,7 +16,7 @@ import ( "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/transition/transition_test.go b/beacon-chain/core/transition/transition_test.go index 3a2c35f84..5458ba080 100644 --- a/beacon-chain/core/transition/transition_test.go +++ b/beacon-chain/core/transition/transition_test.go @@ -16,13 +16,13 @@ import ( "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" ) func init() { diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel index cf7fa5531..0d1ad608e 100644 --- a/beacon-chain/db/kv/BUILD.bazel +++ b/beacon-chain/db/kv/BUILD.bazel @@ -49,11 +49,11 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/version:go_default_library", "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", diff --git a/beacon-chain/db/kv/blocks.go b/beacon-chain/db/kv/blocks.go index d5201ddb8..6fdce9897 100644 --- a/beacon-chain/db/kv/blocks.go +++ b/beacon-chain/db/kv/blocks.go @@ -13,10 +13,10 @@ import ( 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/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" - "github.com/prysmaticlabs/prysm/shared/version" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index d307e7716..9f97cfb7e 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -40,15 +40,15 @@ go_library( "//monitoring/backup:go_default_library", "//monitoring/prometheus:go_default_library", "//monitoring/tracing:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/prereqs:go_default_library", + "//runtime/version:go_default_library", "//shared:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/event:go_default_library", "//shared/gateway:go_default_library", "//shared/params:go_default_library", - "//shared/prereq:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index a00246a88..5f2082caa 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -41,15 +41,15 @@ import ( "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/monitoring/backup" "github.com/prysmaticlabs/prysm/monitoring/prometheus" + "github.com/prysmaticlabs/prysm/runtime/debug" + "github.com/prysmaticlabs/prysm/runtime/prereqs" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/debug" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/prereq" "github.com/prysmaticlabs/prysm/shared/sliceutil" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) @@ -86,7 +86,7 @@ func New(cliCtx *cli.Context) (*BeaconNode, error) { if err := configureTracing(cliCtx); err != nil { return nil, err } - prereq.WarnIfPlatformNotSupported(cliCtx.Context) + prereqs.WarnIfPlatformNotSupported(cliCtx.Context) features.ConfigureBeaconChain(cliCtx) cmd.ConfigureBeaconChain(cliCtx) flags.ConfigureGlobalFlags(cliCtx) diff --git a/beacon-chain/p2p/BUILD.bazel b/beacon-chain/p2p/BUILD.bazel index 853e8d151..c3693cf2b 100644 --- a/beacon-chain/p2p/BUILD.bazel +++ b/beacon-chain/p2p/BUILD.bazel @@ -59,6 +59,7 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", @@ -66,7 +67,6 @@ go_library( "//shared/p2putils:go_default_library", "//shared/params:go_default_library", "//shared/runutil:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", @@ -146,6 +146,7 @@ go_test( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/testing:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/iputils:go_default_library", @@ -154,7 +155,6 @@ go_test( "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//p2p/discover:go_default_library", diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index bd9c1efcf..48cafc0e5 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -17,8 +17,8 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" ) // Listener defines the discovery V5 network interface that is used diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index 334c5bff9..ff805ef22 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -32,12 +32,12 @@ import ( ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/iputils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/p2p/options.go b/beacon-chain/p2p/options.go index 7bb10e5a7..967c84650 100644 --- a/beacon-chain/p2p/options.go +++ b/beacon-chain/p2p/options.go @@ -11,7 +11,7 @@ import ( "github.com/libp2p/go-tcp-transport" ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" ) // buildOptions for the libp2p host. diff --git a/beacon-chain/rpc/eth/debug/BUILD.bazel b/beacon-chain/rpc/eth/debug/BUILD.bazel index d2bccddfa..f292b5340 100644 --- a/beacon-chain/rpc/eth/debug/BUILD.bazel +++ b/beacon-chain/rpc/eth/debug/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "//proto/eth/v1:go_default_library", "//proto/eth/v2:go_default_library", "//proto/migration:go_default_library", - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@io_opencensus_go//trace:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/beacon-chain/rpc/eth/debug/debug.go b/beacon-chain/rpc/eth/debug/debug.go index 09f8d879e..0fd611b9a 100644 --- a/beacon-chain/rpc/eth/debug/debug.go +++ b/beacon-chain/rpc/eth/debug/debug.go @@ -8,7 +8,7 @@ import ( ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" "github.com/prysmaticlabs/prysm/proto/migration" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/node/BUILD.bazel b/beacon-chain/rpc/eth/node/BUILD.bazel index 0ef819458..d24a67860 100644 --- a/beacon-chain/rpc/eth/node/BUILD.bazel +++ b/beacon-chain/rpc/eth/node/BUILD.bazel @@ -18,8 +18,8 @@ go_library( "//proto/eth/v1:go_default_library", "//proto/migration:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/grpcutils:go_default_library", - "//shared/version:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", "@com_github_pkg_errors//:go_default_library", "@io_opencensus_go//trace:go_default_library", @@ -48,11 +48,11 @@ go_test( "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/grpcutils:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", diff --git a/beacon-chain/rpc/eth/node/node.go b/beacon-chain/rpc/eth/node/node.go index b705ad472..50b5e7334 100644 --- a/beacon-chain/rpc/eth/node/node.go +++ b/beacon-chain/rpc/eth/node/node.go @@ -16,8 +16,8 @@ import ( ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" "github.com/prysmaticlabs/prysm/proto/migration" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/grpcutils" - "github.com/prysmaticlabs/prysm/shared/version" "go.opencensus.io/trace" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/node/node_test.go b/beacon-chain/rpc/eth/node/node_test.go index 15c3cb160..822326895 100644 --- a/beacon-chain/rpc/eth/node/node_test.go +++ b/beacon-chain/rpc/eth/node/node_test.go @@ -26,11 +26,11 @@ import ( ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel index 3f160da7c..648c71764 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel @@ -42,6 +42,7 @@ go_library( "//config/features:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", + "//runtime/version:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", @@ -50,7 +51,6 @@ go_library( "//shared/pagination:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/version:go_default_library", "//time/slots:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index cc6ceda63..963cf61c9 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -13,12 +13,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" 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/event" "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go index 3567454be..ebc09e233 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go @@ -15,11 +15,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" "github.com/prysmaticlabs/prysm/beacon-chain/state" 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/pagination" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel index 358fddd8a..85ca39aa7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "//beacon-chain/p2p:go_default_library", "//beacon-chain/sync:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/logutil:go_default_library", - "//shared/version:go_default_library", "@com_github_libp2p_go_libp2p_core//network:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", "@io_bazel_rules_go//proto/wkt:empty_go_proto", @@ -35,11 +35,11 @@ go_test( "//beacon-chain/p2p/testing:go_default_library", "//beacon-chain/sync/initial-sync/testing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server.go b/beacon-chain/rpc/prysm/v1alpha1/node/server.go index ec7a2af30..de865a721 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server.go @@ -19,8 +19,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/sync" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/logutil" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go index 75b79e51c..5f480eeaa 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go @@ -14,11 +14,11 @@ import ( mockP2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" 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/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc" "google.golang.org/grpc/reflection" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index 5943bf5f9..1957d3509 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -50,6 +50,7 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/aggregation/sync_contribution:go_default_library", @@ -59,7 +60,6 @@ go_library( "//shared/p2putils:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go index 5c809ccdc..6f8928f6d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go @@ -6,8 +6,8 @@ import ( blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go index 978d26b17..ad54d0d4a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go @@ -12,9 +12,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/features" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/aggregation" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" ) type proposerAtts []*ethpb.Attestation diff --git a/beacon-chain/server/BUILD.bazel b/beacon-chain/server/BUILD.bazel index 92f417a15..5dbebcdf8 100644 --- a/beacon-chain/server/BUILD.bazel +++ b/beacon-chain/server/BUILD.bazel @@ -12,8 +12,8 @@ go_library( deps = [ "//beacon-chain/gateway:go_default_library", "//beacon-chain/rpc/apimiddleware:go_default_library", + "//runtime/maxprocs:go_default_library", "//shared/gateway:go_default_library", - "//shared/maxprocs:go_default_library", "@com_github_joonix_log//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], diff --git a/beacon-chain/server/main.go b/beacon-chain/server/main.go index 04b58a0ad..aed87aa8a 100644 --- a/beacon-chain/server/main.go +++ b/beacon-chain/server/main.go @@ -12,8 +12,8 @@ import ( joonix "github.com/joonix/log" beaconGateway "github.com/prysmaticlabs/prysm/beacon-chain/gateway" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/apimiddleware" + _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" "github.com/prysmaticlabs/prysm/shared/gateway" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/state/fieldtrie/BUILD.bazel b/beacon-chain/state/fieldtrie/BUILD.bazel index bded299c7..3f7bc0dcf 100644 --- a/beacon-chain/state/fieldtrie/BUILD.bazel +++ b/beacon-chain/state/fieldtrie/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//beacon-chain/state/types:go_default_library", "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@com_github_pkg_errors//:go_default_library", ], ) diff --git a/beacon-chain/state/fieldtrie/field_trie_helpers.go b/beacon-chain/state/fieldtrie/field_trie_helpers.go index 5ea39f868..77aa4ac16 100644 --- a/beacon-chain/state/fieldtrie/field_trie_helpers.go +++ b/beacon-chain/state/fieldtrie/field_trie_helpers.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/types" "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" ) func (f *FieldTrie) validateIndices(idxs []uint64) error { diff --git a/beacon-chain/state/stategen/BUILD.bazel b/beacon-chain/state/stategen/BUILD.bazel index b93c2c16d..547f778b4 100644 --- a/beacon-chain/state/stategen/BUILD.bazel +++ b/beacon-chain/state/stategen/BUILD.bazel @@ -30,9 +30,9 @@ go_library( "//cache/lru:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", - "//shared/version:go_default_library", "@com_github_hashicorp_golang_lru//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", @@ -66,12 +66,12 @@ go_test( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block: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/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_sirupsen_logrus//hooks/test:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", diff --git a/beacon-chain/state/stategen/replay.go b/beacon-chain/state/stategen/replay.go index 1611983a7..57404b36d 100644 --- a/beacon-chain/state/stategen/replay.go +++ b/beacon-chain/state/stategen/replay.go @@ -12,8 +12,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" "github.com/prysmaticlabs/prysm/beacon-chain/state" "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/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/replay_test.go b/beacon-chain/state/stategen/replay_test.go index 9607f9db6..5a9a0895b 100644 --- a/beacon-chain/state/stategen/replay_test.go +++ b/beacon-chain/state/stategen/replay_test.go @@ -11,12 +11,12 @@ import ( 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/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/state/types/BUILD.bazel b/beacon-chain/state/types/BUILD.bazel index 3bca3ed5f..8f3fc17bc 100644 --- a/beacon-chain/state/types/BUILD.bazel +++ b/beacon-chain/state/types/BUILD.bazel @@ -5,7 +5,7 @@ go_library( srcs = ["types.go"], importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/types", visibility = ["//beacon-chain:__subpackages__"], - deps = ["//shared/version:go_default_library"], + deps = ["//runtime/version:go_default_library"], ) go_test( diff --git a/beacon-chain/state/types/types.go b/beacon-chain/state/types/types.go index 304cafcef..07adb24dc 100644 --- a/beacon-chain/state/types/types.go +++ b/beacon-chain/state/types/types.go @@ -1,7 +1,7 @@ package types import ( - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" ) // FieldIndex represents the relevant field position in the diff --git a/beacon-chain/state/v1/BUILD.bazel b/beacon-chain/state/v1/BUILD.bazel index 0c5ea582e..dc5b5043b 100644 --- a/beacon-chain/state/v1/BUILD.bazel +++ b/beacon-chain/state/v1/BUILD.bazel @@ -51,11 +51,11 @@ go_library( "//crypto/hash:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/version:go_default_library", "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", diff --git a/beacon-chain/state/v1/getters_misc.go b/beacon-chain/state/v1/getters_misc.go index 61036f03e..85b2c7e3f 100644 --- a/beacon-chain/state/v1/getters_misc.go +++ b/beacon-chain/state/v1/getters_misc.go @@ -7,10 +7,10 @@ import ( "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/crypto/hash" 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/htrutils" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" ) // GenesisTime of the beacon state as a uint64. diff --git a/beacon-chain/state/v2/BUILD.bazel b/beacon-chain/state/v2/BUILD.bazel index abd9600a3..179e19be6 100644 --- a/beacon-chain/state/v2/BUILD.bazel +++ b/beacon-chain/state/v2/BUILD.bazel @@ -33,11 +33,11 @@ go_library( "//crypto/hash:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", - "//shared/version:go_default_library", "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/beacon-chain/state/v2/getters.go b/beacon-chain/state/v2/getters.go index 9754bfd39..c0c796dd5 100644 --- a/beacon-chain/state/v2/getters.go +++ b/beacon-chain/state/v2/getters.go @@ -11,9 +11,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" 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/params" - "github.com/prysmaticlabs/prysm/shared/version" ) // InnerStateUnsafe returns the pointer value of the underlying diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index fd2d6e236..c6702594a 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -84,6 +84,7 @@ go_library( "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared:go_default_library", "//shared/abool:go_default_library", "//shared/bytesutil:go_default_library", @@ -94,7 +95,6 @@ go_library( "//shared/runutil:go_default_library", "//shared/sliceutil:go_default_library", "//shared/sszutil:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", diff --git a/beacon-chain/sync/rpc_chunked_response.go b/beacon-chain/sync/rpc_chunked_response.go index 6b5823fc5..d61bcf508 100644 --- a/beacon-chain/sync/rpc_chunked_response.go +++ b/beacon-chain/sync/rpc_chunked_response.go @@ -9,10 +9,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "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/p2putils" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" ) // chunkBlockWriter writes the given message as a chunked response to the given network diff --git a/beacon-chain/sync/rpc_metadata.go b/beacon-chain/sync/rpc_metadata.go index db21a66bb..196dbcdb7 100644 --- a/beacon-chain/sync/rpc_metadata.go +++ b/beacon-chain/sync/rpc_metadata.go @@ -15,10 +15,10 @@ import ( pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/metadata" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" ) // metaDataHandler reads the incoming metadata rpc request from the peer. diff --git a/cmd/beacon-chain/BUILD.bazel b/cmd/beacon-chain/BUILD.bazel index f9f3b9fee..728a77281 100644 --- a/cmd/beacon-chain/BUILD.bazel +++ b/cmd/beacon-chain/BUILD.bazel @@ -20,13 +20,13 @@ go_library( "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", "//monitoring/journald:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/maxprocs:go_default_library", + "//runtime/tos:go_default_library", + "//runtime/version:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/fileutil:go_default_library", "//shared/logutil:go_default_library", - "//shared/maxprocs:go_default_library", - "//shared/tos:go_default_library", - "//shared/version: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", diff --git a/cmd/beacon-chain/db/BUILD.bazel b/cmd/beacon-chain/db/BUILD.bazel index d9eb302ba..b9b183cfb 100644 --- a/cmd/beacon-chain/db/BUILD.bazel +++ b/cmd/beacon-chain/db/BUILD.bazel @@ -7,8 +7,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/db:go_default_library", + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", - "//shared/tos:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", ], diff --git a/cmd/beacon-chain/db/db.go b/cmd/beacon-chain/db/db.go index 3c6bf07ae..e999fb93a 100644 --- a/cmd/beacon-chain/db/db.go +++ b/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/runtime/tos" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/tos" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 96e015191..7d00e8f1b 100644 --- a/cmd/beacon-chain/main.go +++ b/cmd/beacon-chain/main.go @@ -16,13 +16,13 @@ import ( "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/monitoring/journald" + "github.com/prysmaticlabs/prysm/runtime/debug" + _ "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/shared/debug" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/logutil" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" - "github.com/prysmaticlabs/prysm/shared/tos" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" prefixed "github.com/x-cray/logrus-prefixed-formatter" diff --git a/cmd/beacon-chain/usage.go b/cmd/beacon-chain/usage.go index 50ed38e5e..6333a69fb 100644 --- a/cmd/beacon-chain/usage.go +++ b/cmd/beacon-chain/usage.go @@ -7,8 +7,8 @@ import ( "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/prysmaticlabs/prysm/shared/debug" "github.com/urfave/cli/v2" ) diff --git a/cmd/client-stats/BUILD.bazel b/cmd/client-stats/BUILD.bazel index 9c21b4231..24748965b 100644 --- a/cmd/client-stats/BUILD.bazel +++ b/cmd/client-stats/BUILD.bazel @@ -14,9 +14,9 @@ go_library( "//cmd/client-stats/flags:go_default_library", "//monitoring/clientstats:go_default_library", "//monitoring/journald:go_default_library", + "//runtime/version:go_default_library", "//shared/cmd:go_default_library", "//shared/logutil:go_default_library", - "//shared/version: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", diff --git a/cmd/client-stats/main.go b/cmd/client-stats/main.go index b55ee3540..f1679f80a 100644 --- a/cmd/client-stats/main.go +++ b/cmd/client-stats/main.go @@ -10,9 +10,9 @@ import ( "github.com/prysmaticlabs/prysm/cmd/client-stats/flags" "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/prysmaticlabs/prysm/shared/logutil" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" prefixed "github.com/x-cray/logrus-prefixed-formatter" diff --git a/cmd/slasher/BUILD.bazel b/cmd/slasher/BUILD.bazel index 65a2b34c1..6123b9010 100644 --- a/cmd/slasher/BUILD.bazel +++ b/cmd/slasher/BUILD.bazel @@ -17,11 +17,11 @@ go_library( "//cmd/slasher/flags:go_default_library", "//config/features:go_default_library", "//monitoring/journald:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/tos:go_default_library", + "//runtime/version:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/logutil:go_default_library", - "//shared/tos:go_default_library", - "//shared/version:go_default_library", "//slasher/db:go_default_library", "//slasher/node:go_default_library", "@com_github_joonix_log//:go_default_library", diff --git a/cmd/slasher/main.go b/cmd/slasher/main.go index f75948594..e24fdd909 100644 --- a/cmd/slasher/main.go +++ b/cmd/slasher/main.go @@ -12,11 +12,11 @@ import ( "github.com/prysmaticlabs/prysm/cmd/slasher/flags" "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/monitoring/journald" + "github.com/prysmaticlabs/prysm/runtime/debug" + "github.com/prysmaticlabs/prysm/runtime/tos" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/debug" "github.com/prysmaticlabs/prysm/shared/logutil" - "github.com/prysmaticlabs/prysm/shared/tos" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/prysmaticlabs/prysm/slasher/db" "github.com/prysmaticlabs/prysm/slasher/node" "github.com/sirupsen/logrus" diff --git a/cmd/slasher/usage.go b/cmd/slasher/usage.go index c7444ddab..17c4576ee 100644 --- a/cmd/slasher/usage.go +++ b/cmd/slasher/usage.go @@ -7,8 +7,8 @@ import ( "github.com/prysmaticlabs/prysm/cmd/slasher/flags" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/runtime/debug" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/debug" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/BUILD.bazel b/cmd/validator/BUILD.bazel index a504f4ae8..2b880a0e9 100644 --- a/cmd/validator/BUILD.bazel +++ b/cmd/validator/BUILD.bazel @@ -22,13 +22,13 @@ go_library( "//cmd/validator/wallet:go_default_library", "//config/features:go_default_library", "//monitoring/journald:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/maxprocs:go_default_library", + "//runtime/tos:go_default_library", + "//runtime/version:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/fileutil:go_default_library", "//shared/logutil:go_default_library", - "//shared/maxprocs:go_default_library", - "//shared/tos:go_default_library", - "//shared/version:go_default_library", "//validator/node:go_default_library", "@com_github_joonix_log//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/cmd/validator/accounts/BUILD.bazel b/cmd/validator/accounts/BUILD.bazel index 41bea0427..d22713bfc 100644 --- a/cmd/validator/accounts/BUILD.bazel +++ b/cmd/validator/accounts/BUILD.bazel @@ -8,8 +8,8 @@ go_library( deps = [ "//cmd/validator/flags:go_default_library", "//config/features:go_default_library", + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", - "//shared/tos:go_default_library", "//validator/accounts:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", diff --git a/cmd/validator/accounts/accounts.go b/cmd/validator/accounts/accounts.go index 1f3f68103..1356ef54d 100644 --- a/cmd/validator/accounts/accounts.go +++ b/cmd/validator/accounts/accounts.go @@ -5,8 +5,8 @@ import ( "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/shared/tos" "github.com/prysmaticlabs/prysm/validator/accounts" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cmd/validator/db/BUILD.bazel b/cmd/validator/db/BUILD.bazel index 156bb95eb..422df44cc 100644 --- a/cmd/validator/db/BUILD.bazel +++ b/cmd/validator/db/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/cmd/validator/db", visibility = ["//visibility:public"], deps = [ + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", - "//shared/tos:go_default_library", "//validator/db:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", diff --git a/cmd/validator/db/db.go b/cmd/validator/db/db.go index f0a5ace20..0de940cb7 100644 --- a/cmd/validator/db/db.go +++ b/cmd/validator/db/db.go @@ -1,8 +1,8 @@ package db import ( + "github.com/prysmaticlabs/prysm/runtime/tos" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/tos" validatordb "github.com/prysmaticlabs/prysm/validator/db" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cmd/validator/main.go b/cmd/validator/main.go index b814b1be0..b5fdf8e3a 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -18,13 +18,13 @@ import ( walletcommands "github.com/prysmaticlabs/prysm/cmd/validator/wallet" "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/monitoring/journald" + "github.com/prysmaticlabs/prysm/runtime/debug" + _ "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/shared/debug" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/logutil" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" - "github.com/prysmaticlabs/prysm/shared/tos" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/prysmaticlabs/prysm/validator/node" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cmd/validator/slashing-protection/BUILD.bazel b/cmd/validator/slashing-protection/BUILD.bazel index b9d7c9b30..90567db15 100644 --- a/cmd/validator/slashing-protection/BUILD.bazel +++ b/cmd/validator/slashing-protection/BUILD.bazel @@ -8,8 +8,8 @@ go_library( deps = [ "//cmd/validator/flags:go_default_library", "//config/features:go_default_library", + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", - "//shared/tos:go_default_library", "//validator/slashing-protection:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", diff --git a/cmd/validator/slashing-protection/slashing-protection.go b/cmd/validator/slashing-protection/slashing-protection.go index ef2507a8d..d33e2d385 100644 --- a/cmd/validator/slashing-protection/slashing-protection.go +++ b/cmd/validator/slashing-protection/slashing-protection.go @@ -3,8 +3,8 @@ package slashing_protection import ( "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/shared/tos" slashingprotection "github.com/prysmaticlabs/prysm/validator/slashing-protection" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/cmd/validator/usage.go b/cmd/validator/usage.go index ac6339c3c..ddb52cecb 100644 --- a/cmd/validator/usage.go +++ b/cmd/validator/usage.go @@ -7,8 +7,8 @@ import ( "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/prysmaticlabs/prysm/shared/debug" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/wallet/BUILD.bazel b/cmd/validator/wallet/BUILD.bazel index 521d3ec6a..c419645ef 100644 --- a/cmd/validator/wallet/BUILD.bazel +++ b/cmd/validator/wallet/BUILD.bazel @@ -8,8 +8,8 @@ go_library( deps = [ "//cmd/validator/flags:go_default_library", "//config/features:go_default_library", + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", - "//shared/tos:go_default_library", "//validator/accounts:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", diff --git a/cmd/validator/wallet/wallet.go b/cmd/validator/wallet/wallet.go index dec1a1bfe..2b1213345 100644 --- a/cmd/validator/wallet/wallet.go +++ b/cmd/validator/wallet/wallet.go @@ -3,8 +3,8 @@ package wallet import ( "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/shared/tos" "github.com/prysmaticlabs/prysm/validator/accounts" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/deps.bzl b/deps.bzl index 4f2f26685..28208d3fb 100644 --- a/deps.bzl +++ b/deps.bzl @@ -4217,8 +4217,8 @@ def prysm_deps(): name = "org_uber_go_automaxprocs", build_directives = [ # Do not use this library directly. - # Rather, load maxprocs from github.com/prysmaticlabs/shared/maxprocs. - "gazelle:go_visibility @prysm//shared/maxprocs:__pkg__", + # Rather, load maxprocs from github.com/prysmaticlabs/runtime/maxprocs. + "gazelle:go_visibility @prysm//runtime/maxprocs:__pkg__", ], importpath = "go.uber.org/automaxprocs", sum = "h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0=", diff --git a/monitoring/tracing/BUILD.bazel b/monitoring/tracing/BUILD.bazel index e3799fb94..e979b7cb1 100644 --- a/monitoring/tracing/BUILD.bazel +++ b/monitoring/tracing/BUILD.bazel @@ -10,7 +10,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/monitoring/tracing", visibility = ["//visibility:public"], deps = [ - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_opencensus_go//trace:go_default_library", "@io_opencensus_go_contrib_exporter_jaeger//:go_default_library", diff --git a/monitoring/tracing/tracer.go b/monitoring/tracing/tracer.go index afd821c07..952678d38 100644 --- a/monitoring/tracing/tracer.go +++ b/monitoring/tracing/tracer.go @@ -6,7 +6,7 @@ import ( "errors" "contrib.go.opencensus.io/exporter/jaeger" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/proto/prysm/v1alpha1/wrapper/BUILD.bazel b/proto/prysm/v1alpha1/wrapper/BUILD.bazel index e510f3eed..cd0cc34a9 100644 --- a/proto/prysm/v1alpha1/wrapper/BUILD.bazel +++ b/proto/prysm/v1alpha1/wrapper/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", @@ -26,11 +26,11 @@ go_test( deps = [ ":go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", - "//shared/version:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], ) diff --git a/proto/prysm/v1alpha1/wrapper/beacon_block.go b/proto/prysm/v1alpha1/wrapper/beacon_block.go index 2ae08f1ec..830bc71ce 100644 --- a/proto/prysm/v1alpha1/wrapper/beacon_block.go +++ b/proto/prysm/v1alpha1/wrapper/beacon_block.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "google.golang.org/protobuf/proto" ) diff --git a/proto/prysm/v1alpha1/wrapper/beacon_block_test.go b/proto/prysm/v1alpha1/wrapper/beacon_block_test.go index 3a4d3844f..6335415eb 100644 --- a/proto/prysm/v1alpha1/wrapper/beacon_block_test.go +++ b/proto/prysm/v1alpha1/wrapper/beacon_block_test.go @@ -8,11 +8,11 @@ import ( ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" - "github.com/prysmaticlabs/prysm/shared/version" ) func TestAltairSignedBeaconBlock_Signature(t *testing.T) { diff --git a/proto/prysm/v1alpha1/wrapper/metadata.go b/proto/prysm/v1alpha1/wrapper/metadata.go index c07143292..fed523654 100644 --- a/proto/prysm/v1alpha1/wrapper/metadata.go +++ b/proto/prysm/v1alpha1/wrapper/metadata.go @@ -4,7 +4,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" metadata "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "google.golang.org/protobuf/proto" ) diff --git a/shared/debug/BUILD.bazel b/runtime/debug/BUILD.bazel similarity index 93% rename from shared/debug/BUILD.bazel rename to runtime/debug/BUILD.bazel index 17bb79d11..8267976f2 100644 --- a/shared/debug/BUILD.bazel +++ b/runtime/debug/BUILD.bazel @@ -15,7 +15,7 @@ go_library( ":use_cgosymbolizer": ["cgo_symbolizer.go"], "//conditions:default": [], }), - importpath = "github.com/prysmaticlabs/prysm/shared/debug", + importpath = "github.com/prysmaticlabs/prysm/runtime/debug", visibility = ["//visibility:public"], deps = [ "@com_github_fjl_memsize//memsizeui:go_default_library", diff --git a/shared/debug/cgo_symbolizer.go b/runtime/debug/cgo_symbolizer.go similarity index 100% rename from shared/debug/cgo_symbolizer.go rename to runtime/debug/cgo_symbolizer.go diff --git a/shared/debug/debug.go b/runtime/debug/debug.go similarity index 100% rename from shared/debug/debug.go rename to runtime/debug/debug.go diff --git a/shared/debug/maxprocs_metric.go b/runtime/debug/maxprocs_metric.go similarity index 100% rename from shared/debug/maxprocs_metric.go rename to runtime/debug/maxprocs_metric.go diff --git a/shared/maxprocs/BUILD.bazel b/runtime/maxprocs/BUILD.bazel similarity index 82% rename from shared/maxprocs/BUILD.bazel rename to runtime/maxprocs/BUILD.bazel index c3eb62adf..b2d404db8 100644 --- a/shared/maxprocs/BUILD.bazel +++ b/runtime/maxprocs/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["maxprocs.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/maxprocs", + importpath = "github.com/prysmaticlabs/prysm/runtime/maxprocs", visibility = ["//visibility:public"], deps = [ "@com_github_sirupsen_logrus//:go_default_library", diff --git a/shared/maxprocs/maxprocs.go b/runtime/maxprocs/maxprocs.go similarity index 100% rename from shared/maxprocs/maxprocs.go rename to runtime/maxprocs/maxprocs.go diff --git a/shared/prereq/BUILD.bazel b/runtime/prereqs/BUILD.bazel similarity index 90% rename from shared/prereq/BUILD.bazel rename to runtime/prereqs/BUILD.bazel index dfde43ebb..0061fc3ab 100644 --- a/shared/prereq/BUILD.bazel +++ b/runtime/prereqs/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["prereq.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/prereq", + importpath = "github.com/prysmaticlabs/prysm/runtime/prereqs", visibility = ["//visibility:public"], deps = [ "@com_github_pkg_errors//:go_default_library", diff --git a/shared/prereq/prereq.go b/runtime/prereqs/prereq.go similarity index 99% rename from shared/prereq/prereq.go rename to runtime/prereqs/prereq.go index 29175657e..73b7c2f2a 100644 --- a/shared/prereq/prereq.go +++ b/runtime/prereqs/prereq.go @@ -1,4 +1,4 @@ -package prereq +package prereqs import ( "context" diff --git a/shared/prereq/prereq_test.go b/runtime/prereqs/prereq_test.go similarity index 99% rename from shared/prereq/prereq_test.go rename to runtime/prereqs/prereq_test.go index 2d1cb9ede..0b6334bce 100644 --- a/shared/prereq/prereq_test.go +++ b/runtime/prereqs/prereq_test.go @@ -1,4 +1,4 @@ -package prereq +package prereqs import ( "context" diff --git a/shared/tos/BUILD.bazel b/runtime/tos/BUILD.bazel similarity index 92% rename from shared/tos/BUILD.bazel rename to runtime/tos/BUILD.bazel index ea82bbefe..ef013f767 100644 --- a/shared/tos/BUILD.bazel +++ b/runtime/tos/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["tos.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/tos", + importpath = "github.com/prysmaticlabs/prysm/runtime/tos", visibility = ["//visibility:public"], deps = [ "//shared/cmd:go_default_library", diff --git a/shared/tos/tos.go b/runtime/tos/tos.go similarity index 100% rename from shared/tos/tos.go rename to runtime/tos/tos.go diff --git a/shared/tos/tos_test.go b/runtime/tos/tos_test.go similarity index 100% rename from shared/tos/tos_test.go rename to runtime/tos/tos_test.go diff --git a/shared/version/BUILD.bazel b/runtime/version/BUILD.bazel similarity index 89% rename from shared/version/BUILD.bazel rename to runtime/version/BUILD.bazel index ca8650dbb..f702b90be 100644 --- a/shared/version/BUILD.bazel +++ b/runtime/version/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "metrics.go", "version.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/version", + importpath = "github.com/prysmaticlabs/prysm/runtime/version", visibility = ["//visibility:public"], x_defs = { "gitCommit": "{STABLE_GIT_COMMIT}", diff --git a/shared/version/fork.go b/runtime/version/fork.go similarity index 100% rename from shared/version/fork.go rename to runtime/version/fork.go diff --git a/shared/version/metrics.go b/runtime/version/metrics.go similarity index 100% rename from shared/version/metrics.go rename to runtime/version/metrics.go diff --git a/shared/version/version.go b/runtime/version/version.go similarity index 100% rename from shared/version/version.go rename to runtime/version/version.go diff --git a/shared/testutil/BUILD.bazel b/shared/testutil/BUILD.bazel index b057e30c5..054fcca2a 100644 --- a/shared/testutil/BUILD.bazel +++ b/shared/testutil/BUILD.bazel @@ -33,11 +33,11 @@ go_library( "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/interop:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", - "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/shared/testutil/attestation.go b/shared/testutil/attestation.go index d7fdb651f..2fcbc200f 100644 --- a/shared/testutil/attestation.go +++ b/shared/testutil/attestation.go @@ -18,8 +18,8 @@ import ( "github.com/prysmaticlabs/prysm/crypto/rand" attv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" log "github.com/sirupsen/logrus" ) diff --git a/shared/testutil/sync_aggregate.go b/shared/testutil/sync_aggregate.go index 0ce36af8a..a6b1131c5 100644 --- a/shared/testutil/sync_aggregate.go +++ b/shared/testutil/sync_aggregate.go @@ -9,9 +9,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/crypto/bls" 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/params" - "github.com/prysmaticlabs/prysm/shared/version" ) func generateSyncAggregate(bState state.BeaconState, privs []bls.SecretKey, parentRoot [32]byte) (*ethpb.SyncAggregate, error) { diff --git a/slasher/db/BUILD.bazel b/slasher/db/BUILD.bazel index 9b48ea739..cc2b5eed6 100644 --- a/slasher/db/BUILD.bazel +++ b/slasher/db/BUILD.bazel @@ -15,10 +15,10 @@ go_library( "//slasher:__subpackages__", ], deps = [ + "//runtime/tos:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", "//shared/promptutil:go_default_library", - "//shared/tos:go_default_library", "//slasher/db/iface:go_default_library", "//slasher/db/kv:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/slasher/db/cmd.go b/slasher/db/cmd.go index bb6c57223..8b074d247 100644 --- a/slasher/db/cmd.go +++ b/slasher/db/cmd.go @@ -1,8 +1,8 @@ package db import ( + "github.com/prysmaticlabs/prysm/runtime/tos" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/tos" "github.com/urfave/cli/v2" ) diff --git a/slasher/node/BUILD.bazel b/slasher/node/BUILD.bazel index bb1687090..52208acd4 100644 --- a/slasher/node/BUILD.bazel +++ b/slasher/node/BUILD.bazel @@ -17,13 +17,13 @@ go_library( "//monitoring/backup:go_default_library", "//monitoring/prometheus:go_default_library", "//monitoring/tracing:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/prereqs:go_default_library", + "//runtime/version:go_default_library", "//shared:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", - "//shared/prereq:go_default_library", - "//shared/version:go_default_library", "//slasher/beaconclient:go_default_library", "//slasher/db:go_default_library", "//slasher/db/kv:go_default_library", diff --git a/slasher/node/node.go b/slasher/node/node.go index 2c0a097f1..bfd5ab7f9 100644 --- a/slasher/node/node.go +++ b/slasher/node/node.go @@ -18,13 +18,13 @@ import ( "github.com/prysmaticlabs/prysm/monitoring/backup" "github.com/prysmaticlabs/prysm/monitoring/prometheus" tracing2 "github.com/prysmaticlabs/prysm/monitoring/tracing" + "github.com/prysmaticlabs/prysm/runtime/debug" + "github.com/prysmaticlabs/prysm/runtime/prereqs" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/debug" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/prereq" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/prysmaticlabs/prysm/slasher/beaconclient" "github.com/prysmaticlabs/prysm/slasher/db" "github.com/prysmaticlabs/prysm/slasher/db/kv" @@ -63,7 +63,7 @@ func New(cliCtx *cli.Context) (*SlasherNode, error) { } // Warn if user's platform is not supported - prereq.WarnIfPlatformNotSupported(cliCtx.Context) + prereqs.WarnIfPlatformNotSupported(cliCtx.Context) if cliCtx.Bool(flags.EnableHistoricalDetectionFlag.Name) { // Set the max RPC size to 4096 as configured by --historical-slasher-node for optimal historical detection. diff --git a/tools/bootnode/BUILD.bazel b/tools/bootnode/BUILD.bazel index 85d828db5..93f9e239d 100644 --- a/tools/bootnode/BUILD.bazel +++ b/tools/bootnode/BUILD.bazel @@ -12,13 +12,13 @@ go_library( deps = [ "//beacon-chain/core/helpers:go_default_library", "//proto/prysm/v1alpha1:go_default_library", + "//runtime/maxprocs:go_default_library", + "//runtime/version:go_default_library", "//shared/bytesutil:go_default_library", "//shared/iputils:go_default_library", "//shared/logutil:go_default_library", - "//shared/maxprocs:go_default_library", "//shared/params:go_default_library", "//shared/runutil:go_default_library", - "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//log:go_default_library", "@com_github_ethereum_go_ethereum//p2p/discover:go_default_library", @@ -68,8 +68,8 @@ go_test( embed = [":go_default_library"], flaky = True, deps = [ + "//runtime/maxprocs:go_default_library", "//shared/iputils:go_default_library", - "//shared/maxprocs:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_ethereum_go_ethereum//p2p/discover:go_default_library", diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index 6f67de1b9..b752069a0 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -34,13 +34,13 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/iputils" "github.com/prysmaticlabs/prysm/shared/logutil" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/runutil" - "github.com/prysmaticlabs/prysm/shared/version" "github.com/sirupsen/logrus" ) diff --git a/tools/bootnode/bootnode_test.go b/tools/bootnode/bootnode_test.go index d5f624c29..24661694a 100644 --- a/tools/bootnode/bootnode_test.go +++ b/tools/bootnode/bootnode_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/libp2p/go-libp2p-core/crypto" + _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" "github.com/prysmaticlabs/prysm/shared/iputils" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/sirupsen/logrus" diff --git a/tools/deployContract/BUILD.bazel b/tools/deployContract/BUILD.bazel index 3fe8ea184..08d44c0e4 100644 --- a/tools/deployContract/BUILD.bazel +++ b/tools/deployContract/BUILD.bazel @@ -8,7 +8,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//contracts/deposit-contract:go_default_library", - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//accounts/keystore:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/tools/deployContract/deployContract.go b/tools/deployContract/deployContract.go index 19760cc15..57caea972 100644 --- a/tools/deployContract/deployContract.go +++ b/tools/deployContract/deployContract.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" prefixed "github.com/x-cray/logrus-prefixed-formatter" diff --git a/tools/drainContracts/BUILD.bazel b/tools/drainContracts/BUILD.bazel index 09c8a8d7e..de9dc5a90 100644 --- a/tools/drainContracts/BUILD.bazel +++ b/tools/drainContracts/BUILD.bazel @@ -8,7 +8,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//contracts/deposit-contract:go_default_library", - "//shared/version:go_default_library", + "//runtime/version:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//accounts/keystore:go_default_library", diff --git a/tools/drainContracts/drainContracts.go b/tools/drainContracts/drainContracts.go index 1ec79038c..e74a7e13e 100644 --- a/tools/drainContracts/drainContracts.go +++ b/tools/drainContracts/drainContracts.go @@ -19,7 +19,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" prefixed "github.com/x-cray/logrus-prefixed-formatter" diff --git a/tools/enr-calculator/BUILD.bazel b/tools/enr-calculator/BUILD.bazel index 8f378d87b..6498be10f 100644 --- a/tools/enr-calculator/BUILD.bazel +++ b/tools/enr-calculator/BUILD.bazel @@ -10,8 +10,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/enr-calculator", visibility = ["//visibility:private"], deps = [ + "//runtime/maxprocs:go_default_library", "//shared/fileutil:go_default_library", - "//shared/maxprocs:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", "@com_github_libp2p_go_libp2p_core//crypto:go_default_library", diff --git a/tools/enr-calculator/main.go b/tools/enr-calculator/main.go index 6a4bfdc2f..a5bf0c68d 100644 --- a/tools/enr-calculator/main.go +++ b/tools/enr-calculator/main.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p-core/crypto" + _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" "github.com/prysmaticlabs/prysm/shared/fileutil" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" log "github.com/sirupsen/logrus" ) diff --git a/tools/eth1exporter/BUILD.bazel b/tools/eth1exporter/BUILD.bazel index 58775676f..ba6132e5c 100644 --- a/tools/eth1exporter/BUILD.bazel +++ b/tools/eth1exporter/BUILD.bazel @@ -10,7 +10,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/eth1exporter", visibility = ["//visibility:private"], deps = [ - "//shared/maxprocs:go_default_library", + "//runtime/maxprocs:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//ethclient:go_default_library", "@com_github_ethereum_go_ethereum//params:go_default_library", diff --git a/tools/eth1exporter/main.go b/tools/eth1exporter/main.go index ce0615145..602d99d3b 100644 --- a/tools/eth1exporter/main.go +++ b/tools/eth1exporter/main.go @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/params" - _ "github.com/prysmaticlabs/prysm/shared/maxprocs" + _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" "github.com/sirupsen/logrus" ) diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index e11d0b028..dfeb6f574 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -14,8 +14,8 @@ go_library( "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/sszutil:go_default_library", - "//shared/version:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_kr_pretty//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/tools/pcli/main.go b/tools/pcli/main.go index fd0d94f28..d9af06a35 100644 --- a/tools/pcli/main.go +++ b/tools/pcli/main.go @@ -15,8 +15,8 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/sszutil" - "github.com/prysmaticlabs/prysm/shared/version" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" prefixed "github.com/x-cray/logrus-prefixed-formatter" diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 98655ec56..8ab288c69 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -34,6 +34,7 @@ go_library( "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", + "//runtime/version:go_default_library", "//shared/blockutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", @@ -42,7 +43,6 @@ go_library( "//shared/mputil:go_default_library", "//shared/params:go_default_library", "//shared/slashutil:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", "//validator/accounts/iface:go_default_library", diff --git a/validator/client/propose.go b/validator/client/propose.go index 34981350c..8d34b68c1 100644 --- a/validator/client/propose.go +++ b/validator/client/propose.go @@ -15,11 +15,11 @@ import ( ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - wrapper "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mputil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/version" prysmTime "github.com/prysmaticlabs/prysm/time" "github.com/prysmaticlabs/prysm/validator/client/iface" "github.com/sirupsen/logrus" diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel index 72efeec93..0102d0226 100644 --- a/validator/node/BUILD.bazel +++ b/validator/node/BUILD.bazel @@ -35,15 +35,15 @@ go_library( "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", + "//runtime/debug:go_default_library", + "//runtime/prereqs:go_default_library", + "//runtime/version:go_default_library", "//shared:go_default_library", "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", "//shared/gateway:go_default_library", "//shared/params:go_default_library", - "//shared/prereq:go_default_library", - "//shared/version:go_default_library", "//validator/accounts/iface:go_default_library", "//validator/accounts/wallet:go_default_library", "//validator/client:go_default_library", diff --git a/validator/node/node.go b/validator/node/node.go index a92276c14..1ac4b32f4 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -23,15 +23,15 @@ import ( tracing2 "github.com/prysmaticlabs/prysm/monitoring/tracing" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/runtime/debug" + "github.com/prysmaticlabs/prysm/runtime/prereqs" + "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/debug" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/prereq" - "github.com/prysmaticlabs/prysm/shared/version" accountsiface "github.com/prysmaticlabs/prysm/validator/accounts/iface" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" "github.com/prysmaticlabs/prysm/validator/client" @@ -82,7 +82,7 @@ func NewValidatorClient(cliCtx *cli.Context) (*ValidatorClient, error) { logrus.SetLevel(level) // Warn if user's platform is not supported - prereq.WarnIfPlatformNotSupported(cliCtx.Context) + prereqs.WarnIfPlatformNotSupported(cliCtx.Context) registry := shared.NewServiceRegistry() ctx, cancel := context.WithCancel(cliCtx.Context) diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index 1eb3207e7..c7327526d 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -22,6 +22,7 @@ go_library( "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", + "//runtime/version:go_default_library", "//shared/cmd:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", @@ -30,7 +31,6 @@ go_library( "//shared/pagination:go_default_library", "//shared/petnames:go_default_library", "//shared/promptutil:go_default_library", - "//shared/version:go_default_library", "//time:go_default_library", "//validator/accounts:go_default_library", "//validator/accounts/iface:go_default_library", diff --git a/validator/rpc/health.go b/validator/rpc/health.go index d33411ebc..f47d6fc1f 100644 --- a/validator/rpc/health.go +++ b/validator/rpc/health.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/version" + "github.com/prysmaticlabs/prysm/runtime/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb"