diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index 61b31ed853..5ddd69fb59 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -45,8 +45,8 @@ go_library( "//cmd/beacon-chain/flags:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", @@ -109,8 +109,8 @@ go_test( "//beacon-chain/state/v1:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", @@ -159,8 +159,8 @@ go_test( "//beacon-chain/p2p:go_default_library", "//beacon-chain/powchain:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/blockchain/chain_info.go b/beacon-chain/blockchain/chain_info.go index ac8ca94f64..daf8de943c 100644 --- a/beacon-chain/blockchain/chain_info.go +++ b/beacon-chain/blockchain/chain_info.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/chain_info_norace_test.go b/beacon-chain/blockchain/chain_info_norace_test.go index 72b168331a..7e2948119f 100644 --- a/beacon-chain/blockchain/chain_info_norace_test.go +++ b/beacon-chain/blockchain/chain_info_norace_test.go @@ -6,8 +6,8 @@ import ( testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/blockchain/chain_info_test.go b/beacon-chain/blockchain/chain_info_test.go index 06f069a6b0..57b61ec676 100644 --- a/beacon-chain/blockchain/chain_info_test.go +++ b/beacon-chain/blockchain/chain_info_test.go @@ -11,8 +11,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/blockchain/head_test.go b/beacon-chain/blockchain/head_test.go index 8d7d1f0149..753d23d9fd 100644 --- a/beacon-chain/blockchain/head_test.go +++ b/beacon-chain/blockchain/head_test.go @@ -11,8 +11,8 @@ import ( testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/blockchain/info_test.go b/beacon-chain/blockchain/info_test.go index b1899a4684..e3b99bf4f3 100644 --- a/beacon-chain/blockchain/info_test.go +++ b/beacon-chain/blockchain/info_test.go @@ -9,7 +9,7 @@ import ( testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/blockchain/log.go b/beacon-chain/blockchain/log.go index ac13689713..e14de004b4 100644 --- a/beacon-chain/blockchain/log.go +++ b/beacon-chain/blockchain/log.go @@ -6,8 +6,8 @@ import ( "time" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/timeutils" "github.com/sirupsen/logrus" diff --git a/beacon-chain/blockchain/log_test.go b/beacon-chain/blockchain/log_test.go index 1bd630cee2..2389869b98 100644 --- a/beacon-chain/blockchain/log_test.go +++ b/beacon-chain/blockchain/log_test.go @@ -3,9 +3,9 @@ package blockchain import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/metrics.go b/beacon-chain/blockchain/metrics.go index b660d34623..0a5bd1e4f6 100644 --- a/beacon-chain/blockchain/metrics.go +++ b/beacon-chain/blockchain/metrics.go @@ -8,8 +8,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/blockchain/metrics_test.go b/beacon-chain/blockchain/metrics_test.go index 1dca81451c..19ba577923 100644 --- a/beacon-chain/blockchain/metrics_test.go +++ b/beacon-chain/blockchain/metrics_test.go @@ -5,7 +5,7 @@ import ( "testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/blockchain/process_attestation.go b/beacon-chain/blockchain/process_attestation.go index 729d70340c..77218e98bc 100644 --- a/beacon-chain/blockchain/process_attestation.go +++ b/beacon-chain/blockchain/process_attestation.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/copyutil" diff --git a/beacon-chain/blockchain/process_attestation_helpers.go b/beacon-chain/blockchain/process_attestation_helpers.go index ad862f3e0f..9809327645 100644 --- a/beacon-chain/blockchain/process_attestation_helpers.go +++ b/beacon-chain/blockchain/process_attestation_helpers.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/mputil" diff --git a/beacon-chain/blockchain/process_attestation_test.go b/beacon-chain/blockchain/process_attestation_test.go index ef956daa63..496e7bf21f 100644 --- a/beacon-chain/blockchain/process_attestation_test.go +++ b/beacon-chain/blockchain/process_attestation_test.go @@ -11,8 +11,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index fecea78996..a0d29730e3 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -13,8 +13,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/blockchain/process_block_helpers.go b/beacon-chain/blockchain/process_block_helpers.go index 259d12240a..11498dd0f9 100644 --- a/beacon-chain/blockchain/process_block_helpers.go +++ b/beacon-chain/blockchain/process_block_helpers.go @@ -9,8 +9,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/beacon-chain/blockchain/process_block_test.go b/beacon-chain/blockchain/process_block_test.go index 095e8ccd3e..63851a530a 100644 --- a/beacon-chain/blockchain/process_block_test.go +++ b/beacon-chain/blockchain/process_block_test.go @@ -21,9 +21,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/receive_attestation.go b/beacon-chain/blockchain/receive_attestation.go index 57c51eb5b3..8f65a70f37 100644 --- a/beacon-chain/blockchain/receive_attestation.go +++ b/beacon-chain/blockchain/receive_attestation.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/slotutil" diff --git a/beacon-chain/blockchain/receive_attestation_test.go b/beacon-chain/blockchain/receive_attestation_test.go index eb20c7e40e..4bb7f40511 100644 --- a/beacon-chain/blockchain/receive_attestation_test.go +++ b/beacon-chain/blockchain/receive_attestation_test.go @@ -12,8 +12,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/blockchain/receive_block_test.go b/beacon-chain/blockchain/receive_block_test.go index fd659a7253..cbf23071ba 100644 --- a/beacon-chain/blockchain/receive_block_test.go +++ b/beacon-chain/blockchain/receive_block_test.go @@ -14,9 +14,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" "github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/featureconfig" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index fd8ab2bb36..1d6f09703e 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -28,8 +28,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/service_test.go b/beacon-chain/blockchain/service_test.go index 5624a1467a..63204e1691 100644 --- a/beacon-chain/blockchain/service_test.go +++ b/beacon-chain/blockchain/service_test.go @@ -25,9 +25,9 @@ import ( "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" protodb "github.com/prysmaticlabs/prysm/proto/beacon/db" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/event" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/testing/BUILD.bazel b/beacon-chain/blockchain/testing/BUILD.bazel index 7f526c48ea..43a5bb9f31 100644 --- a/beacon-chain/blockchain/testing/BUILD.bazel +++ b/beacon-chain/blockchain/testing/BUILD.bazel @@ -21,8 +21,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/blockchain/testing/mock.go b/beacon-chain/blockchain/testing/mock.go index ecdfecf215..af9f641d2e 100644 --- a/beacon-chain/blockchain/testing/mock.go +++ b/beacon-chain/blockchain/testing/mock.go @@ -21,8 +21,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/blockchain/weak_subjectivity_checks_test.go b/beacon-chain/blockchain/weak_subjectivity_checks_test.go index 81f8169091..93c64166e6 100644 --- a/beacon-chain/blockchain/weak_subjectivity_checks_test.go +++ b/beacon-chain/blockchain/weak_subjectivity_checks_test.go @@ -6,8 +6,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/cache/BUILD.bazel b/beacon-chain/cache/BUILD.bazel index 1b56128c23..1b73e7fa49 100644 --- a/beacon-chain/cache/BUILD.bazel +++ b/beacon-chain/cache/BUILD.bazel @@ -31,7 +31,7 @@ go_library( ], deps = [ "//beacon-chain/state/interface:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/copyutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/params:go_default_library", @@ -64,7 +64,7 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/cache/attestation_data.go b/beacon-chain/cache/attestation_data.go index 8781588797..bf426f59e6 100644 --- a/beacon-chain/cache/attestation_data.go +++ b/beacon-chain/cache/attestation_data.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/copyutil" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/cache/attestation_data_test.go b/beacon-chain/cache/attestation_data_test.go index b78946f4d2..c4e9bdec82 100644 --- a/beacon-chain/cache/attestation_data_test.go +++ b/beacon-chain/cache/attestation_data_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/cache" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/cache/checkpoint_state.go b/beacon-chain/cache/checkpoint_state.go index 7e94bd4f55..2f8d32fa7f 100644 --- a/beacon-chain/cache/checkpoint_state.go +++ b/beacon-chain/cache/checkpoint_state.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" ) diff --git a/beacon-chain/cache/checkpoint_state_test.go b/beacon-chain/cache/checkpoint_state_test.go index 7d9393047c..3dd4deaad9 100644 --- a/beacon-chain/cache/checkpoint_state_test.go +++ b/beacon-chain/cache/checkpoint_state_test.go @@ -7,7 +7,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/cache/depositcache/BUILD.bazel b/beacon-chain/cache/depositcache/BUILD.bazel index 40f94b3fd9..d201527f00 100644 --- a/beacon-chain/cache/depositcache/BUILD.bazel +++ b/beacon-chain/cache/depositcache/BUILD.bazel @@ -11,7 +11,7 @@ go_library( visibility = ["//beacon-chain:__subpackages__"], deps = [ "//proto/beacon/db:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/params:go_default_library", @@ -33,7 +33,7 @@ go_test( embed = [":go_default_library"], deps = [ "//proto/beacon/db:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/cache/depositcache/deposits_cache.go b/beacon-chain/cache/depositcache/deposits_cache.go index b9791eef30..4228d9288b 100644 --- a/beacon-chain/cache/depositcache/deposits_cache.go +++ b/beacon-chain/cache/depositcache/deposits_cache.go @@ -16,7 +16,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/trieutil" diff --git a/beacon-chain/cache/depositcache/deposits_cache_test.go b/beacon-chain/cache/depositcache/deposits_cache_test.go index 5ae8c2fd67..ca25deef48 100644 --- a/beacon-chain/cache/depositcache/deposits_cache_test.go +++ b/beacon-chain/cache/depositcache/deposits_cache_test.go @@ -8,7 +8,7 @@ import ( "testing" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/cache/depositcache/pending_deposits.go b/beacon-chain/cache/depositcache/pending_deposits.go index 2d6802b3a4..2962b7f2e6 100644 --- a/beacon-chain/cache/depositcache/pending_deposits.go +++ b/beacon-chain/cache/depositcache/pending_deposits.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/beacon-chain/cache/depositcache/pending_deposits_test.go b/beacon-chain/cache/depositcache/pending_deposits_test.go index a7bb0f2d65..f28fced1d1 100644 --- a/beacon-chain/cache/depositcache/pending_deposits_test.go +++ b/beacon-chain/cache/depositcache/pending_deposits_test.go @@ -6,7 +6,7 @@ import ( "testing" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/core/blocks/BUILD.bazel b/beacon-chain/core/blocks/BUILD.bazel index cb022f7e02..20fd69cc4d 100644 --- a/beacon-chain/core/blocks/BUILD.bazel +++ b/beacon-chain/core/blocks/BUILD.bazel @@ -28,8 +28,8 @@ go_library( "//beacon-chain/core/validators:go_default_library", "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", @@ -77,8 +77,8 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", diff --git a/beacon-chain/core/blocks/attestation.go b/beacon-chain/core/blocks/attestation.go index 404c9ec090..8762a8becb 100644 --- a/beacon-chain/core/blocks/attestation.go +++ b/beacon-chain/core/blocks/attestation.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/attestation_regression_test.go b/beacon-chain/core/blocks/attestation_regression_test.go index 6d4f0ef05e..a06893507d 100644 --- a/beacon-chain/core/blocks/attestation_regression_test.go +++ b/beacon-chain/core/blocks/attestation_regression_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/blocks/attestation_test.go b/beacon-chain/core/blocks/attestation_test.go index 1c82aa41f4..03f0277597 100644 --- a/beacon-chain/core/blocks/attestation_test.go +++ b/beacon-chain/core/blocks/attestation_test.go @@ -11,8 +11,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/aggregation" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" diff --git a/beacon-chain/core/blocks/attester_slashing.go b/beacon-chain/core/blocks/attester_slashing.go index 392beade33..3cb232a9e5 100644 --- a/beacon-chain/core/blocks/attester_slashing.go +++ b/beacon-chain/core/blocks/attester_slashing.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/shared/sliceutil" diff --git a/beacon-chain/core/blocks/attester_slashing_test.go b/beacon-chain/core/blocks/attester_slashing_test.go index a72d7145ec..92addf2060 100644 --- a/beacon-chain/core/blocks/attester_slashing_test.go +++ b/beacon-chain/core/blocks/attester_slashing_test.go @@ -10,7 +10,7 @@ import ( v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/block_operations_fuzz_test.go b/beacon-chain/core/blocks/block_operations_fuzz_test.go index 5cfa8bff75..6ba4839e70 100644 --- a/beacon-chain/core/blocks/block_operations_fuzz_test.go +++ b/beacon-chain/core/blocks/block_operations_fuzz_test.go @@ -9,9 +9,9 @@ import ( v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/core/blocks/block_regression_test.go b/beacon-chain/core/blocks/block_regression_test.go index b47b764f06..397aea44e4 100644 --- a/beacon-chain/core/blocks/block_regression_test.go +++ b/beacon-chain/core/blocks/block_regression_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/deposit.go b/beacon-chain/core/blocks/deposit.go index 1d98eb8a72..b62226bb65 100644 --- a/beacon-chain/core/blocks/deposit.go +++ b/beacon-chain/core/blocks/deposit.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/depositutil" diff --git a/beacon-chain/core/blocks/deposit_test.go b/beacon-chain/core/blocks/deposit_test.go index 0d2bc5475e..b4fda5fc29 100644 --- a/beacon-chain/core/blocks/deposit_test.go +++ b/beacon-chain/core/blocks/deposit_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/eth1_data.go b/beacon-chain/core/blocks/eth1_data.go index 8a590f1a2c..3749315d64 100644 --- a/beacon-chain/core/blocks/eth1_data.go +++ b/beacon-chain/core/blocks/eth1_data.go @@ -6,7 +6,7 @@ import ( "errors" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/blocks/eth1_data_test.go b/beacon-chain/core/blocks/eth1_data_test.go index 47e69f3da7..4bd609adb1 100644 --- a/beacon-chain/core/blocks/eth1_data_test.go +++ b/beacon-chain/core/blocks/eth1_data_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/exit.go b/beacon-chain/core/blocks/exit.go index 947d1eac4f..745d8dd2f1 100644 --- a/beacon-chain/core/blocks/exit.go +++ b/beacon-chain/core/blocks/exit.go @@ -10,7 +10,7 @@ import ( v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/blocks/exit_test.go b/beacon-chain/core/blocks/exit_test.go index 44a646f80c..602931e4e3 100644 --- a/beacon-chain/core/blocks/exit_test.go +++ b/beacon-chain/core/blocks/exit_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/genesis.go b/beacon-chain/core/blocks/genesis.go index fc9ef983aa..8f6d2d2d1c 100644 --- a/beacon-chain/core/blocks/genesis.go +++ b/beacon-chain/core/blocks/genesis.go @@ -3,7 +3,7 @@ package blocks import ( - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/blocks/header.go b/beacon-chain/core/blocks/header.go index 6ebb0b6fcf..da6b3dd5bd 100644 --- a/beacon-chain/core/blocks/header.go +++ b/beacon-chain/core/blocks/header.go @@ -8,8 +8,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/blocks/header_test.go b/beacon-chain/core/blocks/header_test.go index 2f0b06ca17..c9e38b8bfe 100644 --- a/beacon-chain/core/blocks/header_test.go +++ b/beacon-chain/core/blocks/header_test.go @@ -8,8 +8,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/proposer_slashing.go b/beacon-chain/core/blocks/proposer_slashing.go index dd299e69fc..078160bc8b 100644 --- a/beacon-chain/core/blocks/proposer_slashing.go +++ b/beacon-chain/core/blocks/proposer_slashing.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/blocks/proposer_slashing_regression_test.go b/beacon-chain/core/blocks/proposer_slashing_regression_test.go index 953c768648..82dc687159 100644 --- a/beacon-chain/core/blocks/proposer_slashing_regression_test.go +++ b/beacon-chain/core/blocks/proposer_slashing_regression_test.go @@ -8,7 +8,7 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/core/blocks/proposer_slashing_test.go b/beacon-chain/core/blocks/proposer_slashing_test.go index 0adfecb7fd..ea55c86d03 100644 --- a/beacon-chain/core/blocks/proposer_slashing_test.go +++ b/beacon-chain/core/blocks/proposer_slashing_test.go @@ -12,7 +12,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/blocks/randao_test.go b/beacon-chain/core/blocks/randao_test.go index 384595d479..a8880a7553 100644 --- a/beacon-chain/core/blocks/randao_test.go +++ b/beacon-chain/core/blocks/randao_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/blocks/signature.go b/beacon-chain/core/blocks/signature.go index f86ace9ec0..243b562a0f 100644 --- a/beacon-chain/core/blocks/signature.go +++ b/beacon-chain/core/blocks/signature.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/epoch/BUILD.bazel b/beacon-chain/core/epoch/BUILD.bazel index 7da6a79a78..3db30e8c5e 100644 --- a/beacon-chain/core/epoch/BUILD.bazel +++ b/beacon-chain/core/epoch/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//beacon-chain/core/validators:go_default_library", "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/copyutil:go_default_library", "//shared/featureconfig:go_default_library", @@ -37,7 +37,7 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index d82ec20540..ab0a98cf97 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 9f73883a37..67eaefee0e 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -11,7 +11,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/epoch/precompute/BUILD.bazel b/beacon-chain/core/epoch/precompute/BUILD.bazel index 9fea2afe82..8290c2c165 100644 --- a/beacon-chain/core/epoch/precompute/BUILD.bazel +++ b/beacon-chain/core/epoch/precompute/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", @@ -46,7 +46,7 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/core/epoch/precompute/attestation_test.go b/beacon-chain/core/epoch/precompute/attestation_test.go index 0b2f371c3e..1dd3b93169 100644 --- a/beacon-chain/core/epoch/precompute/attestation_test.go +++ b/beacon-chain/core/epoch/precompute/attestation_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/epoch/precompute/justification_finalization.go b/beacon-chain/core/epoch/precompute/justification_finalization.go index 2035f07e55..2dab5df86e 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // ProcessJustificationAndFinalizationPreCompute processes justification and finalization during diff --git a/beacon-chain/core/epoch/precompute/justification_finalization_test.go b/beacon-chain/core/epoch/precompute/justification_finalization_test.go index d324a14f89..ee1138278d 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization_test.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/epoch/precompute/new_test.go b/beacon-chain/core/epoch/precompute/new_test.go index 012326608b..4066c6cc98 100644 --- a/beacon-chain/core/epoch/precompute/new_test.go +++ b/beacon-chain/core/epoch/precompute/new_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/epoch/precompute/reward_penalty_test.go b/beacon-chain/core/epoch/precompute/reward_penalty_test.go index ab318b593b..b6a7b4dbba 100644 --- a/beacon-chain/core/epoch/precompute/reward_penalty_test.go +++ b/beacon-chain/core/epoch/precompute/reward_penalty_test.go @@ -12,7 +12,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/epoch/precompute/slashing.go b/beacon-chain/core/epoch/precompute/slashing.go index e24f71c4d9..43d934255a 100644 --- a/beacon-chain/core/epoch/precompute/slashing.go +++ b/beacon-chain/core/epoch/precompute/slashing.go @@ -4,7 +4,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/epoch/precompute/slashing_test.go b/beacon-chain/core/epoch/precompute/slashing_test.go index f5252ec505..ecc840a6ae 100644 --- a/beacon-chain/core/epoch/precompute/slashing_test.go +++ b/beacon-chain/core/epoch/precompute/slashing_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/feed/operation/BUILD.bazel b/beacon-chain/core/feed/operation/BUILD.bazel index c092d6f0dd..6a94043446 100644 --- a/beacon-chain/core/feed/operation/BUILD.bazel +++ b/beacon-chain/core/feed/operation/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation", visibility = ["//beacon-chain:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/event:go_default_library", ], ) diff --git a/beacon-chain/core/feed/operation/events.go b/beacon-chain/core/feed/operation/events.go index effe2063b8..677e4a150e 100644 --- a/beacon-chain/core/feed/operation/events.go +++ b/beacon-chain/core/feed/operation/events.go @@ -4,7 +4,7 @@ package operation import ( - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) const ( diff --git a/beacon-chain/core/helpers/BUILD.bazel b/beacon-chain/core/helpers/BUILD.bazel index f2346af13e..2d84dcc09c 100644 --- a/beacon-chain/core/helpers/BUILD.bazel +++ b/beacon-chain/core/helpers/BUILD.bazel @@ -37,8 +37,8 @@ go_library( "//beacon-chain/cache:go_default_library", "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", @@ -76,7 +76,7 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", diff --git a/beacon-chain/core/helpers/attestation.go b/beacon-chain/core/helpers/attestation.go index f832dc007e..def7e32995 100644 --- a/beacon-chain/core/helpers/attestation.go +++ b/beacon-chain/core/helpers/attestation.go @@ -7,7 +7,7 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/attestation_test.go b/beacon-chain/core/helpers/attestation_test.go index 041c3f202d..cb4e88d9ec 100644 --- a/beacon-chain/core/helpers/attestation_test.go +++ b/beacon-chain/core/helpers/attestation_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/committee.go b/beacon-chain/core/helpers/committee.go index 0f5f5fa39d..c96f737448 100644 --- a/beacon-chain/core/helpers/committee.go +++ b/beacon-chain/core/helpers/committee.go @@ -12,7 +12,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/cache" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/committee_test.go b/beacon-chain/core/helpers/committee_test.go index 6ad43b8c92..48f13d760d 100644 --- a/beacon-chain/core/helpers/committee_test.go +++ b/beacon-chain/core/helpers/committee_test.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/genesis.go b/beacon-chain/core/helpers/genesis.go index a50e49a7bd..8527b51d92 100644 --- a/beacon-chain/core/helpers/genesis.go +++ b/beacon-chain/core/helpers/genesis.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/trieutil" ) diff --git a/beacon-chain/core/helpers/rewards_penalties_test.go b/beacon-chain/core/helpers/rewards_penalties_test.go index daa1ef2426..f32f8e6e5a 100644 --- a/beacon-chain/core/helpers/rewards_penalties_test.go +++ b/beacon-chain/core/helpers/rewards_penalties_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/helpers/signing_root.go b/beacon-chain/core/helpers/signing_root.go index 58c912fcc1..78db9898f7 100644 --- a/beacon-chain/core/helpers/signing_root.go +++ b/beacon-chain/core/helpers/signing_root.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/signing_root_test.go b/beacon-chain/core/helpers/signing_root_test.go index fa55394110..39848660ea 100644 --- a/beacon-chain/core/helpers/signing_root_test.go +++ b/beacon-chain/core/helpers/signing_root_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" ethereum_beacon_p2p_v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/validators.go b/beacon-chain/core/helpers/validators.go index c9eb43edd2..e2b4991f00 100644 --- a/beacon-chain/core/helpers/validators.go +++ b/beacon-chain/core/helpers/validators.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" diff --git a/beacon-chain/core/helpers/validators_test.go b/beacon-chain/core/helpers/validators_test.go index f970090689..01c180211c 100644 --- a/beacon-chain/core/helpers/validators_test.go +++ b/beacon-chain/core/helpers/validators_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/cache" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/core/helpers/weak_subjectivity.go b/beacon-chain/core/helpers/weak_subjectivity.go index d022fe8d64..e9c205b8fa 100644 --- a/beacon-chain/core/helpers/weak_subjectivity.go +++ b/beacon-chain/core/helpers/weak_subjectivity.go @@ -10,7 +10,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/helpers/weak_subjectivity_test.go b/beacon-chain/core/helpers/weak_subjectivity_test.go index 5573f422dc..c8451df745 100644 --- a/beacon-chain/core/helpers/weak_subjectivity_test.go +++ b/beacon-chain/core/helpers/weak_subjectivity_test.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/state/BUILD.bazel b/beacon-chain/core/state/BUILD.bazel index 0ab44dd007..cea827a83f 100644 --- a/beacon-chain/core/state/BUILD.bazel +++ b/beacon-chain/core/state/BUILD.bazel @@ -35,8 +35,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/featureconfig:go_default_library", @@ -77,8 +77,8 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/attestationutil:go_default_library", "//shared/benchutil:go_default_library", "//shared/bls:go_default_library", diff --git a/beacon-chain/core/state/benchmarks_test.go b/beacon-chain/core/state/benchmarks_test.go index fc470a8249..c5951dbce1 100644 --- a/beacon-chain/core/state/benchmarks_test.go +++ b/beacon-chain/core/state/benchmarks_test.go @@ -9,7 +9,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/benchutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/state/skip_slot_cache_test.go b/beacon-chain/core/state/skip_slot_cache_test.go index d88ed86d96..93d2c56442 100644 --- a/beacon-chain/core/state/skip_slot_cache_test.go +++ b/beacon-chain/core/state/skip_slot_cache_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/state/state.go b/beacon-chain/core/state/state.go index 36f9ee5f19..015d61fe2a 100644 --- a/beacon-chain/core/state/state.go +++ b/beacon-chain/core/state/state.go @@ -12,7 +12,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/state/state_fuzz_test.go b/beacon-chain/core/state/state_fuzz_test.go index ad35a75c6b..edf9a19dc7 100644 --- a/beacon-chain/core/state/state_fuzz_test.go +++ b/beacon-chain/core/state/state_fuzz_test.go @@ -6,7 +6,7 @@ import ( fuzz "github.com/google/gofuzz" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func TestGenesisBeaconState_1000(t *testing.T) { diff --git a/beacon-chain/core/state/state_test.go b/beacon-chain/core/state/state_test.go index d5fdcd31d7..14bfed12c4 100644 --- a/beacon-chain/core/state/state_test.go +++ b/beacon-chain/core/state/state_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/state/stateutils/BUILD.bazel b/beacon-chain/core/state/stateutils/BUILD.bazel index 645412572e..aeb3099e06 100644 --- a/beacon-chain/core/state/stateutils/BUILD.bazel +++ b/beacon-chain/core/state/stateutils/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//shared/testutil:__pkg__", ], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], @@ -23,7 +23,7 @@ go_test( ":go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/core/state/stateutils/validator_index_map.go b/beacon-chain/core/state/stateutils/validator_index_map.go index 9c0b682f52..8cd2024b21 100644 --- a/beacon-chain/core/state/stateutils/validator_index_map.go +++ b/beacon-chain/core/state/stateutils/validator_index_map.go @@ -5,7 +5,7 @@ package stateutils import ( types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" ) diff --git a/beacon-chain/core/state/stateutils/validator_index_map_test.go b/beacon-chain/core/state/stateutils/validator_index_map_test.go index 1951689702..f8fd042430 100644 --- a/beacon-chain/core/state/stateutils/validator_index_map_test.go +++ b/beacon-chain/core/state/stateutils/validator_index_map_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/state/transition_fuzz_test.go b/beacon-chain/core/state/transition_fuzz_test.go index d10d772ef3..49adae5e4e 100644 --- a/beacon-chain/core/state/transition_fuzz_test.go +++ b/beacon-chain/core/state/transition_fuzz_test.go @@ -7,8 +7,8 @@ import ( fuzz "github.com/google/gofuzz" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" ) func TestFuzzExecuteStateTransition_1000(t *testing.T) { diff --git a/beacon-chain/core/state/transition_no_verify_sig_test.go b/beacon-chain/core/state/transition_no_verify_sig_test.go index 3f1e30ed66..6200cbe1eb 100644 --- a/beacon-chain/core/state/transition_no_verify_sig_test.go +++ b/beacon-chain/core/state/transition_no_verify_sig_test.go @@ -6,8 +6,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/state/transition_test.go b/beacon-chain/core/state/transition_test.go index c4bbb5cb25..10b248ab3e 100644 --- a/beacon-chain/core/state/transition_test.go +++ b/beacon-chain/core/state/transition_test.go @@ -14,8 +14,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/core/validators/BUILD.bazel b/beacon-chain/core/validators/BUILD.bazel index 810d23747c..b0d70aa40e 100644 --- a/beacon-chain/core/validators/BUILD.bazel +++ b/beacon-chain/core/validators/BUILD.bazel @@ -11,7 +11,7 @@ go_library( deps = [ "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/state/interface:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", @@ -27,7 +27,7 @@ go_test( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/core/validators/validator.go b/beacon-chain/core/validators/validator.go index 8e62cabc8d..39059550ec 100644 --- a/beacon-chain/core/validators/validator.go +++ b/beacon-chain/core/validators/validator.go @@ -9,7 +9,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/validators/validator_test.go b/beacon-chain/core/validators/validator_test.go index 559a7654d5..95670fa791 100644 --- a/beacon-chain/core/validators/validator_test.go +++ b/beacon-chain/core/validators/validator_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/db/BUILD.bazel b/beacon-chain/db/BUILD.bazel index ff4c0292d0..4552caa004 100644 --- a/beacon-chain/db/BUILD.bazel +++ b/beacon-chain/db/BUILD.bazel @@ -58,7 +58,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/db/kv:go_default_library", - "//proto/eth/v1alpha1/wrapper: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", diff --git a/beacon-chain/db/iface/BUILD.bazel b/beacon-chain/db/iface/BUILD.bazel index e5cfa81494..56099cfb23 100644 --- a/beacon-chain/db/iface/BUILD.bazel +++ b/beacon-chain/db/iface/BUILD.bazel @@ -15,8 +15,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/backuputil:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/beacon-chain/db/iface/interface.go b/beacon-chain/db/iface/interface.go index b1020167dc..1cbf63ea31 100644 --- a/beacon-chain/db/iface/interface.go +++ b/beacon-chain/db/iface/interface.go @@ -14,8 +14,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/proto/beacon/db" ethereum_beacon_p2p_v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/backuputil" ) diff --git a/beacon-chain/db/kafka/BUILD.bazel b/beacon-chain/db/kafka/BUILD.bazel index 7f4a373a79..498290c4e1 100644 --- a/beacon-chain/db/kafka/BUILD.bazel +++ b/beacon-chain/db/kafka/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/featureconfig:go_default_library", "//shared/traceutil:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/beacon-chain/db/kafka/passthrough.go b/beacon-chain/db/kafka/passthrough.go index 2054ea9753..aff23729b0 100644 --- a/beacon-chain/db/kafka/passthrough.go +++ b/beacon-chain/db/kafka/passthrough.go @@ -10,8 +10,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/proto/beacon/db" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // DatabasePath -- passthrough. diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel index 7e22d3abf1..64ed2f83da 100644 --- a/beacon-chain/db/kv/BUILD.bazel +++ b/beacon-chain/db/kv/BUILD.bazel @@ -41,9 +41,9 @@ go_library( "//beacon-chain/state/v1:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", "//shared/params:go_default_library", @@ -94,9 +94,9 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/testing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/db/kv/backup_test.go b/beacon-chain/db/kv/backup_test.go index 3c602723fd..0738807b49 100644 --- a/beacon-chain/db/kv/backup_test.go +++ b/beacon-chain/db/kv/backup_test.go @@ -8,7 +8,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/db/kv/blocks.go b/beacon-chain/db/kv/blocks.go index 0b7332328a..586abc7393 100644 --- a/beacon-chain/db/kv/blocks.go +++ b/beacon-chain/db/kv/blocks.go @@ -9,9 +9,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" diff --git a/beacon-chain/db/kv/blocks_test.go b/beacon-chain/db/kv/blocks_test.go index 4e332e20e7..213d0bb834 100644 --- a/beacon-chain/db/kv/blocks_test.go +++ b/beacon-chain/db/kv/blocks_test.go @@ -7,9 +7,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/db/kv/checkpoint.go b/beacon-chain/db/kv/checkpoint.go index 2387faaae1..e65c272572 100644 --- a/beacon-chain/db/kv/checkpoint.go +++ b/beacon-chain/db/kv/checkpoint.go @@ -4,7 +4,7 @@ import ( "context" "errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" bolt "go.etcd.io/bbolt" diff --git a/beacon-chain/db/kv/checkpoint_test.go b/beacon-chain/db/kv/checkpoint_test.go index cd4a5efb89..100a4c1014 100644 --- a/beacon-chain/db/kv/checkpoint_test.go +++ b/beacon-chain/db/kv/checkpoint_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/db/kv/encoding.go b/beacon-chain/db/kv/encoding.go index 0dc83cdc1c..1219c52a30 100644 --- a/beacon-chain/db/kv/encoding.go +++ b/beacon-chain/db/kv/encoding.go @@ -8,7 +8,7 @@ import ( fastssz "github.com/ferranbt/fastssz" "github.com/golang/snappy" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/db/kv/finalized_block_roots.go b/beacon-chain/db/kv/finalized_block_roots.go index 9a488a8979..e0823103d7 100644 --- a/beacon-chain/db/kv/finalized_block_roots.go +++ b/beacon-chain/db/kv/finalized_block_roots.go @@ -7,9 +7,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/traceutil" bolt "go.etcd.io/bbolt" diff --git a/beacon-chain/db/kv/finalized_block_roots_test.go b/beacon-chain/db/kv/finalized_block_roots_test.go index 10506c3c11..e2d50c3cbb 100644 --- a/beacon-chain/db/kv/finalized_block_roots_test.go +++ b/beacon-chain/db/kv/finalized_block_roots_test.go @@ -5,9 +5,9 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/db/kv/genesis.go b/beacon-chain/db/kv/genesis.go index ae95e7b70d..4c191e40a0 100644 --- a/beacon-chain/db/kv/genesis.go +++ b/beacon-chain/db/kv/genesis.go @@ -13,7 +13,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" state "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/db/kv/migration_archived_index.go b/beacon-chain/db/kv/migration_archived_index.go index 3daa51ad56..81c07dbaca 100644 --- a/beacon-chain/db/kv/migration_archived_index.go +++ b/beacon-chain/db/kv/migration_archived_index.go @@ -5,7 +5,7 @@ import ( "context" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/operations.go b/beacon-chain/db/kv/operations.go index 785f7257d5..bad2054151 100644 --- a/beacon-chain/db/kv/operations.go +++ b/beacon-chain/db/kv/operations.go @@ -3,7 +3,7 @@ package kv import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/operations_test.go b/beacon-chain/db/kv/operations_test.go index ce83c64dab..b41deeab79 100644 --- a/beacon-chain/db/kv/operations_test.go +++ b/beacon-chain/db/kv/operations_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/db/kv/slashings.go b/beacon-chain/db/kv/slashings.go index 170c5e12c4..119f93b695 100644 --- a/beacon-chain/db/kv/slashings.go +++ b/beacon-chain/db/kv/slashings.go @@ -3,7 +3,7 @@ package kv import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/slashings_test.go b/beacon-chain/db/kv/slashings_test.go index b8af67cde2..8369ea50dc 100644 --- a/beacon-chain/db/kv/slashings_test.go +++ b/beacon-chain/db/kv/slashings_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/db/kv/state.go b/beacon-chain/db/kv/state.go index 5f438f4d52..e2f6565576 100644 --- a/beacon-chain/db/kv/state.go +++ b/beacon-chain/db/kv/state.go @@ -11,8 +11,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/traceutil" diff --git a/beacon-chain/db/kv/state_test.go b/beacon-chain/db/kv/state_test.go index e3d29e68d6..34e1c43cc0 100644 --- a/beacon-chain/db/kv/state_test.go +++ b/beacon-chain/db/kv/state_test.go @@ -7,9 +7,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/db/restore_test.go b/beacon-chain/db/restore_test.go index 1b6b37a277..c8f5668ece 100644 --- a/beacon-chain/db/restore_test.go +++ b/beacon-chain/db/restore_test.go @@ -10,7 +10,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "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" diff --git a/beacon-chain/db/slasherkv/BUILD.bazel b/beacon-chain/db/slasherkv/BUILD.bazel index bfdd5a8c68..2e3909e9c5 100644 --- a/beacon-chain/db/slasherkv/BUILD.bazel +++ b/beacon-chain/db/slasherkv/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "//beacon-chain/db/iface:go_default_library", "//beacon-chain/slasher/types:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", "//shared/hashutil:go_default_library", @@ -47,7 +47,7 @@ go_test( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/slasher/types:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/db/slasherkv/pruning_test.go b/beacon-chain/db/slasherkv/pruning_test.go index 328b2b67cd..394269aecb 100644 --- a/beacon-chain/db/slasherkv/pruning_test.go +++ b/beacon-chain/db/slasherkv/pruning_test.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" slashertypes "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" logTest "github.com/sirupsen/logrus/hooks/test" diff --git a/beacon-chain/db/slasherkv/slasher.go b/beacon-chain/db/slasherkv/slasher.go index 4094c9d91f..a56a364c22 100644 --- a/beacon-chain/db/slasherkv/slasher.go +++ b/beacon-chain/db/slasherkv/slasher.go @@ -13,7 +13,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" slashertypes "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types" slashpb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" bolt "go.etcd.io/bbolt" diff --git a/beacon-chain/db/slasherkv/slasher_test.go b/beacon-chain/db/slasherkv/slasher_test.go index 6093aed8c9..68c8726905 100644 --- a/beacon-chain/db/slasherkv/slasher_test.go +++ b/beacon-chain/db/slasherkv/slasher_test.go @@ -10,7 +10,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" slashertypes "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types" slashpb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/gateway/BUILD.bazel b/beacon-chain/gateway/BUILD.bazel index ea8e918188..1aa8ae0a70 100644 --- a/beacon-chain/gateway/BUILD.bazel +++ b/beacon-chain/gateway/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//proto/beacon/rpc/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/gateway:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", "@org_golang_google_protobuf//encoding/protojson:go_default_library", diff --git a/beacon-chain/gateway/helpers.go b/beacon-chain/gateway/helpers.go index 027b6c24f4..a2e5097d49 100644 --- a/beacon-chain/gateway/helpers.go +++ b/beacon-chain/gateway/helpers.go @@ -6,7 +6,7 @@ import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/gateway" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/beacon-chain/interop-cold-start/BUILD.bazel b/beacon-chain/interop-cold-start/BUILD.bazel index 3e3e5badf7..3b5c0e5e35 100644 --- a/beacon-chain/interop-cold-start/BUILD.bazel +++ b/beacon-chain/interop-cold-start/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared:go_default_library", "//shared/interop:go_default_library", "//shared/slotutil:go_default_library", diff --git a/beacon-chain/interop-cold-start/service.go b/beacon-chain/interop-cold-start/service.go index 26cf5ffdfe..1f5e2c3704 100644 --- a/beacon-chain/interop-cold-start/service.go +++ b/beacon-chain/interop-cold-start/service.go @@ -16,7 +16,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/slotutil" diff --git a/beacon-chain/operations/attestations/BUILD.bazel b/beacon-chain/operations/attestations/BUILD.bazel index 5b8403f82d..4dbbd6b632 100644 --- a/beacon-chain/operations/attestations/BUILD.bazel +++ b/beacon-chain/operations/attestations/BUILD.bazel @@ -18,7 +18,7 @@ go_library( ], deps = [ "//beacon-chain/operations/attestations/kv:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/copyutil:go_default_library", "//shared/hashutil:go_default_library", @@ -46,7 +46,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/operations/attestations/kv:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/bls:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/operations/attestations/kv/BUILD.bazel b/beacon-chain/operations/attestations/kv/BUILD.bazel index fed7bd1f3a..f38e04a37e 100644 --- a/beacon-chain/operations/attestations/kv/BUILD.bazel +++ b/beacon-chain/operations/attestations/kv/BUILD.bazel @@ -14,7 +14,7 @@ go_library( visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/copyutil:go_default_library", "//shared/hashutil:go_default_library", @@ -40,7 +40,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/operations/attestations/kv/aggregated.go b/beacon-chain/operations/attestations/kv/aggregated.go index 2869ea86e6..b99a8476ac 100644 --- a/beacon-chain/operations/attestations/kv/aggregated.go +++ b/beacon-chain/operations/attestations/kv/aggregated.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" log "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go index 43535d0050..0960bc9507 100644 --- a/beacon-chain/operations/attestations/kv/aggregated_test.go +++ b/beacon-chain/operations/attestations/kv/aggregated_test.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/operations/attestations/kv/benchmark_test.go b/beacon-chain/operations/attestations/kv/benchmark_test.go index d4ef15f8a5..fabedfdf50 100644 --- a/beacon-chain/operations/attestations/kv/benchmark_test.go +++ b/beacon-chain/operations/attestations/kv/benchmark_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations/kv" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/beacon-chain/operations/attestations/kv/block.go b/beacon-chain/operations/attestations/kv/block.go index 6f2c1bfb31..dcc8ccbfdd 100644 --- a/beacon-chain/operations/attestations/kv/block.go +++ b/beacon-chain/operations/attestations/kv/block.go @@ -2,7 +2,7 @@ package kv import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/copyutil" ) diff --git a/beacon-chain/operations/attestations/kv/block_test.go b/beacon-chain/operations/attestations/kv/block_test.go index 8590dc1c6a..ee3397e6b4 100644 --- a/beacon-chain/operations/attestations/kv/block_test.go +++ b/beacon-chain/operations/attestations/kv/block_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/operations/attestations/kv/forkchoice.go b/beacon-chain/operations/attestations/kv/forkchoice.go index db5fbfcb4e..26eea9d613 100644 --- a/beacon-chain/operations/attestations/kv/forkchoice.go +++ b/beacon-chain/operations/attestations/kv/forkchoice.go @@ -2,7 +2,7 @@ package kv import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/copyutil" ) diff --git a/beacon-chain/operations/attestations/kv/forkchoice_test.go b/beacon-chain/operations/attestations/kv/forkchoice_test.go index 1942f1ea0a..5797610aa1 100644 --- a/beacon-chain/operations/attestations/kv/forkchoice_test.go +++ b/beacon-chain/operations/attestations/kv/forkchoice_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/operations/attestations/kv/kv.go b/beacon-chain/operations/attestations/kv/kv.go index 10953c2a5e..66ab4cc80d 100644 --- a/beacon-chain/operations/attestations/kv/kv.go +++ b/beacon-chain/operations/attestations/kv/kv.go @@ -8,7 +8,7 @@ import ( "time" "github.com/patrickmn/go-cache" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/operations/attestations/kv/seen_bits.go b/beacon-chain/operations/attestations/kv/seen_bits.go index a3d04c5aa5..cdeab5552b 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits.go +++ b/beacon-chain/operations/attestations/kv/seen_bits.go @@ -4,7 +4,7 @@ import ( "github.com/patrickmn/go-cache" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func (c *AttCaches) insertSeenBit(att *ethpb.Attestation) error { diff --git a/beacon-chain/operations/attestations/kv/seen_bits_test.go b/beacon-chain/operations/attestations/kv/seen_bits_test.go index ba699861a1..6470fdbd76 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits_test.go +++ b/beacon-chain/operations/attestations/kv/seen_bits_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/operations/attestations/kv/unaggregated.go b/beacon-chain/operations/attestations/kv/unaggregated.go index b61d777edd..39720ddbfb 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated.go +++ b/beacon-chain/operations/attestations/kv/unaggregated.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/attestations/kv/unaggregated_test.go b/beacon-chain/operations/attestations/kv/unaggregated_test.go index 670d252266..066ebd0294 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated_test.go +++ b/beacon-chain/operations/attestations/kv/unaggregated_test.go @@ -9,7 +9,7 @@ import ( fssz "github.com/ferranbt/fastssz" c "github.com/patrickmn/go-cache" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/operations/attestations/mock.go b/beacon-chain/operations/attestations/mock.go index 6441389166..c396fba832 100644 --- a/beacon-chain/operations/attestations/mock.go +++ b/beacon-chain/operations/attestations/mock.go @@ -4,7 +4,7 @@ import ( "context" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // PoolMock -- diff --git a/beacon-chain/operations/attestations/pool.go b/beacon-chain/operations/attestations/pool.go index a787ad83bd..b95ed85834 100644 --- a/beacon-chain/operations/attestations/pool.go +++ b/beacon-chain/operations/attestations/pool.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations/kv" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // Pool defines the necessary methods for Prysm attestations pool to serve diff --git a/beacon-chain/operations/attestations/prepare_forkchoice.go b/beacon-chain/operations/attestations/prepare_forkchoice.go index 86f45c23de..d416de925e 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/slotutil" diff --git a/beacon-chain/operations/attestations/prepare_forkchoice_test.go b/beacon-chain/operations/attestations/prepare_forkchoice_test.go index 6a51fbe9fa..aefd40673a 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice_test.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/operations/attestations/prune_expired_test.go b/beacon-chain/operations/attestations/prune_expired_test.go index d4ede0935f..39068f9254 100644 --- a/beacon-chain/operations/attestations/prune_expired_test.go +++ b/beacon-chain/operations/attestations/prune_expired_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/runutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/operations/slashings/BUILD.bazel b/beacon-chain/operations/slashings/BUILD.bazel index 4da424b2c1..9525514b1e 100644 --- a/beacon-chain/operations/slashings/BUILD.bazel +++ b/beacon-chain/operations/slashings/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/state/interface:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", "@com_github_pkg_errors//:go_default_library", @@ -43,7 +43,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/state/interface:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/operations/slashings/mock.go b/beacon-chain/operations/slashings/mock.go index f233e5af76..2f730394ec 100644 --- a/beacon-chain/operations/slashings/mock.go +++ b/beacon-chain/operations/slashings/mock.go @@ -4,7 +4,7 @@ import ( "context" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // PoolMock is a fake implementation of PoolManager. diff --git a/beacon-chain/operations/slashings/service.go b/beacon-chain/operations/slashings/service.go index d95060c82d..71c3d11409 100644 --- a/beacon-chain/operations/slashings/service.go +++ b/beacon-chain/operations/slashings/service.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/trailofbits/go-mutexasserts" diff --git a/beacon-chain/operations/slashings/service_attester_test.go b/beacon-chain/operations/slashings/service_attester_test.go index 1eca443baf..8ba5a3bc45 100644 --- a/beacon-chain/operations/slashings/service_attester_test.go +++ b/beacon-chain/operations/slashings/service_attester_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/operations/slashings/service_proposer_test.go b/beacon-chain/operations/slashings/service_proposer_test.go index ead5327190..df6496a21b 100644 --- a/beacon-chain/operations/slashings/service_proposer_test.go +++ b/beacon-chain/operations/slashings/service_proposer_test.go @@ -5,7 +5,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/operations/slashings/types.go b/beacon-chain/operations/slashings/types.go index bf99e74958..4de3517cfa 100644 --- a/beacon-chain/operations/slashings/types.go +++ b/beacon-chain/operations/slashings/types.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // PoolManager maintains a pool of pending and recently included attester and proposer slashings. diff --git a/beacon-chain/operations/voluntaryexits/BUILD.bazel b/beacon-chain/operations/voluntaryexits/BUILD.bazel index 7c369f5a49..ff5ca5d3ad 100644 --- a/beacon-chain/operations/voluntaryexits/BUILD.bazel +++ b/beacon-chain/operations/voluntaryexits/BUILD.bazel @@ -15,7 +15,7 @@ go_library( deps = [ "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/state/interface:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@io_opencensus_go//trace:go_default_library", @@ -30,7 +30,7 @@ go_test( deps = [ "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/beacon-chain/operations/voluntaryexits/mock.go b/beacon-chain/operations/voluntaryexits/mock.go index d10747a64a..796a6b7043 100644 --- a/beacon-chain/operations/voluntaryexits/mock.go +++ b/beacon-chain/operations/voluntaryexits/mock.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // PoolMock is a fake implementation of PoolManager. diff --git a/beacon-chain/operations/voluntaryexits/service.go b/beacon-chain/operations/voluntaryexits/service.go index 956059b2cd..2c2ae95b39 100644 --- a/beacon-chain/operations/voluntaryexits/service.go +++ b/beacon-chain/operations/voluntaryexits/service.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/voluntaryexits/service_test.go b/beacon-chain/operations/voluntaryexits/service_test.go index d7cbfeebf0..7886ec8cd4 100644 --- a/beacon-chain/operations/voluntaryexits/service_test.go +++ b/beacon-chain/operations/voluntaryexits/service_test.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/p2p/BUILD.bazel b/beacon-chain/p2p/BUILD.bazel index 424efa3fd6..e373e619f5 100644 --- a/beacon-chain/p2p/BUILD.bazel +++ b/beacon-chain/p2p/BUILD.bazel @@ -53,7 +53,7 @@ go_library( "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/p2p/v1/wrapper:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared:go_default_library", "//shared/featureconfig:go_default_library", "//shared/fileutil:go_default_library", @@ -138,7 +138,7 @@ go_test( "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/p2p/v1/wrapper:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/testing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", diff --git a/beacon-chain/p2p/broadcaster.go b/beacon-chain/p2p/broadcaster.go index 8fa4e1b6a6..f87de61f29 100644 --- a/beacon-chain/p2p/broadcaster.go +++ b/beacon-chain/p2p/broadcaster.go @@ -8,7 +8,7 @@ import ( "time" "github.com/pkg/errors" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/traceutil" diff --git a/beacon-chain/p2p/broadcaster_test.go b/beacon-chain/p2p/broadcaster_test.go index f49ba38b9c..cd1b2846c4 100644 --- a/beacon-chain/p2p/broadcaster_test.go +++ b/beacon-chain/p2p/broadcaster_test.go @@ -19,7 +19,7 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1/wrapper" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" testpb "github.com/prysmaticlabs/prysm/proto/testing" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index 7524235292..f21dfcc5c2 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -30,7 +30,7 @@ import ( testp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1/wrapper" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/iputils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/p2p/gossip_scoring_params_test.go b/beacon-chain/p2p/gossip_scoring_params_test.go index 52bf433822..f0c2c2c9c7 100644 --- a/beacon-chain/p2p/gossip_scoring_params_test.go +++ b/beacon-chain/p2p/gossip_scoring_params_test.go @@ -7,7 +7,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" dbutil "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/p2p/gossip_topic_mappings.go b/beacon-chain/p2p/gossip_topic_mappings.go index 56de7d33d4..fb8a527d32 100644 --- a/beacon-chain/p2p/gossip_topic_mappings.go +++ b/beacon-chain/p2p/gossip_topic_mappings.go @@ -3,7 +3,7 @@ package p2p import ( "reflect" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/interfaces.go b/beacon-chain/p2p/interfaces.go index 9a6867ea28..9bfaa7f923 100644 --- a/beacon-chain/p2p/interfaces.go +++ b/beacon-chain/p2p/interfaces.go @@ -13,7 +13,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" "github.com/prysmaticlabs/prysm/proto/beacon/p2p" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/peers/peerdata/BUILD.bazel b/beacon-chain/p2p/peers/peerdata/BUILD.bazel index 191c04b545..7b61ed231e 100644 --- a/beacon-chain/p2p/peers/peerdata/BUILD.bazel +++ b/beacon-chain/p2p/peers/peerdata/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//proto/beacon/p2p:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", "@com_github_libp2p_go_libp2p_core//network:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", diff --git a/beacon-chain/p2p/peers/peerdata/store.go b/beacon-chain/p2p/peers/peerdata/store.go index 7c3c33ed97..f954e907d0 100644 --- a/beacon-chain/p2p/peers/peerdata/store.go +++ b/beacon-chain/p2p/peers/peerdata/store.go @@ -13,7 +13,7 @@ import ( "github.com/prysmaticlabs/prysm/proto/beacon/p2p" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) var ( diff --git a/beacon-chain/p2p/testing/BUILD.bazel b/beacon-chain/p2p/testing/BUILD.bazel index 083f55d050..50d24dbd1c 100644 --- a/beacon-chain/p2p/testing/BUILD.bazel +++ b/beacon-chain/p2p/testing/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//beacon-chain/p2p/peers/scorers:go_default_library", "//proto/beacon/p2p:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", diff --git a/beacon-chain/p2p/testing/fuzz_p2p.go b/beacon-chain/p2p/testing/fuzz_p2p.go index f0a4ef1d8a..c96e6daa3a 100644 --- a/beacon-chain/p2p/testing/fuzz_p2p.go +++ b/beacon-chain/p2p/testing/fuzz_p2p.go @@ -11,7 +11,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/prysm/proto/beacon/p2p" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" diff --git a/beacon-chain/p2p/testing/mock_broadcaster.go b/beacon-chain/p2p/testing/mock_broadcaster.go index a88553a07d..1fa9760fa9 100644 --- a/beacon-chain/p2p/testing/mock_broadcaster.go +++ b/beacon-chain/p2p/testing/mock_broadcaster.go @@ -3,7 +3,7 @@ package testing import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/testing/p2p.go b/beacon-chain/p2p/testing/p2p.go index 228b317bd0..dca8b2d002 100644 --- a/beacon-chain/p2p/testing/p2p.go +++ b/beacon-chain/p2p/testing/p2p.go @@ -24,7 +24,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/scorers" "github.com/prysmaticlabs/prysm/proto/beacon/p2p" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/powchain/BUILD.bazel b/beacon-chain/powchain/BUILD.bazel index 122f5b521b..212ed2ab92 100644 --- a/beacon-chain/powchain/BUILD.bazel +++ b/beacon-chain/powchain/BUILD.bazel @@ -31,7 +31,7 @@ go_library( "//beacon-chain/state/v1:go_default_library", "//contracts/deposit-contract:go_default_library", "//proto/beacon/db:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/clientstats:go_default_library", "//shared/hashutil:go_default_library", @@ -84,7 +84,7 @@ go_test( "//beacon-chain/powchain/types:go_default_library", "//contracts/deposit-contract:go_default_library", "//proto/beacon/db:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/clientstats:go_default_library", diff --git a/beacon-chain/powchain/deposit.go b/beacon-chain/powchain/deposit.go index 0a5953b4a2..ede1b89f24 100644 --- a/beacon-chain/powchain/deposit.go +++ b/beacon-chain/powchain/deposit.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func (s *Service) processDeposit(ctx context.Context, eth1Data *ethpb.Eth1Data, deposit *ethpb.Deposit) error { diff --git a/beacon-chain/powchain/deposit_test.go b/beacon-chain/powchain/deposit_test.go index b1306a8f2c..c31222552a 100644 --- a/beacon-chain/powchain/deposit_test.go +++ b/beacon-chain/powchain/deposit_test.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go index b28f943a8d..b5f92b6417 100644 --- a/beacon-chain/powchain/log_processing.go +++ b/beacon-chain/powchain/log_processing.go @@ -19,7 +19,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" protodb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go index a4ea81435c..bcd7ed7b9a 100644 --- a/beacon-chain/powchain/service.go +++ b/beacon-chain/powchain/service.go @@ -34,7 +34,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" protodb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/clientstats" "github.com/prysmaticlabs/prysm/shared/httputils" diff --git a/beacon-chain/powchain/service_test.go b/beacon-chain/powchain/service_test.go index 0087a094dc..29319e9019 100644 --- a/beacon-chain/powchain/service_test.go +++ b/beacon-chain/powchain/service_test.go @@ -20,7 +20,7 @@ import ( mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" protodb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/clientstats" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/httputils" diff --git a/beacon-chain/powchain/testing/BUILD.bazel b/beacon-chain/powchain/testing/BUILD.bazel index 8d1eaa08bd..19001cc262 100644 --- a/beacon-chain/powchain/testing/BUILD.bazel +++ b/beacon-chain/powchain/testing/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//beacon-chain/powchain/types:go_default_library", "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/trieutil:go_default_library", diff --git a/beacon-chain/powchain/testing/mock_faulty_powchain.go b/beacon-chain/powchain/testing/mock_faulty_powchain.go index 1b40d9700e..a610cf1b0d 100644 --- a/beacon-chain/powchain/testing/mock_faulty_powchain.go +++ b/beacon-chain/powchain/testing/mock_faulty_powchain.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/powchain/types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/trieutil" ) diff --git a/beacon-chain/powchain/testing/mock_powchain.go b/beacon-chain/powchain/testing/mock_powchain.go index dddc631b5f..eb636e2615 100644 --- a/beacon-chain/powchain/testing/mock_powchain.go +++ b/beacon-chain/powchain/testing/mock_powchain.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/prysmaticlabs/prysm/beacon-chain/powchain/types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/trieutil" diff --git a/beacon-chain/rpc/BUILD.bazel b/beacon-chain/rpc/BUILD.bazel index f965d5e6c8..adb13a680e 100644 --- a/beacon-chain/rpc/BUILD.bazel +++ b/beacon-chain/rpc/BUILD.bazel @@ -36,7 +36,7 @@ go_library( "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/rpc/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/featureconfig:go_default_library", "//shared/logutil:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/rpc/eth/v1/beacon/BUILD.bazel b/beacon-chain/rpc/eth/v1/beacon/BUILD.bazel index bdc5494f30..48758dd0a2 100644 --- a/beacon-chain/rpc/eth/v1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/eth/v1/beacon/BUILD.bazel @@ -30,10 +30,10 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", "//proto/migration:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/featureconfig:go_default_library", "//shared/grpcutils:go_default_library", @@ -76,10 +76,10 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", "//proto/migration:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/grpcutils:go_default_library", diff --git a/beacon-chain/rpc/eth/v1/beacon/blocks.go b/beacon-chain/rpc/eth/v1/beacon/blocks.go index 7d1c806626..66e9532c0a 100644 --- a/beacon-chain/rpc/eth/v1/beacon/blocks.go +++ b/beacon-chain/rpc/eth/v1/beacon/blocks.go @@ -11,9 +11,9 @@ import ( blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" "github.com/prysmaticlabs/prysm/proto/migration" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bytesutil" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/v1/beacon/blocks_test.go b/beacon-chain/rpc/eth/v1/beacon/blocks_test.go index e1de40c0ab..d8d90e348c 100644 --- a/beacon-chain/rpc/eth/v1/beacon/blocks_test.go +++ b/beacon-chain/rpc/eth/v1/beacon/blocks_test.go @@ -12,10 +12,10 @@ import ( mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" "github.com/prysmaticlabs/prysm/proto/migration" + ethpb_alpha "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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/eth/v1/beacon/pool.go b/beacon-chain/rpc/eth/v1/beacon/pool.go index b47e0810ed..b92993a6b3 100644 --- a/beacon-chain/rpc/eth/v1/beacon/pool.go +++ b/beacon-chain/rpc/eth/v1/beacon/pool.go @@ -5,8 +5,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/migration" + ethpb_alpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/grpcutils" "go.opencensus.io/trace" diff --git a/beacon-chain/rpc/eth/v1/beacon/pool_test.go b/beacon-chain/rpc/eth/v1/beacon/pool_test.go index f034e9519a..c1007d9b9c 100644 --- a/beacon-chain/rpc/eth/v1/beacon/pool_test.go +++ b/beacon-chain/rpc/eth/v1/beacon/pool_test.go @@ -17,8 +17,8 @@ import ( p2pMock "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/migration" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/grpcutils" diff --git a/beacon-chain/rpc/eth/v1/beacon/state.go b/beacon-chain/rpc/eth/v1/beacon/state.go index dca078469d..99130a3dc5 100644 --- a/beacon-chain/rpc/eth/v1/beacon/state.go +++ b/beacon-chain/rpc/eth/v1/beacon/state.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/rpc/statefetcher" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/v1/beacon/state_test.go b/beacon-chain/rpc/eth/v1/beacon/state_test.go index e9000197ae..a7265976ac 100644 --- a/beacon-chain/rpc/eth/v1/beacon/state_test.go +++ b/beacon-chain/rpc/eth/v1/beacon/state_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/rpc/testutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" sharedtestutil "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/eth/v1/beacon/validator_test.go b/beacon-chain/rpc/eth/v1/beacon/validator_test.go index 28824e7779..14075006af 100644 --- a/beacon-chain/rpc/eth/v1/beacon/validator_test.go +++ b/beacon-chain/rpc/eth/v1/beacon/validator_test.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/rpc/testutil" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb_alpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" sharedtestutil "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/rpc/eth/v1/events/BUILD.bazel b/beacon-chain/rpc/eth/v1/events/BUILD.bazel index 2ba15f7fa4..8e035b852e 100644 --- a/beacon-chain/rpc/eth/v1/events/BUILD.bazel +++ b/beacon-chain/rpc/eth/v1/events/BUILD.bazel @@ -35,9 +35,9 @@ go_test( "//beacon-chain/core/feed/operation:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/migration:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/event:go_default_library", "//shared/mock:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/rpc/eth/v1/events/events_test.go b/beacon-chain/rpc/eth/v1/events/events_test.go index 97d1040d41..30d32e0923 100644 --- a/beacon-chain/rpc/eth/v1/events/events_test.go +++ b/beacon-chain/rpc/eth/v1/events/events_test.go @@ -12,9 +12,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/migration" + ethpb_v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/eth/v1/node/BUILD.bazel b/beacon-chain/rpc/eth/v1/node/BUILD.bazel index f6fa2cf624..fe89270277 100644 --- a/beacon-chain/rpc/eth/v1/node/BUILD.bazel +++ b/beacon-chain/rpc/eth/v1/node/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//beacon-chain/p2p/peers/peerdata:go_default_library", "//beacon-chain/sync:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/migration:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/grpcutils:go_default_library", "//shared/version:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", diff --git a/beacon-chain/rpc/eth/v1/node/node.go b/beacon-chain/rpc/eth/v1/node/node.go index 1dbbacf1c9..d97a9906e2 100644 --- a/beacon-chain/rpc/eth/v1/node/node.go +++ b/beacon-chain/rpc/eth/v1/node/node.go @@ -14,8 +14,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/peerdata" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/migration" + ethpb_alpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/version" "go.opencensus.io/trace" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel index be4c46123a..719860b98e 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel @@ -38,8 +38,8 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/sync:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", @@ -96,9 +96,9 @@ go_test( "//beacon-chain/sync/initial-sync/testing:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go index 48372da0bc..1199778cf8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + 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/pagination" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go index 49a7c41056..d298303369 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go @@ -12,8 +12,8 @@ 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" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go index 02c9c9ef1d..b8f25dc320 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go @@ -10,8 +10,8 @@ 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" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go index ca352624a4..1f4cb1062b 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go @@ -20,9 +20,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index ebf6e35f0e..edadcae1cf 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -10,7 +10,7 @@ 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" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + 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/event" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go index 256054a86b..eee1950571 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go @@ -17,9 +17,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/mock" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go index 7ba9360620..676fb7a6ef 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go index e9f6854850..c01a8312c2 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go @@ -12,8 +12,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go index 102b2e4de0..f95f9e6408 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go index 12f6620d66..aa1c7e2fef 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go @@ -20,7 +20,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/sync" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // Server defines a server implementation of the gRPC Beacon Chain service, diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go index fd905863ed..5ea38f14f3 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go @@ -4,7 +4,7 @@ import ( "context" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/sliceutil" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go index 052b43fe62..97b997cbf5 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go @@ -5,7 +5,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go index 39af98d953..18b82cdd7d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go @@ -12,7 +12,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + 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/pagination" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go index 71e76ebdf0..1240b76d94 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go @@ -22,7 +22,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db" "github.com/prysmaticlabs/prysm/beacon-chain/powchain" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go index 85366db231..84dcc04634 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go @@ -21,8 +21,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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" diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel index c853b84ccb..d036ffadf7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel @@ -20,7 +20,7 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/stategen:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", @@ -53,8 +53,8 @@ go_test( "//beacon-chain/p2p/testing:go_default_library", "//beacon-chain/state/stategen:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go index 531be0ad59..111ff954fd 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go @@ -11,8 +11,8 @@ import ( dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go index f172bcfd4d..2365bc29ca 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go index 9aafc99cb8..777247f102 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" mockP2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go index 8fd80e80e8..c27d4147d7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go @@ -9,7 +9,7 @@ import ( dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel index 7953be67b2..5d26d824e7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//beacon-chain/p2p:go_default_library", "//beacon-chain/sync:go_default_library", "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/logutil:go_default_library", "//shared/version:go_default_library", "@com_github_libp2p_go_libp2p_core//network:go_default_library", @@ -35,7 +35,7 @@ go_test( "//beacon-chain/p2p:go_default_library", "//beacon-chain/p2p/testing:go_default_library", "//beacon-chain/sync/initial-sync/testing:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server.go b/beacon-chain/rpc/prysm/v1alpha1/node/server.go index fe83f39b07..6b27bd1f2f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server.go @@ -18,7 +18,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/sync" pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/logutil" "github.com/prysmaticlabs/prysm/shared/version" "google.golang.org/grpc" diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go index 8f235d477d..75b79e51cb 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go @@ -13,7 +13,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" 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/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index 3164a521a4..ba4290d181 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -38,9 +38,9 @@ go_library( "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/bls:go_default_library", @@ -106,8 +106,8 @@ go_test( "//proto/beacon/db:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go index e7be3b373b..832d78457f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go @@ -5,7 +5,7 @@ import ( "context" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go index 26f7234a2d..7dd9df0b39 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go @@ -15,7 +15,7 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go index d0f9402132..1c3bf9936a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go index 90f3252e22..700a886af4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go @@ -15,7 +15,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go index ea312ed5a6..000e7ef388 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go @@ -13,7 +13,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go index 3fd9cda345..c2d95487f8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go @@ -18,8 +18,8 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go b/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go index 716cd6e001..fa0736d4d4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go @@ -6,7 +6,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" opfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go index 4e4a6b37c6..d98975d441 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits" 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/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go index 695b4d51c7..07f9a3b407 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go @@ -20,9 +20,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go index e67eeef5ed..48fd13e10e 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go index cad79c5bb8..93e23296a9 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go index b905668363..3934d3d234 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -22,8 +22,8 @@ import ( mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go index e3107ecba2..d6bde42680 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server.go index 9d9d7fa58e..fb23d73912 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server.go @@ -24,7 +24,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/sync" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go index d33e93e605..a816a47ad5 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go @@ -15,7 +15,7 @@ import ( mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go index da6d6f298f..f276fd0f00 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/depositutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go index b0ab28e28e..c733d53ccd 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go @@ -16,7 +16,7 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/service.go b/beacon-chain/rpc/service.go index 843c844648..abd0cd69ea 100644 --- a/beacon-chain/rpc/service.go +++ b/beacon-chain/rpc/service.go @@ -40,7 +40,7 @@ import ( pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" pbrpc "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpbv1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpbv1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/logutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/statefetcher/BUILD.bazel b/beacon-chain/rpc/statefetcher/BUILD.bazel index b10a056b37..4bfeff4457 100644 --- a/beacon-chain/rpc/statefetcher/BUILD.bazel +++ b/beacon-chain/rpc/statefetcher/BUILD.bazel @@ -26,8 +26,8 @@ go_test( "//beacon-chain/db/testing:go_default_library", "//beacon-chain/state/stategen:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/rpc/statefetcher/fetcher_test.go b/beacon-chain/rpc/statefetcher/fetcher_test.go index 46037cb4ec..9ac878dcca 100644 --- a/beacon-chain/rpc/statefetcher/fetcher_test.go +++ b/beacon-chain/rpc/statefetcher/fetcher_test.go @@ -13,8 +13,8 @@ import ( testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/slasher/types/BUILD.bazel b/beacon-chain/slasher/types/BUILD.bazel index e245291108..0d08d73666 100644 --- a/beacon-chain/slasher/types/BUILD.bazel +++ b/beacon-chain/slasher/types/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types", visibility = ["//beacon-chain:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], ) diff --git a/beacon-chain/slasher/types/types.go b/beacon-chain/slasher/types/types.go index e4b2e360a0..3fe085f5b8 100644 --- a/beacon-chain/slasher/types/types.go +++ b/beacon-chain/slasher/types/types.go @@ -2,7 +2,7 @@ package types import ( types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // ChunkKind to differentiate what kind of span we are working diff --git a/beacon-chain/state/interface/BUILD.bazel b/beacon-chain/state/interface/BUILD.bazel index bb7a21e52c..60466d5def 100644 --- a/beacon-chain/state/interface/BUILD.bazel +++ b/beacon-chain/state/interface/BUILD.bazel @@ -24,7 +24,7 @@ go_library( deps = [ "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], diff --git a/beacon-chain/state/interface/phase0.go b/beacon-chain/state/interface/phase0.go index e4940febcc..a89266f841 100644 --- a/beacon-chain/state/interface/phase0.go +++ b/beacon-chain/state/interface/phase0.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // BeaconState has read and write access to beacon state methods. diff --git a/beacon-chain/state/stategen/BUILD.bazel b/beacon-chain/state/stategen/BUILD.bazel index e1eb517bdd..f0ddc0ce10 100644 --- a/beacon-chain/state/stategen/BUILD.bazel +++ b/beacon-chain/state/stategen/BUILD.bazel @@ -61,9 +61,9 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/state/stategen/getter_test.go b/beacon-chain/state/stategen/getter_test.go index f664cf5ccb..4b4bde11a4 100644 --- a/beacon-chain/state/stategen/getter_test.go +++ b/beacon-chain/state/stategen/getter_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/state/stategen/migrate_test.go b/beacon-chain/state/stategen/migrate_test.go index 7281eca88f..48b6b1403e 100644 --- a/beacon-chain/state/stategen/migrate_test.go +++ b/beacon-chain/state/stategen/migrate_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/state/stategen/replay_test.go b/beacon-chain/state/stategen/replay_test.go index c79d66e744..683e19cbe4 100644 --- a/beacon-chain/state/stategen/replay_test.go +++ b/beacon-chain/state/stategen/replay_test.go @@ -9,9 +9,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/state/stategen/service_test.go b/beacon-chain/state/stategen/service_test.go index c3ef2085d0..c58f698d9a 100644 --- a/beacon-chain/state/stategen/service_test.go +++ b/beacon-chain/state/stategen/service_test.go @@ -5,8 +5,8 @@ import ( "testing" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/state/stategen/setter_test.go b/beacon-chain/state/stategen/setter_test.go index 9738907829..a8fff515b9 100644 --- a/beacon-chain/state/stategen/setter_test.go +++ b/beacon-chain/state/stategen/setter_test.go @@ -5,7 +5,7 @@ import ( "testing" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/state/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel index 555304f58a..b046869556 100644 --- a/beacon-chain/state/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -28,7 +28,7 @@ go_library( deps = [ "//beacon-chain/core/state/stateutils:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", @@ -53,7 +53,7 @@ go_test( deps = [ "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/featureconfig:go_default_library", "//shared/hashutil:go_default_library", @@ -83,7 +83,7 @@ go_test( ], deps = [ "//beacon-chain/state/stateutil:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/state/stateutil/block_header_root.go b/beacon-chain/state/stateutil/block_header_root.go index 1cd0ab8aff..a2edfa045c 100644 --- a/beacon-chain/state/stateutil/block_header_root.go +++ b/beacon-chain/state/stateutil/block_header_root.go @@ -3,7 +3,7 @@ package stateutil import ( "encoding/binary" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" diff --git a/beacon-chain/state/stateutil/eth1_root.go b/beacon-chain/state/stateutil/eth1_root.go index c81aa99fbe..4eabd14022 100644 --- a/beacon-chain/state/stateutil/eth1_root.go +++ b/beacon-chain/state/stateutil/eth1_root.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" diff --git a/beacon-chain/state/stateutil/pending_attestation_root.go b/beacon-chain/state/stateutil/pending_attestation_root.go index 608e6460c0..60a5f8c110 100644 --- a/beacon-chain/state/stateutil/pending_attestation_root.go +++ b/beacon-chain/state/stateutil/pending_attestation_root.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/state/stateutil/state_root_test.go b/beacon-chain/state/stateutil/state_root_test.go index 29fdca5475..ee16a8e55e 100644 --- a/beacon-chain/state/stateutil/state_root_test.go +++ b/beacon-chain/state/stateutil/state_root_test.go @@ -7,7 +7,7 @@ import ( "testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/state/stateutil/trie_helpers_test.go b/beacon-chain/state/stateutil/trie_helpers_test.go index 0fdcb14cbe..7cff294577 100644 --- a/beacon-chain/state/stateutil/trie_helpers_test.go +++ b/beacon-chain/state/stateutil/trie_helpers_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/state/stateutil/validator_map_handler.go b/beacon-chain/state/stateutil/validator_map_handler.go index 8ca6f79ed7..2da28870d0 100644 --- a/beacon-chain/state/stateutil/validator_map_handler.go +++ b/beacon-chain/state/stateutil/validator_map_handler.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" coreutils "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // ValidatorMapHandler is a container to hold the map and a reference tracker for how many diff --git a/beacon-chain/state/stateutil/validator_root.go b/beacon-chain/state/stateutil/validator_root.go index 3a990150d5..0b08bad0df 100644 --- a/beacon-chain/state/stateutil/validator_root.go +++ b/beacon-chain/state/stateutil/validator_root.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" diff --git a/beacon-chain/state/stateutil/validator_root_test.go b/beacon-chain/state/stateutil/validator_root_test.go index 56afbe0a1f..ce33f9df0f 100644 --- a/beacon-chain/state/stateutil/validator_root_test.go +++ b/beacon-chain/state/stateutil/validator_root_test.go @@ -3,7 +3,7 @@ package stateutil import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/beacon-chain/state/v1/BUILD.bazel b/beacon-chain/state/v1/BUILD.bazel index 22238b9bc2..9c4339bbc1 100644 --- a/beacon-chain/state/v1/BUILD.bazel +++ b/beacon-chain/state/v1/BUILD.bazel @@ -49,7 +49,7 @@ go_library( "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/copyutil:go_default_library", "//shared/featureconfig:go_default_library", @@ -89,7 +89,7 @@ go_test( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/stateutil:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/copyutil:go_default_library", "//shared/interop:go_default_library", diff --git a/beacon-chain/state/v1/field_trie_helpers.go b/beacon-chain/state/v1/field_trie_helpers.go index 718382e62d..601cff99f0 100644 --- a/beacon-chain/state/v1/field_trie_helpers.go +++ b/beacon-chain/state/v1/field_trie_helpers.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" ) diff --git a/beacon-chain/state/v1/field_trie_test.go b/beacon-chain/state/v1/field_trie_test.go index f9747eddd9..90c325fdba 100644 --- a/beacon-chain/state/v1/field_trie_test.go +++ b/beacon-chain/state/v1/field_trie_test.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/state/v1/getters_block.go b/beacon-chain/state/v1/getters_block.go index b8bfea4cdb..10c9e45927 100644 --- a/beacon-chain/state/v1/getters_block.go +++ b/beacon-chain/state/v1/getters_block.go @@ -1,6 +1,6 @@ package v1 -import ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" +import ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" // LatestBlockHeader stored within the beacon state. func (b *BeaconState) LatestBlockHeader() *ethpb.BeaconBlockHeader { diff --git a/beacon-chain/state/v1/getters_checkpoint.go b/beacon-chain/state/v1/getters_checkpoint.go index 5b8bbb9e9e..410dbc1c5e 100644 --- a/beacon-chain/state/v1/getters_checkpoint.go +++ b/beacon-chain/state/v1/getters_checkpoint.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // JustificationBits marking which epochs have been justified in the beacon chain. diff --git a/beacon-chain/state/v1/getters_eth1.go b/beacon-chain/state/v1/getters_eth1.go index 4c94bd501d..a0f31b003b 100644 --- a/beacon-chain/state/v1/getters_eth1.go +++ b/beacon-chain/state/v1/getters_eth1.go @@ -3,7 +3,7 @@ package v1 import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/htrutils" diff --git a/beacon-chain/state/v1/getters_state.go b/beacon-chain/state/v1/getters_state.go index 209724fdf8..faca0c953e 100644 --- a/beacon-chain/state/v1/getters_state.go +++ b/beacon-chain/state/v1/getters_state.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // InnerStateUnsafe returns the pointer value of the underlying diff --git a/beacon-chain/state/v1/getters_test.go b/beacon-chain/state/v1/getters_test.go index 9bc2eaad93..98c8c879d0 100644 --- a/beacon-chain/state/v1/getters_test.go +++ b/beacon-chain/state/v1/getters_test.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/state/v1/getters_validator.go b/beacon-chain/state/v1/getters_validator.go index 1ff22bfd0e..e031c4c907 100644 --- a/beacon-chain/state/v1/getters_validator.go +++ b/beacon-chain/state/v1/getters_validator.go @@ -11,7 +11,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/hashutil" diff --git a/beacon-chain/state/v1/helpers_test.go b/beacon-chain/state/v1/helpers_test.go index 5ab031b597..afb8a32183 100644 --- a/beacon-chain/state/v1/helpers_test.go +++ b/beacon-chain/state/v1/helpers_test.go @@ -4,7 +4,7 @@ import ( "testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/beacon-chain/state/v1/readonly_validator.go b/beacon-chain/state/v1/readonly_validator.go index e9e7460d85..666b73c096 100644 --- a/beacon-chain/state/v1/readonly_validator.go +++ b/beacon-chain/state/v1/readonly_validator.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) var ( diff --git a/beacon-chain/state/v1/readonly_validator_test.go b/beacon-chain/state/v1/readonly_validator_test.go index 04cc272904..f448e17ad5 100644 --- a/beacon-chain/state/v1/readonly_validator_test.go +++ b/beacon-chain/state/v1/readonly_validator_test.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/state/v1/references_test.go b/beacon-chain/state/v1/references_test.go index da69b73650..5db25cee22 100644 --- a/beacon-chain/state/v1/references_test.go +++ b/beacon-chain/state/v1/references_test.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/state/v1/setters_attestation_test.go b/beacon-chain/state/v1/setters_attestation_test.go index 9fa29806bf..a5ea570d04 100644 --- a/beacon-chain/state/v1/setters_attestation_test.go +++ b/beacon-chain/state/v1/setters_attestation_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/state/v1/setters_block.go b/beacon-chain/state/v1/setters_block.go index fa8b457122..ef4d2ae4ca 100644 --- a/beacon-chain/state/v1/setters_block.go +++ b/beacon-chain/state/v1/setters_block.go @@ -6,7 +6,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // SetLatestBlockHeader in the beacon state. diff --git a/beacon-chain/state/v1/setters_checkpoint.go b/beacon-chain/state/v1/setters_checkpoint.go index 58bb543be9..bf84053ee3 100644 --- a/beacon-chain/state/v1/setters_checkpoint.go +++ b/beacon-chain/state/v1/setters_checkpoint.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // SetJustificationBits for the beacon state. diff --git a/beacon-chain/state/v1/setters_eth1.go b/beacon-chain/state/v1/setters_eth1.go index 68551c144b..53a5683668 100644 --- a/beacon-chain/state/v1/setters_eth1.go +++ b/beacon-chain/state/v1/setters_eth1.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // SetEth1Data for the beacon state. diff --git a/beacon-chain/state/v1/setters_validator.go b/beacon-chain/state/v1/setters_validator.go index 41046c5ca0..ae0a060c9f 100644 --- a/beacon-chain/state/v1/setters_validator.go +++ b/beacon-chain/state/v1/setters_validator.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" ) diff --git a/beacon-chain/state/v1/state_test.go b/beacon-chain/state/v1/state_test.go index 29b1836ad8..5a3759c691 100644 --- a/beacon-chain/state/v1/state_test.go +++ b/beacon-chain/state/v1/state_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/state/v1/state_trie_test.go b/beacon-chain/state/v1/state_trie_test.go index a80d7879fd..afe145c66f 100644 --- a/beacon-chain/state/v1/state_trie_test.go +++ b/beacon-chain/state/v1/state_trie_test.go @@ -10,7 +10,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/state/v1/types_test.go b/beacon-chain/state/v1/types_test.go index fd3a084fc2..3235d85e4e 100644 --- a/beacon-chain/state/v1/types_test.go +++ b/beacon-chain/state/v1/types_test.go @@ -8,7 +8,7 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/state/v2/BUILD.bazel b/beacon-chain/state/v2/BUILD.bazel index 644e8cdd9c..3714527cf1 100644 --- a/beacon-chain/state/v2/BUILD.bazel +++ b/beacon-chain/state/v2/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "//beacon-chain/state/stateutil:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", @@ -43,7 +43,7 @@ go_test( deps = [ "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/state/v2/field_trie.go b/beacon-chain/state/v2/field_trie.go index c6e7a1a5d3..153ce07dca 100644 --- a/beacon-chain/state/v2/field_trie.go +++ b/beacon-chain/state/v2/field_trie.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // FieldTrie is the representation of the representative diff --git a/beacon-chain/state/v2/field_trie_test.go b/beacon-chain/state/v2/field_trie_test.go index f2001ddacc..64310598f0 100644 --- a/beacon-chain/state/v2/field_trie_test.go +++ b/beacon-chain/state/v2/field_trie_test.go @@ -5,7 +5,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index 9eb9654c9d..096fb2ff8e 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -68,9 +68,9 @@ go_library( "//proto/beacon/p2p:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/p2p/v1/wrapper:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared:go_default_library", "//shared/abool:go_default_library", "//shared/bls:go_default_library", @@ -163,9 +163,9 @@ go_test( "//cmd/beacon-chain/flags:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/beacon/p2p/v1/wrapper:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/abool:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", diff --git a/beacon-chain/sync/decode_pubsub_test.go b/beacon-chain/sync/decode_pubsub_test.go index 49b9eea237..7b95d09d47 100644 --- a/beacon-chain/sync/decode_pubsub_test.go +++ b/beacon-chain/sync/decode_pubsub_test.go @@ -10,7 +10,7 @@ import ( pb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptesting "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/fuzz_exports.go b/beacon-chain/sync/fuzz_exports.go index 731b4b3ce6..618418cb39 100644 --- a/beacon-chain/sync/fuzz_exports.go +++ b/beacon-chain/sync/fuzz_exports.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" gcache "github.com/patrickmn/go-cache" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/sync/initial-sync/BUILD.bazel index f2f560c628..91103be89b 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/BUILD.bazel @@ -73,8 +73,8 @@ go_test( "//beacon-chain/sync:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/featureconfig:go_default_library", "//shared/hashutil:go_default_library", @@ -122,9 +122,9 @@ go_test( "//beacon-chain/sync:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/abool:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go index f5836983c3..9d768009dd 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go @@ -20,9 +20,9 @@ import ( beaconsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go index 6061b1dd47..2223dc8133 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go @@ -18,8 +18,8 @@ import ( p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/initial-sync/blocks_queue_test.go b/beacon-chain/sync/initial-sync/blocks_queue_test.go index d27c3984a3..d24195ede0 100644 --- a/beacon-chain/sync/initial-sync/blocks_queue_test.go +++ b/beacon-chain/sync/initial-sync/blocks_queue_test.go @@ -16,9 +16,9 @@ import ( p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" beaconsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "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/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/initial-sync/initial_sync_test.go b/beacon-chain/sync/initial-sync/initial_sync_test.go index a49f8ffaa8..9e84eb338e 100644 --- a/beacon-chain/sync/initial-sync/initial_sync_test.go +++ b/beacon-chain/sync/initial-sync/initial_sync_test.go @@ -22,8 +22,8 @@ import ( beaconsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "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/featureconfig" "github.com/prysmaticlabs/prysm/shared/hashutil" diff --git a/beacon-chain/sync/initial-sync/round_robin_test.go b/beacon-chain/sync/initial-sync/round_robin_test.go index f9ffa7adfe..64fc72752f 100644 --- a/beacon-chain/sync/initial-sync/round_robin_test.go +++ b/beacon-chain/sync/initial-sync/round_robin_test.go @@ -10,9 +10,9 @@ import ( mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/initial-sync/service_test.go b/beacon-chain/sync/initial-sync/service_test.go index 42bec2fc6c..8344b43ab2 100644 --- a/beacon-chain/sync/initial-sync/service_test.go +++ b/beacon-chain/sync/initial-sync/service_test.go @@ -15,8 +15,8 @@ import ( dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/sync/metrics.go b/beacon-chain/sync/metrics.go index 6c782ea414..a5636579cc 100644 --- a/beacon-chain/sync/metrics.go +++ b/beacon-chain/sync/metrics.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/sync/pending_attestations_queue.go b/beacon-chain/sync/pending_attestations_queue.go index 79aaf52898..ba89d4c5b1 100644 --- a/beacon-chain/sync/pending_attestations_queue.go +++ b/beacon-chain/sync/pending_attestations_queue.go @@ -8,7 +8,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" diff --git a/beacon-chain/sync/pending_attestations_queue_test.go b/beacon-chain/sync/pending_attestations_queue_test.go index e62b01e3e9..48806c572b 100644 --- a/beacon-chain/sync/pending_attestations_queue_test.go +++ b/beacon-chain/sync/pending_attestations_queue_test.go @@ -17,8 +17,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/beacon-chain/sync/pending_blocks_queue_test.go b/beacon-chain/sync/pending_blocks_queue_test.go index 08faa9d7aa..f6aa409e68 100644 --- a/beacon-chain/sync/pending_blocks_queue_test.go +++ b/beacon-chain/sync/pending_blocks_queue_test.go @@ -20,8 +20,8 @@ import ( p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go index 428061d6d6..49aa8ca7d0 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go @@ -21,8 +21,8 @@ import ( p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go index 493dc018de..9119dcf5e0 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go @@ -17,8 +17,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" p2pTypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/rpc_chunked_response.go b/beacon-chain/sync/rpc_chunked_response.go index 282b54f1e9..e0b9255f1f 100644 --- a/beacon-chain/sync/rpc_chunked_response.go +++ b/beacon-chain/sync/rpc_chunked_response.go @@ -7,9 +7,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" ) // chunkWriter writes the given message as a chunked response to the given network diff --git a/beacon-chain/sync/rpc_send_request_test.go b/beacon-chain/sync/rpc_send_request_test.go index f58ee7422a..8852737243 100644 --- a/beacon-chain/sync/rpc_send_request_test.go +++ b/beacon-chain/sync/rpc_send_request_test.go @@ -14,9 +14,9 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" p2pTypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/rpc_status_test.go b/beacon-chain/sync/rpc_status_test.go index f15f0c8170..ea8db61af2 100644 --- a/beacon-chain/sync/rpc_status_test.go +++ b/beacon-chain/sync/rpc_status_test.go @@ -22,9 +22,9 @@ import ( mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" p2pWrapper "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1/wrapper" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" p2pInterfaces "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/service.go b/beacon-chain/sync/service.go index 239ada2abe..3690142296 100644 --- a/beacon-chain/sync/service.go +++ b/beacon-chain/sync/service.go @@ -27,7 +27,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/sync/subscriber.go b/beacon-chain/sync/subscriber.go index 641cc0a8b5..961363c7c1 100644 --- a/beacon-chain/sync/subscriber.go +++ b/beacon-chain/sync/subscriber.go @@ -13,7 +13,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/messagehandler" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/sync/subscriber_beacon_aggregate_proof.go b/beacon-chain/sync/subscriber_beacon_aggregate_proof.go index 71397f78a0..b58aeac6be 100644 --- a/beacon-chain/sync/subscriber_beacon_aggregate_proof.go +++ b/beacon-chain/sync/subscriber_beacon_aggregate_proof.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go index 6a26b598a7..316181344f 100644 --- a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go +++ b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/sync/subscriber_beacon_attestation.go b/beacon-chain/sync/subscriber_beacon_attestation.go index c2c7781156..c82e8057bd 100644 --- a/beacon-chain/sync/subscriber_beacon_attestation.go +++ b/beacon-chain/sync/subscriber_beacon_attestation.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/sync/subscriber_beacon_blocks.go b/beacon-chain/sync/subscriber_beacon_blocks.go index ff30ca7c57..32cf05e8d4 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks.go +++ b/beacon-chain/sync/subscriber_beacon_blocks.go @@ -6,8 +6,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_beacon_blocks_test.go b/beacon-chain/sync/subscriber_beacon_blocks_test.go index 03a5c5c642..e26d25495e 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks_test.go +++ b/beacon-chain/sync/subscriber_beacon_blocks_test.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/sync/subscriber_handlers.go b/beacon-chain/sync/subscriber_handlers.go index 66025bf735..5ffd5b9a83 100644 --- a/beacon-chain/sync/subscriber_handlers.go +++ b/beacon-chain/sync/subscriber_handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_test.go b/beacon-chain/sync/subscriber_test.go index 0e53003c8b..5e03ea30e0 100644 --- a/beacon-chain/sync/subscriber_test.go +++ b/beacon-chain/sync/subscriber_test.go @@ -20,7 +20,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/sync/utils_test.go b/beacon-chain/sync/utils_test.go index 4ae1ffa686..827872a767 100644 --- a/beacon-chain/sync/utils_test.go +++ b/beacon-chain/sync/utils_test.go @@ -5,9 +5,9 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/testutil/require" ) diff --git a/beacon-chain/sync/validate_aggregate_proof.go b/beacon-chain/sync/validate_aggregate_proof.go index b970a0f58d..5c14894ed6 100644 --- a/beacon-chain/sync/validate_aggregate_proof.go +++ b/beacon-chain/sync/validate_aggregate_proof.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/sync/validate_aggregate_proof_test.go b/beacon-chain/sync/validate_aggregate_proof_test.go index f6a0b8ada0..fedbd7cda8 100644 --- a/beacon-chain/sync/validate_aggregate_proof_test.go +++ b/beacon-chain/sync/validate_aggregate_proof_test.go @@ -19,8 +19,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptest "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/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/sync/validate_attester_slashing.go b/beacon-chain/sync/validate_attester_slashing.go index 5ed9ac6d63..ce7dd6885f 100644 --- a/beacon-chain/sync/validate_attester_slashing.go +++ b/beacon-chain/sync/validate_attester_slashing.go @@ -6,7 +6,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/traceutil" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/validate_attester_slashing_test.go b/beacon-chain/sync/validate_attester_slashing_test.go index ea7e5b2315..3c447694e0 100644 --- a/beacon-chain/sync/validate_attester_slashing_test.go +++ b/beacon-chain/sync/validate_attester_slashing_test.go @@ -17,7 +17,7 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/validate_beacon_attestation.go b/beacon-chain/sync/validate_beacon_attestation.go index 7859af8aca..d0b682b060 100644 --- a/beacon-chain/sync/validate_beacon_attestation.go +++ b/beacon-chain/sync/validate_beacon_attestation.go @@ -15,7 +15,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/traceutil" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/validate_beacon_attestation_test.go b/beacon-chain/sync/validate_beacon_attestation_test.go index 89aa45fc8f..d320e090a2 100644 --- a/beacon-chain/sync/validate_beacon_attestation_test.go +++ b/beacon-chain/sync/validate_beacon_attestation_test.go @@ -16,8 +16,8 @@ import ( dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" p2ptest "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/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + 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/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/validate_beacon_blocks.go b/beacon-chain/sync/validate_beacon_blocks.go index fb836a7323..66e6067167 100644 --- a/beacon-chain/sync/validate_beacon_blocks.go +++ b/beacon-chain/sync/validate_beacon_blocks.go @@ -14,9 +14,9 @@ import ( blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + 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/params" "github.com/prysmaticlabs/prysm/shared/timeutils" diff --git a/beacon-chain/sync/validate_beacon_blocks_test.go b/beacon-chain/sync/validate_beacon_blocks_test.go index 861d2172e2..d64a34ed84 100644 --- a/beacon-chain/sync/validate_beacon_blocks_test.go +++ b/beacon-chain/sync/validate_beacon_blocks_test.go @@ -23,8 +23,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/sync/validate_proposer_slashing.go b/beacon-chain/sync/validate_proposer_slashing.go index 6524e467b2..403df0cdee 100644 --- a/beacon-chain/sync/validate_proposer_slashing.go +++ b/beacon-chain/sync/validate_proposer_slashing.go @@ -7,7 +7,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/traceutil" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_proposer_slashing_test.go b/beacon-chain/sync/validate_proposer_slashing_test.go index d82585e0b2..ad968d1591 100644 --- a/beacon-chain/sync/validate_proposer_slashing_test.go +++ b/beacon-chain/sync/validate_proposer_slashing_test.go @@ -21,7 +21,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/validate_voluntary_exit.go b/beacon-chain/sync/validate_voluntary_exit.go index 7c67ce6e18..f22047e93a 100644 --- a/beacon-chain/sync/validate_voluntary_exit.go +++ b/beacon-chain/sync/validate_voluntary_exit.go @@ -7,7 +7,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/traceutil" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_voluntary_exit_test.go b/beacon-chain/sync/validate_voluntary_exit_test.go index f7f4de59da..43ae4a8260 100644 --- a/beacon-chain/sync/validate_voluntary_exit_test.go +++ b/beacon-chain/sync/validate_voluntary_exit_test.go @@ -18,7 +18,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/endtoend/BUILD.bazel b/endtoend/BUILD.bazel index f63a4ab946..2eb2de3524 100644 --- a/endtoend/BUILD.bazel +++ b/endtoend/BUILD.bazel @@ -35,7 +35,7 @@ go_test( "//endtoend/helpers:go_default_library", "//endtoend/params:go_default_library", "//endtoend/types:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/endtoend/endtoend_test.go b/endtoend/endtoend_test.go index e1a0b62c4b..3e89e92bd1 100644 --- a/endtoend/endtoend_test.go +++ b/endtoend/endtoend_test.go @@ -21,7 +21,7 @@ import ( "github.com/prysmaticlabs/prysm/endtoend/helpers" e2e "github.com/prysmaticlabs/prysm/endtoend/params" e2etypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/endtoend/evaluators/BUILD.bazel b/endtoend/evaluators/BUILD.bazel index 9a79632602..d6511ba379 100644 --- a/endtoend/evaluators/BUILD.bazel +++ b/endtoend/evaluators/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//endtoend/params:go_default_library", "//endtoend/policies:go_default_library", "//endtoend/types:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", diff --git a/endtoend/evaluators/data.go b/endtoend/evaluators/data.go index 05c1b4e255..d69d2cb112 100644 --- a/endtoend/evaluators/data.go +++ b/endtoend/evaluators/data.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" e2etypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" ) diff --git a/endtoend/evaluators/finality.go b/endtoend/evaluators/finality.go index bfc597423f..4f365c4d72 100644 --- a/endtoend/evaluators/finality.go +++ b/endtoend/evaluators/finality.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/endtoend/policies" "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/endtoend/evaluators/metrics.go b/endtoend/evaluators/metrics.go index a564ad3b1a..1bd04209df 100644 --- a/endtoend/evaluators/metrics.go +++ b/endtoend/evaluators/metrics.go @@ -15,7 +15,7 @@ import ( e2e "github.com/prysmaticlabs/prysm/endtoend/params" "github.com/prysmaticlabs/prysm/endtoend/policies" "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/p2putils" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/endtoend/evaluators/node.go b/endtoend/evaluators/node.go index 82b209042e..cae3a9d649 100644 --- a/endtoend/evaluators/node.go +++ b/endtoend/evaluators/node.go @@ -15,7 +15,7 @@ import ( e2e "github.com/prysmaticlabs/prysm/endtoend/params" "github.com/prysmaticlabs/prysm/endtoend/policies" e2etypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/endtoend/evaluators/operations.go b/endtoend/evaluators/operations.go index 9051b458ff..8ac9d90094 100644 --- a/endtoend/evaluators/operations.go +++ b/endtoend/evaluators/operations.go @@ -13,7 +13,7 @@ import ( e2e "github.com/prysmaticlabs/prysm/endtoend/params" "github.com/prysmaticlabs/prysm/endtoend/policies" e2etypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/endtoend/evaluators/slashing.go b/endtoend/evaluators/slashing.go index a1a4019e5f..af5bc5f798 100644 --- a/endtoend/evaluators/slashing.go +++ b/endtoend/evaluators/slashing.go @@ -10,7 +10,7 @@ import ( corehelpers "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/endtoend/policies" e2eTypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" diff --git a/endtoend/evaluators/validator.go b/endtoend/evaluators/validator.go index 04287ae9b9..b83740b2a8 100644 --- a/endtoend/evaluators/validator.go +++ b/endtoend/evaluators/validator.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/endtoend/policies" "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc" ) diff --git a/endtoend/helpers/BUILD.bazel b/endtoend/helpers/BUILD.bazel index 3589a3a5ac..fd4ed256bd 100644 --- a/endtoend/helpers/BUILD.bazel +++ b/endtoend/helpers/BUILD.bazel @@ -12,7 +12,7 @@ go_library( deps = [ "//endtoend/params:go_default_library", "//endtoend/types:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/slotutil:go_default_library", "//shared/timeutils:go_default_library", diff --git a/endtoend/helpers/helpers.go b/endtoend/helpers/helpers.go index 8514d108dc..687e5ee64f 100644 --- a/endtoend/helpers/helpers.go +++ b/endtoend/helpers/helpers.go @@ -18,7 +18,7 @@ import ( e2e "github.com/prysmaticlabs/prysm/endtoend/params" e2etypes "github.com/prysmaticlabs/prysm/endtoend/types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/slotutil" log "github.com/sirupsen/logrus" diff --git a/fuzz/BUILD.bazel b/fuzz/BUILD.bazel index 85319d41be..d2de79faeb 100644 --- a/fuzz/BUILD.bazel +++ b/fuzz/BUILD.bazel @@ -17,7 +17,7 @@ ssz_gen_marshal( includes = [ "//proto/beacon/p2p/v1:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", ], objs = [ "InputBlockWithPrestate", @@ -29,7 +29,7 @@ IMPORT_PATH = "github.com/prysmaticlabs/prysm/fuzz" COMMON_DEPS = [ "//beacon-chain/state/v1:go_default_library", "//shared/featureconfig:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", ] + SSZ_DEPS COMMON_SRCS = [ @@ -67,7 +67,7 @@ go_fuzz_test( "//shared/params:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/interfaces:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//beacon-chain/operations/attestations:go_default_library", "//beacon-chain/p2p/testing:go_default_library", "//beacon-chain/sync:go_default_library", @@ -199,7 +199,7 @@ go_library( "@com_github_libp2p_go_libp2p_pubsub//pb:go_default_library", "@com_github_libp2p_go_libp2p//:go_default_library", "@com_github_pkg_errors//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ] + SSZ_DEPS, # keep ) @@ -214,6 +214,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", ] + SSZ_DEPS, # keep ) diff --git a/fuzz/block_fuzz.go b/fuzz/block_fuzz.go index 7c3f2d10ec..2af0372e72 100644 --- a/fuzz/block_fuzz.go +++ b/fuzz/block_fuzz.go @@ -28,7 +28,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" "github.com/prysmaticlabs/prysm/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/fuzz/generated.ssz.go b/fuzz/generated.ssz.go index 234be98668..e5a1870145 100644 --- a/fuzz/generated.ssz.go +++ b/fuzz/generated.ssz.go @@ -4,7 +4,7 @@ package fuzz import ( ssz "github.com/ferranbt/fastssz" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // MarshalSSZ ssz marshals the InputBlockWithPrestate object diff --git a/fuzz/inputs.go b/fuzz/inputs.go index b59421f41a..4542100d76 100644 --- a/fuzz/inputs.go +++ b/fuzz/inputs.go @@ -2,7 +2,7 @@ package fuzz import ( pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // InputBlockWithPrestate for fuzz testing beacon blocks. diff --git a/fuzz/rpc_status_fuzz.go b/fuzz/rpc_status_fuzz.go index 4cc4f9b838..e067928be5 100644 --- a/fuzz/rpc_status_fuzz.go +++ b/fuzz/rpc_status_fuzz.go @@ -13,7 +13,7 @@ import ( regularsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/sirupsen/logrus" ) diff --git a/fuzz/ssz_encoder_attestations_fuzz.go b/fuzz/ssz_encoder_attestations_fuzz.go index ef13c6b938..de00f5021b 100644 --- a/fuzz/ssz_encoder_attestations_fuzz.go +++ b/fuzz/ssz_encoder_attestations_fuzz.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/proto/beacon/db/BUILD.bazel b/proto/beacon/db/BUILD.bazel index 6a5ac0811f..08d8cc5ed8 100644 --- a/proto/beacon/db/BUILD.bazel +++ b/proto/beacon/db/BUILD.bazel @@ -13,7 +13,7 @@ proto_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:v1_proto", - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", ], ) @@ -25,7 +25,7 @@ go_proto_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", @@ -39,6 +39,6 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/proto/beacon/db", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", ], ) diff --git a/proto/beacon/db/powchain.pb.go b/proto/beacon/db/powchain.pb.go index 2bfee56871..e79b3502d6 100755 --- a/proto/beacon/db/powchain.pb.go +++ b/proto/beacon/db/powchain.pb.go @@ -12,7 +12,7 @@ import ( proto "github.com/golang/protobuf/proto" v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/proto/beacon/db/powchain.proto b/proto/beacon/db/powchain.proto index a5ed60a456..7ed981750a 100644 --- a/proto/beacon/db/powchain.proto +++ b/proto/beacon/db/powchain.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package prysm.beacon.db; -import "proto/eth/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; import "proto/beacon/p2p/v1/types.proto"; option go_package = "github.com/prysmaticlabs/prysm/proto/beacon/db"; diff --git a/proto/beacon/p2p/v1/BUILD.bazel b/proto/beacon/p2p/v1/BUILD.bazel index 2d153e2523..c75f5bba6b 100644 --- a/proto/beacon/p2p/v1/BUILD.bazel +++ b/proto/beacon/p2p/v1/BUILD.bazel @@ -15,7 +15,7 @@ go_proto_library( deps = [ "@com_github_golang_protobuf//proto:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/eth/ext:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", @@ -31,7 +31,7 @@ ssz_gen_marshal( go_proto = ":v1_go_proto", includes = [ "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", ], objs = [ "BeaconBlocksByRangeRequest", @@ -77,7 +77,7 @@ proto_library( srcs = [":ssz_proto_files"], visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", "//proto/eth/ext:proto", "@com_google_protobuf//:descriptor_proto", "@com_google_protobuf//:timestamp_proto", diff --git a/proto/beacon/p2p/v1/generated.ssz.go b/proto/beacon/p2p/v1/generated.ssz.go index 6589f27420..6e6c5dff2f 100644 --- a/proto/beacon/p2p/v1/generated.ssz.go +++ b/proto/beacon/p2p/v1/generated.ssz.go @@ -5,7 +5,7 @@ package ethereum_beacon_p2p_v1 import ( ssz "github.com/ferranbt/fastssz" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // MarshalSSZ ssz marshals the Status object diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go index 5b684f9841..433d0f8693 100755 --- a/proto/beacon/p2p/v1/types.pb.go +++ b/proto/beacon/p2p/v1/types.pb.go @@ -14,7 +14,7 @@ import ( github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/proto/beacon/p2p/v1/types.proto b/proto/beacon/p2p/v1/types.proto index 993f24a892..b7f594e4f3 100644 --- a/proto/beacon/p2p/v1/types.proto +++ b/proto/beacon/p2p/v1/types.proto @@ -1,9 +1,9 @@ syntax = "proto3"; package ethereum.beacon.p2p.v1; -import "proto/eth/v1alpha1/attestation.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/validator.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/validator.proto"; import "proto/eth/ext/options.proto"; message BeaconState { diff --git a/proto/beacon/rpc/v1/BUILD.bazel b/proto/beacon/rpc/v1/BUILD.bazel index 7d06dbbab4..16515edbb1 100644 --- a/proto/beacon/rpc/v1/BUILD.bazel +++ b/proto/beacon/rpc/v1/BUILD.bazel @@ -14,7 +14,7 @@ go_proto_library( "//proto/beacon/p2p/v1:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@go_googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:empty_go_proto", "//proto/eth/ext:go_default_library", @@ -32,7 +32,7 @@ go_proto_library( deps = [ "//proto/beacon/p2p/v1:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@go_googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@io_bazel_rules_go//proto/wkt:empty_go_proto", @@ -53,7 +53,7 @@ proto_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:v1_proto", - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", "//proto/eth/ext:proto", "@com_google_protobuf//:empty_proto", "@go_googleapis//google/api:annotations_proto", diff --git a/proto/beacon/rpc/v1/debug.pb.go b/proto/beacon/rpc/v1/debug.pb.go index c890a00a21..82605db7c9 100755 --- a/proto/beacon/rpc/v1/debug.pb.go +++ b/proto/beacon/rpc/v1/debug.pb.go @@ -16,7 +16,7 @@ import ( github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/proto/beacon/rpc/v1/debug.pb.gw.go b/proto/beacon/rpc/v1/debug.pb.gw.go index 15ab38a9b6..e9d07fad73 100755 --- a/proto/beacon/rpc/v1/debug.pb.gw.go +++ b/proto/beacon/rpc/v1/debug.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/beacon/rpc/v1/debug.proto b/proto/beacon/rpc/v1/debug.proto index c626f4c5b9..d857f4842a 100644 --- a/proto/beacon/rpc/v1/debug.proto +++ b/proto/beacon/rpc/v1/debug.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package ethereum.beacon.rpc.v1; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/node.proto"; +import "proto/prysm/v1alpha1/node.proto"; import "proto/beacon/p2p/v1/messages.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; diff --git a/proto/beacon/rpc/v1/slasher.pb.go b/proto/beacon/rpc/v1/slasher.pb.go index e727c2a51c..3591d37c5a 100755 --- a/proto/beacon/rpc/v1/slasher.pb.go +++ b/proto/beacon/rpc/v1/slasher.pb.go @@ -15,7 +15,7 @@ import ( _ "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/proto/beacon/rpc/v1/slasher.pb.gw.go b/proto/beacon/rpc/v1/slasher.pb.gw.go index 41672b6cc4..16dc8a1eeb 100755 --- a/proto/beacon/rpc/v1/slasher.pb.gw.go +++ b/proto/beacon/rpc/v1/slasher.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/beacon/rpc/v1/slasher.proto b/proto/beacon/rpc/v1/slasher.proto index c37997bcea..f2fe788fb6 100644 --- a/proto/beacon/rpc/v1/slasher.proto +++ b/proto/beacon/rpc/v1/slasher.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package ethereum.beacon.rpc.v1; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; diff --git a/proto/interfaces/BUILD.bazel b/proto/interfaces/BUILD.bazel index 3f21731a86..01b2931107 100644 --- a/proto/interfaces/BUILD.bazel +++ b/proto/interfaces/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/proto/interfaces", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/proto/interfaces/block_interface.go b/proto/interfaces/block_interface.go index ac944756f2..55d48ef25d 100644 --- a/proto/interfaces/block_interface.go +++ b/proto/interfaces/block_interface.go @@ -3,7 +3,7 @@ package interfaces import ( ssz "github.com/ferranbt/fastssz" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "google.golang.org/protobuf/proto" ) diff --git a/proto/migration/BUILD.bazel b/proto/migration/BUILD.bazel index c6837bed8b..afad460ad4 100644 --- a/proto/migration/BUILD.bazel +++ b/proto/migration/BUILD.bazel @@ -10,8 +10,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_pkg_errors//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], @@ -26,8 +26,8 @@ go_test( embed = [":go_default_library"], deps = [ "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/proto/migration/enums.go b/proto/migration/enums.go index af7835f2ed..a022157f74 100644 --- a/proto/migration/enums.go +++ b/proto/migration/enums.go @@ -3,7 +3,7 @@ package migration import ( "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb_alpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func V1Alpha1ConnectionStateToV1(connState ethpb_alpha.ConnectionState) ethpb.ConnectionState { diff --git a/proto/migration/enums_test.go b/proto/migration/enums_test.go index 7877262b9f..59015d95da 100644 --- a/proto/migration/enums_test.go +++ b/proto/migration/enums_test.go @@ -4,7 +4,7 @@ import ( "testing" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func TestV1Alpha1ConnectionStateToV1(t *testing.T) { diff --git a/proto/migration/migration.go b/proto/migration/migration.go index a86e4faf25..d63a781134 100644 --- a/proto/migration/migration.go +++ b/proto/migration/migration.go @@ -3,8 +3,8 @@ package migration import ( "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb_alpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/proto/migration/migration_test.go b/proto/migration/migration_test.go index 12dbb63535..f3f3f39a2a 100644 --- a/proto/migration/migration_test.go +++ b/proto/migration/migration_test.go @@ -6,8 +6,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb_alpha "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb_alpha "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/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/proto/eth/v1alpha1/BUILD.bazel b/proto/prysm/v1alpha1/BUILD.bazel similarity index 96% rename from proto/eth/v1alpha1/BUILD.bazel rename to proto/prysm/v1alpha1/BUILD.bazel index 0c2be7591f..fe0d34c79b 100644 --- a/proto/eth/v1alpha1/BUILD.bazel +++ b/proto/prysm/v1alpha1/BUILD.bazel @@ -77,7 +77,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -102,7 +102,7 @@ go_proto_library( "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1", protos = [":proto"], visibility = ["//visibility:private"], deps = [ @@ -124,7 +124,7 @@ go_library( embed = [ ":go_grpc_gateway_library", ], - importpath = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1", visibility = ["//visibility:public"], deps = SSZ_DEPS + [ "//proto/eth/ext:go_default_library", diff --git a/proto/eth/v1alpha1/README.md b/proto/prysm/v1alpha1/README.md similarity index 100% rename from proto/eth/v1alpha1/README.md rename to proto/prysm/v1alpha1/README.md diff --git a/proto/eth/v1alpha1/attestation.pb.go b/proto/prysm/v1alpha1/attestation.pb.go similarity index 99% rename from proto/eth/v1alpha1/attestation.pb.go rename to proto/prysm/v1alpha1/attestation.pb.go index 09e94cde7f..dc9aeea593 100755 --- a/proto/eth/v1alpha1/attestation.pb.go +++ b/proto/prysm/v1alpha1/attestation.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.25.0 // protoc v3.15.8 -// source: proto/eth/v1alpha1/attestation.proto +// source: proto/prysm/v1alpha1/attestation.proto package eth diff --git a/proto/eth/v1alpha1/attestation.pb.gw.go b/proto/prysm/v1alpha1/attestation.pb.gw.go similarity index 54% rename from proto/eth/v1alpha1/attestation.pb.gw.go rename to proto/prysm/v1alpha1/attestation.pb.gw.go index 33d2475db2..09b445fb25 100755 --- a/proto/eth/v1alpha1/attestation.pb.gw.go +++ b/proto/prysm/v1alpha1/attestation.pb.gw.go @@ -1,3 +1,3 @@ // +build ignore -package ignore +package eth diff --git a/proto/eth/v1alpha1/attestation.proto b/proto/prysm/v1alpha1/attestation.proto similarity index 97% rename from proto/eth/v1alpha1/attestation.proto rename to proto/prysm/v1alpha1/attestation.proto index f01c76222d..9906adc649 100644 --- a/proto/eth/v1alpha1/attestation.proto +++ b/proto/prysm/v1alpha1/attestation.proto @@ -18,7 +18,7 @@ package ethereum.eth.v1alpha1; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "AttestationProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/eth/v1alpha1/beacon_block.pb.go b/proto/prysm/v1alpha1/beacon_block.pb.go similarity index 99% rename from proto/eth/v1alpha1/beacon_block.pb.go rename to proto/prysm/v1alpha1/beacon_block.pb.go index 66250f0d3d..d73f42465c 100755 --- a/proto/eth/v1alpha1/beacon_block.pb.go +++ b/proto/prysm/v1alpha1/beacon_block.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.25.0 // protoc v3.15.8 -// source: proto/eth/v1alpha1/beacon_block.proto +// source: proto/prysm/v1alpha1/beacon_block.proto package eth diff --git a/proto/eth/v1alpha1/beacon_block.pb.gw.go b/proto/prysm/v1alpha1/beacon_block.pb.gw.go similarity index 54% rename from proto/eth/v1alpha1/beacon_block.pb.gw.go rename to proto/prysm/v1alpha1/beacon_block.pb.gw.go index 33d2475db2..09b445fb25 100755 --- a/proto/eth/v1alpha1/beacon_block.pb.gw.go +++ b/proto/prysm/v1alpha1/beacon_block.pb.gw.go @@ -1,3 +1,3 @@ // +build ignore -package ignore +package eth diff --git a/proto/eth/v1alpha1/beacon_block.proto b/proto/prysm/v1alpha1/beacon_block.proto similarity index 98% rename from proto/eth/v1alpha1/beacon_block.proto rename to proto/prysm/v1alpha1/beacon_block.proto index ea65c6fcfa..e1faffeefd 100644 --- a/proto/eth/v1alpha1/beacon_block.proto +++ b/proto/prysm/v1alpha1/beacon_block.proto @@ -16,10 +16,10 @@ syntax = "proto3"; package ethereum.eth.v1alpha1; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconBlockProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/eth/v1alpha1/beacon_chain.pb.go b/proto/prysm/v1alpha1/beacon_chain.pb.go similarity index 99% rename from proto/eth/v1alpha1/beacon_chain.pb.go rename to proto/prysm/v1alpha1/beacon_chain.pb.go index ff2bd66922..69ffcdf6de 100755 --- a/proto/eth/v1alpha1/beacon_chain.pb.go +++ b/proto/prysm/v1alpha1/beacon_chain.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.25.0 // protoc v3.15.8 -// source: proto/eth/v1alpha1/beacon_chain.proto +// source: proto/prysm/v1alpha1/beacon_chain.proto package eth @@ -5788,5 +5788,5 @@ var _BeaconChain_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "proto/eth/v1alpha1/beacon_chain.proto", + Metadata: "proto/prysm/v1alpha1/beacon_chain.proto", } diff --git a/proto/eth/v1alpha1/beacon_chain.pb.gw.go b/proto/prysm/v1alpha1/beacon_chain.pb.gw.go similarity index 99% rename from proto/eth/v1alpha1/beacon_chain.pb.gw.go rename to proto/prysm/v1alpha1/beacon_chain.pb.gw.go index c9cac5ad4f..8dd18eaebb 100755 --- a/proto/eth/v1alpha1/beacon_chain.pb.gw.go +++ b/proto/prysm/v1alpha1/beacon_chain.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: proto/eth/v1alpha1/beacon_chain.proto +// source: proto/prysm/v1alpha1/beacon_chain.proto /* Package eth is a reverse proxy. diff --git a/proto/eth/v1alpha1/beacon_chain.proto b/proto/prysm/v1alpha1/beacon_chain.proto similarity index 99% rename from proto/eth/v1alpha1/beacon_chain.proto rename to proto/prysm/v1alpha1/beacon_chain.proto index e11c895f57..9c9a7a4458 100644 --- a/proto/eth/v1alpha1/beacon_chain.proto +++ b/proto/prysm/v1alpha1/beacon_chain.proto @@ -19,12 +19,12 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/attestation.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/validator.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/validator.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconChainProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/eth/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go similarity index 100% rename from proto/eth/v1alpha1/generated.ssz.go rename to proto/prysm/v1alpha1/generated.ssz.go diff --git a/proto/eth/v1alpha1/node.pb.go b/proto/prysm/v1alpha1/node.pb.go similarity index 99% rename from proto/eth/v1alpha1/node.pb.go rename to proto/prysm/v1alpha1/node.pb.go index b5050470d5..8084050fcb 100755 --- a/proto/eth/v1alpha1/node.pb.go +++ b/proto/prysm/v1alpha1/node.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.25.0 // protoc v3.15.8 -// source: proto/eth/v1alpha1/node.proto +// source: proto/prysm/v1alpha1/node.proto package eth @@ -1185,5 +1185,5 @@ var _Node_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "proto/eth/v1alpha1/node.proto", + Metadata: "proto/prysm/v1alpha1/node.proto", } diff --git a/proto/eth/v1alpha1/node.pb.gw.go b/proto/prysm/v1alpha1/node.pb.gw.go similarity index 99% rename from proto/eth/v1alpha1/node.pb.gw.go rename to proto/prysm/v1alpha1/node.pb.gw.go index 11c58ca09c..fe47b8b21a 100755 --- a/proto/eth/v1alpha1/node.pb.gw.go +++ b/proto/prysm/v1alpha1/node.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: proto/eth/v1alpha1/node.proto +// source: proto/prysm/v1alpha1/node.proto /* Package eth is a reverse proxy. diff --git a/proto/eth/v1alpha1/node.proto b/proto/prysm/v1alpha1/node.proto similarity index 98% rename from proto/eth/v1alpha1/node.proto rename to proto/prysm/v1alpha1/node.proto index b35105f14b..8c92ba92cb 100644 --- a/proto/eth/v1alpha1/node.proto +++ b/proto/prysm/v1alpha1/node.proto @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "NodeProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/eth/v1alpha1/swagger.proto b/proto/prysm/v1alpha1/swagger.proto similarity index 95% rename from proto/eth/v1alpha1/swagger.proto rename to proto/prysm/v1alpha1/swagger.proto index 51b366f882..73d7ea352e 100644 --- a/proto/eth/v1alpha1/swagger.proto +++ b/proto/prysm/v1alpha1/swagger.proto @@ -20,7 +20,7 @@ package ethereum.eth.v1alpha1; import "protoc-gen-openapiv2/options/annotations.proto"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { diff --git a/proto/eth/v1alpha1/swagger.swagger.json b/proto/prysm/v1alpha1/swagger.swagger.json similarity index 100% rename from proto/eth/v1alpha1/swagger.swagger.json rename to proto/prysm/v1alpha1/swagger.swagger.json diff --git a/proto/eth/v1alpha1/swagger_description.md b/proto/prysm/v1alpha1/swagger_description.md similarity index 100% rename from proto/eth/v1alpha1/swagger_description.md rename to proto/prysm/v1alpha1/swagger_description.md diff --git a/proto/eth/v1alpha1/validator.pb.go b/proto/prysm/v1alpha1/validator.pb.go similarity index 99% rename from proto/eth/v1alpha1/validator.pb.go rename to proto/prysm/v1alpha1/validator.pb.go index 1a5bba69e0..11d1afb510 100755 --- a/proto/eth/v1alpha1/validator.pb.go +++ b/proto/prysm/v1alpha1/validator.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.25.0 // protoc v3.15.8 -// source: proto/eth/v1alpha1/validator.proto +// source: proto/prysm/v1alpha1/validator.proto package eth @@ -3988,5 +3988,5 @@ var _BeaconNodeValidator_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "proto/eth/v1alpha1/validator.proto", + Metadata: "proto/prysm/v1alpha1/validator.proto", } diff --git a/proto/eth/v1alpha1/validator.pb.gw.go b/proto/prysm/v1alpha1/validator.pb.gw.go similarity index 99% rename from proto/eth/v1alpha1/validator.pb.gw.go rename to proto/prysm/v1alpha1/validator.pb.gw.go index b8052a4f17..d6adbd6590 100755 --- a/proto/eth/v1alpha1/validator.pb.gw.go +++ b/proto/prysm/v1alpha1/validator.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: proto/eth/v1alpha1/validator.proto +// source: proto/prysm/v1alpha1/validator.proto /* Package eth is a reverse proxy. diff --git a/proto/eth/v1alpha1/validator.proto b/proto/prysm/v1alpha1/validator.proto similarity index 99% rename from proto/eth/v1alpha1/validator.proto rename to proto/prysm/v1alpha1/validator.proto index 457b578ff6..f62f2015ff 100644 --- a/proto/eth/v1alpha1/validator.proto +++ b/proto/prysm/v1alpha1/validator.proto @@ -19,11 +19,11 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "ValidatorProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/eth/v1alpha1/wrapper/BUILD.bazel b/proto/prysm/v1alpha1/wrapper/BUILD.bazel similarity index 81% rename from proto/eth/v1alpha1/wrapper/BUILD.bazel rename to proto/prysm/v1alpha1/wrapper/BUILD.bazel index af04f8e84b..dfca854158 100644 --- a/proto/eth/v1alpha1/wrapper/BUILD.bazel +++ b/proto/prysm/v1alpha1/wrapper/BUILD.bazel @@ -3,11 +3,11 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["beacon_block.go"], - importpath = "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper", + importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/copyutil:go_default_library", "//shared/version:go_default_library", diff --git a/proto/eth/v1alpha1/wrapper/beacon_block.go b/proto/prysm/v1alpha1/wrapper/beacon_block.go similarity index 99% rename from proto/eth/v1alpha1/wrapper/beacon_block.go rename to proto/prysm/v1alpha1/wrapper/beacon_block.go index ee5cfbccf0..07598ba4be 100644 --- a/proto/eth/v1alpha1/wrapper/beacon_block.go +++ b/proto/prysm/v1alpha1/wrapper/beacon_block.go @@ -3,8 +3,8 @@ package wrapper import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/version" diff --git a/proto/prysm/v2/BUILD.bazel b/proto/prysm/v2/BUILD.bazel index 661802d3f4..378abdfd61 100644 --- a/proto/prysm/v2/BUILD.bazel +++ b/proto/prysm/v2/BUILD.bazel @@ -28,7 +28,7 @@ proto_library( visibility = ["//visibility:public"], deps = [ "//proto/eth/ext:proto", - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-openapiv2/options:options_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:descriptor_proto", @@ -45,7 +45,7 @@ ssz_gen_marshal( name = "ssz_generated_files", go_proto = ":go_proto", includes = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], @@ -71,7 +71,7 @@ go_proto_library( visibility = ["//visibility:public"], deps = [ "//proto/eth/ext:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-openapiv2/options:options_go_proto", "@com_github_prysmaticlabs_eth2_types//:go_default_library", @@ -97,7 +97,7 @@ go_proto_library( visibility = ["//visibility:private"], deps = [ "//proto/eth/ext:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-openapiv2/options:options_go_proto", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@go_googleapis//google/api:annotations_go_proto", @@ -122,7 +122,7 @@ go_library( visibility = ["//visibility:public"], deps = SSZ_DEPS + [ "//proto/eth/ext:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//utilities:go_default_library", "@io_bazel_rules_go//proto/wkt:empty_go_proto", diff --git a/proto/prysm/v2/beacon_block.pb.go b/proto/prysm/v2/beacon_block.pb.go index 3ca560deaf..8c7597095a 100755 --- a/proto/prysm/v2/beacon_block.pb.go +++ b/proto/prysm/v2/beacon_block.pb.go @@ -14,7 +14,7 @@ import ( github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) diff --git a/proto/prysm/v2/beacon_block.proto b/proto/prysm/v2/beacon_block.proto index 68e76725d7..ad72aed29b 100644 --- a/proto/prysm/v2/beacon_block.proto +++ b/proto/prysm/v2/beacon_block.proto @@ -17,8 +17,8 @@ package ethereum.prysm.v2; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; option csharp_namespace = "Ethereum.Prysm.V2"; option go_package = "github.com/prysmaticlabs/prysm/proto/prysm/v2;v2"; diff --git a/proto/prysm/v2/beacon_chain.pb.go b/proto/prysm/v2/beacon_chain.pb.go index 6477eacdea..6f2724d625 100755 --- a/proto/prysm/v2/beacon_chain.pb.go +++ b/proto/prysm/v2/beacon_chain.pb.go @@ -12,7 +12,7 @@ import ( sync "sync" proto "github.com/golang/protobuf/proto" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/proto/prysm/v2/beacon_chain.pb.gw.go b/proto/prysm/v2/beacon_chain.pb.gw.go index fc74b1df4f..18ae8fe0ab 100755 --- a/proto/prysm/v2/beacon_chain.pb.gw.go +++ b/proto/prysm/v2/beacon_chain.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/prysm/v2/beacon_chain.proto b/proto/prysm/v2/beacon_chain.proto index 16fd1a3c2c..ced336a2cc 100644 --- a/proto/prysm/v2/beacon_chain.proto +++ b/proto/prysm/v2/beacon_chain.proto @@ -16,8 +16,8 @@ syntax = "proto3"; package ethereum.prysm.v2; import "google/api/annotations.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/beacon_chain.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/beacon_chain.proto"; import "proto/prysm/v2/beacon_block.proto"; option csharp_namespace = "Ethereum.Prysm.V2"; diff --git a/proto/prysm/v2/generated.ssz.go b/proto/prysm/v2/generated.ssz.go index 86ff653ebd..ba9584514e 100644 --- a/proto/prysm/v2/generated.ssz.go +++ b/proto/prysm/v2/generated.ssz.go @@ -5,7 +5,7 @@ package v2 import ( ssz "github.com/ferranbt/fastssz" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // MarshalSSZ ssz marshals the SignedBeaconBlockAltair object diff --git a/proto/prysm/v2/validator.pb.go b/proto/prysm/v2/validator.pb.go index 54a4595063..d8c775a93d 100755 --- a/proto/prysm/v2/validator.pb.go +++ b/proto/prysm/v2/validator.pb.go @@ -15,7 +15,7 @@ import ( empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/proto/prysm/v2/validator.pb.gw.go b/proto/prysm/v2/validator.pb.gw.go index bd7093d0ff..9b105eb582 100755 --- a/proto/prysm/v2/validator.pb.gw.go +++ b/proto/prysm/v2/validator.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/prysm/v2/validator.proto b/proto/prysm/v2/validator.proto index b111e9140a..74498e57d3 100644 --- a/proto/prysm/v2/validator.proto +++ b/proto/prysm/v2/validator.proto @@ -20,9 +20,9 @@ import "google/protobuf/empty.proto"; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/validator.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; -import "proto/eth/v1alpha1/beacon_chain.proto"; +import "proto/prysm/v1alpha1/validator.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/beacon_chain.proto"; import "proto/prysm/v2/beacon_block.proto"; import "proto/prysm/v2/sync_committee.proto"; diff --git a/proto/prysm/v2/wrapper/BUILD.bazel b/proto/prysm/v2/wrapper/BUILD.bazel index ded5c0ff3a..67cc75c7be 100644 --- a/proto/prysm/v2/wrapper/BUILD.bazel +++ b/proto/prysm/v2/wrapper/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/proto/prysm/v2/wrapper", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/copyutil:go_default_library", "//shared/version:go_default_library", @@ -22,7 +22,7 @@ go_test( srcs = ["beacon_block_test.go"], deps = [ ":go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/proto/prysm/v2/wrapper/beacon_block.go b/proto/prysm/v2/wrapper/beacon_block.go index 73af508db7..778ba49e00 100644 --- a/proto/prysm/v2/wrapper/beacon_block.go +++ b/proto/prysm/v2/wrapper/beacon_block.go @@ -3,8 +3,8 @@ package wrapper import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/version" diff --git a/proto/prysm/v2/wrapper/beacon_block_test.go b/proto/prysm/v2/wrapper/beacon_block_test.go index ffe118cf8c..1f6d9f5c5e 100644 --- a/proto/prysm/v2/wrapper/beacon_block_test.go +++ b/proto/prysm/v2/wrapper/beacon_block_test.go @@ -5,7 +5,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/proto/prysm/v2/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/proto/slashing/BUILD.bazel b/proto/slashing/BUILD.bazel index ca7a9e0fa6..01ef233ce0 100644 --- a/proto/slashing/BUILD.bazel +++ b/proto/slashing/BUILD.bazel @@ -9,7 +9,7 @@ proto_library( srcs = ["slashing.proto"], visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", "//proto/eth/ext:proto", "@com_google_protobuf//:empty_proto", ], @@ -23,7 +23,7 @@ go_proto_library( visibility = ["//visibility:public"], deps = [ "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/eth/ext:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", diff --git a/proto/slashing/slashing.pb.go b/proto/slashing/slashing.pb.go index 34f7c2c707..bbaded0a2f 100755 --- a/proto/slashing/slashing.pb.go +++ b/proto/slashing/slashing.pb.go @@ -15,7 +15,7 @@ import ( github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/slashing/slashing.proto b/proto/slashing/slashing.proto index 26ba77bcf0..faa8ddd5be 100644 --- a/proto/slashing/slashing.proto +++ b/proto/slashing/slashing.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package ethereum.slashing; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; // Slasher service API // diff --git a/proto/testing/BUILD.bazel b/proto/testing/BUILD.bazel index bdd0712373..1fa398136f 100644 --- a/proto/testing/BUILD.bazel +++ b/proto/testing/BUILD.bazel @@ -63,7 +63,7 @@ go_test( "@com_github_golang_snappy//:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_ghodss_yaml//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@io_bazel_rules_go//go/tools/bazel:go_default_library", ], ) diff --git a/proto/testing/tags_test.go b/proto/testing/tags_test.go index 7a0c0a7237..30ab6e8cbe 100644 --- a/proto/testing/tags_test.go +++ b/proto/testing/tags_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/proto/validator/accounts/v2/BUILD.bazel b/proto/validator/accounts/v2/BUILD.bazel index 9e35b8bbe6..c28a4f1bcd 100644 --- a/proto/validator/accounts/v2/BUILD.bazel +++ b/proto/validator/accounts/v2/BUILD.bazel @@ -12,7 +12,7 @@ proto_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/rpc/v1:v1_proto", - "//proto/eth/v1alpha1:proto", + "//proto/prysm/v1alpha1:proto", "//proto/prysm/v2:proto", "//proto/eth/ext:proto", "@com_google_protobuf//:empty_proto", @@ -32,7 +32,7 @@ go_proto_library( "//proto/beacon/rpc/v1:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//proto/eth/ext:go_default_library", "@go_googleapis//google/api:annotations_go_proto", @@ -55,7 +55,7 @@ go_proto_library( "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//proto/eth/ext:go_default_library", "@go_googleapis//google/api:annotations_go_proto", diff --git a/proto/validator/accounts/v2/keymanager.pb.go b/proto/validator/accounts/v2/keymanager.pb.go index 6b5b647f43..3bb4cde20b 100755 --- a/proto/validator/accounts/v2/keymanager.pb.go +++ b/proto/validator/accounts/v2/keymanager.pb.go @@ -15,7 +15,7 @@ import ( empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" _ "github.com/prysmaticlabs/prysm/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" v2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" diff --git a/proto/validator/accounts/v2/keymanager.proto b/proto/validator/accounts/v2/keymanager.proto index 1f2dd8e8c4..eb42ff784e 100644 --- a/proto/validator/accounts/v2/keymanager.proto +++ b/proto/validator/accounts/v2/keymanager.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package ethereum.validator.accounts.v2; import "proto/eth/ext/options.proto"; -import "proto/eth/v1alpha1/attestation.proto"; -import "proto/eth/v1alpha1/beacon_block.proto"; +import "proto/prysm/v1alpha1/attestation.proto"; +import "proto/prysm/v1alpha1/beacon_block.proto"; import "proto/prysm/v2/beacon_block.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; diff --git a/proto/validator/accounts/v2/web_api.pb.go b/proto/validator/accounts/v2/web_api.pb.go index 3bcff7b081..7352547537 100755 --- a/proto/validator/accounts/v2/web_api.pb.go +++ b/proto/validator/accounts/v2/web_api.pb.go @@ -14,7 +14,7 @@ import ( proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" v1 "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/proto/validator/accounts/v2/web_api.pb.gw.go b/proto/validator/accounts/v2/web_api.pb.gw.go index ff8c00ffbe..66299e1953 100755 --- a/proto/validator/accounts/v2/web_api.pb.gw.go +++ b/proto/validator/accounts/v2/web_api.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/validator/accounts/v2/web_api.proto b/proto/validator/accounts/v2/web_api.proto index bdc43727ac..8e2538473e 100644 --- a/proto/validator/accounts/v2/web_api.proto +++ b/proto/validator/accounts/v2/web_api.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package ethereum.validator.accounts.v2; import "proto/beacon/rpc/v1/health.proto"; -import "proto/eth/v1alpha1/beacon_chain.proto"; -import "proto/eth/v1alpha1/node.proto"; +import "proto/prysm/v1alpha1/beacon_chain.proto"; +import "proto/prysm/v1alpha1/node.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; diff --git a/scripts/update-mockgen.sh b/scripts/update-mockgen.sh index 0b3ec27bf2..01066ef5ba 100755 --- a/scripts/update-mockgen.sh +++ b/scripts/update-mockgen.sh @@ -18,7 +18,7 @@ for ((i = 0; i < ${#mocks[@]}; i++)); do file=${mocks[i]% *}; interfaces=${mocks[i]#* }; echo "generating $file for interfaces: $interfaces"; - GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 "$interfaces" + GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 "$interfaces" GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/proto/validator/accounts/v2 "$interfaces" done diff --git a/shared/aggregation/attestations/BUILD.bazel b/shared/aggregation/attestations/BUILD.bazel index 274774a9ff..42fc259ab0 100644 --- a/shared/aggregation/attestations/BUILD.bazel +++ b/shared/aggregation/attestations/BUILD.bazel @@ -10,7 +10,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/aggregation/attestations", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", "//shared/bls:go_default_library", "//shared/copyutil:go_default_library", @@ -30,7 +30,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/testing:go_default_library", "//shared/bls:go_default_library", diff --git a/shared/aggregation/attestations/attestations.go b/shared/aggregation/attestations/attestations.go index ddfdb179fe..b9cbee6d5c 100644 --- a/shared/aggregation/attestations/attestations.go +++ b/shared/aggregation/attestations/attestations.go @@ -2,7 +2,7 @@ package attestations import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/copyutil" diff --git a/shared/aggregation/attestations/attestations_bench_test.go b/shared/aggregation/attestations/attestations_bench_test.go index 17346bc8a5..710d92a3d5 100644 --- a/shared/aggregation/attestations/attestations_bench_test.go +++ b/shared/aggregation/attestations/attestations_bench_test.go @@ -7,7 +7,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/shared/aggregation/attestations/attestations_test.go b/shared/aggregation/attestations/attestations_test.go index e5ad7e5576..d45efe55bd 100644 --- a/shared/aggregation/attestations/attestations_test.go +++ b/shared/aggregation/attestations/attestations_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/shared/aggregation/attestations/maxcover.go b/shared/aggregation/attestations/maxcover.go index 6549707f6a..1763be6484 100644 --- a/shared/aggregation/attestations/maxcover.go +++ b/shared/aggregation/attestations/maxcover.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/copyutil" diff --git a/shared/aggregation/attestations/maxcover_test.go b/shared/aggregation/attestations/maxcover_test.go index e145cf3c21..aab0be6574 100644 --- a/shared/aggregation/attestations/maxcover_test.go +++ b/shared/aggregation/attestations/maxcover_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/aggregation/attestations/naive.go b/shared/aggregation/attestations/naive.go index 0b2c27ea69..fc26417242 100644 --- a/shared/aggregation/attestations/naive.go +++ b/shared/aggregation/attestations/naive.go @@ -1,6 +1,6 @@ package attestations -import ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" +import ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" // NaiveAttestationAggregation aggregates naively, without any complex algorithms or optimizations. // Note: this is currently a naive implementation to the order of O(mn^2). diff --git a/shared/aggregation/testing/BUILD.bazel b/shared/aggregation/testing/BUILD.bazel index 6f86198660..edbc82b2ed 100644 --- a/shared/aggregation/testing/BUILD.bazel +++ b/shared/aggregation/testing/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/aggregation/testing", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/bls:go_default_library", "//shared/timeutils:go_default_library", diff --git a/shared/aggregation/testing/bitlistutils.go b/shared/aggregation/testing/bitlistutils.go index dbb1abe585..bd03f92503 100644 --- a/shared/aggregation/testing/bitlistutils.go +++ b/shared/aggregation/testing/bitlistutils.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/timeutils" diff --git a/shared/attestationutil/BUILD.bazel b/shared/attestationutil/BUILD.bazel index 987c35eecb..8c1f42a00f 100644 --- a/shared/attestationutil/BUILD.bazel +++ b/shared/attestationutil/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", @@ -22,7 +22,7 @@ go_test( srcs = ["attestation_utils_test.go"], deps = [ ":go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/attestationutil/attestation_utils.go b/shared/attestationutil/attestation_utils.go index 4a73ecc7dc..4b71c85660 100644 --- a/shared/attestationutil/attestation_utils.go +++ b/shared/attestationutil/attestation_utils.go @@ -12,7 +12,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/shared/attestationutil/attestation_utils_test.go b/shared/attestationutil/attestation_utils_test.go index 18c710ea36..136ad4f1b8 100644 --- a/shared/attestationutil/attestation_utils_test.go +++ b/shared/attestationutil/attestation_utils_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/benchutil/BUILD.bazel b/shared/benchutil/BUILD.bazel index 3ab28f88c0..44a7832cc7 100644 --- a/shared/benchutil/BUILD.bazel +++ b/shared/benchutil/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@io_bazel_rules_go//go/tools/bazel:go_default_library", ], diff --git a/shared/benchutil/pregen.go b/shared/benchutil/pregen.go index 6717f5b1db..053daba9af 100644 --- a/shared/benchutil/pregen.go +++ b/shared/benchutil/pregen.go @@ -10,7 +10,7 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/shared/blockutil/BUILD.bazel b/shared/blockutil/BUILD.bazel index 715dec319d..19d1f754bf 100644 --- a/shared/blockutil/BUILD.bazel +++ b/shared/blockutil/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/blockutil", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_pkg_errors//:go_default_library", ], ) @@ -17,8 +17,8 @@ go_test( srcs = ["block_utils_test.go"], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/shared/blockutil/block_utils.go b/shared/blockutil/block_utils.go index 930927a435..bceff3001d 100644 --- a/shared/blockutil/block_utils.go +++ b/shared/blockutil/block_utils.go @@ -2,8 +2,8 @@ package blockutil import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // SignedBeaconBlockHeaderFromBlock function to retrieve signed block header from block. diff --git a/shared/blockutil/block_utils_test.go b/shared/blockutil/block_utils_test.go index 3d80a0144d..caacd30d33 100644 --- a/shared/blockutil/block_utils_test.go +++ b/shared/blockutil/block_utils_test.go @@ -3,8 +3,8 @@ package blockutil import ( "testing" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "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/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/clientstats/BUILD.bazel b/shared/clientstats/BUILD.bazel index 8a6716ee38..201353b60b 100644 --- a/shared/clientstats/BUILD.bazel +++ b/shared/clientstats/BUILD.bazel @@ -11,7 +11,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/clientstats", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "@com_github_prometheus_client_model//go:go_default_library", "@com_github_prometheus_prom2json//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/shared/clientstats/scrapers.go b/shared/clientstats/scrapers.go index d4d5005114..8d1b988c9b 100644 --- a/shared/clientstats/scrapers.go +++ b/shared/clientstats/scrapers.go @@ -11,7 +11,7 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/prom2json" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" ) diff --git a/shared/copyutil/BUILD.bazel b/shared/copyutil/BUILD.bazel index 1445ec61d9..e9c13f5bc8 100644 --- a/shared/copyutil/BUILD.bazel +++ b/shared/copyutil/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/bytesutil:go_default_library", ], @@ -19,7 +19,7 @@ go_test( embed = [":go_default_library"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/testutil/assert:go_default_library", ], diff --git a/shared/copyutil/cloners.go b/shared/copyutil/cloners.go index 02fb18acd9..ed78f7dfb4 100644 --- a/shared/copyutil/cloners.go +++ b/shared/copyutil/cloners.go @@ -2,7 +2,7 @@ package copyutil import ( pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" ) diff --git a/shared/copyutil/cloners_test.go b/shared/copyutil/cloners_test.go index f357b00fc5..438a90d963 100644 --- a/shared/copyutil/cloners_test.go +++ b/shared/copyutil/cloners_test.go @@ -6,7 +6,7 @@ import ( "testing" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/shared/depositutil/BUILD.bazel b/shared/depositutil/BUILD.bazel index 63132077d6..889ecd3fe5 100644 --- a/shared/depositutil/BUILD.bazel +++ b/shared/depositutil/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//beacon-chain/core/helpers:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/copyutil:go_default_library", "//shared/featureconfig:go_default_library", diff --git a/shared/depositutil/deposit.go b/shared/depositutil/deposit.go index ed66211dfa..650d41295a 100644 --- a/shared/depositutil/deposit.go +++ b/shared/depositutil/deposit.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/copyutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/shared/hashutil/BUILD.bazel b/shared/hashutil/BUILD.bazel index 7422917b28..f2a84dab11 100644 --- a/shared/hashutil/BUILD.bazel +++ b/shared/hashutil/BUILD.bazel @@ -21,7 +21,7 @@ go_test( srcs = ["hash_test.go"], deps = [ ":go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/testing:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/shared/hashutil/hash_test.go b/shared/hashutil/hash_test.go index d7a9d56fb7..8d19347a1c 100644 --- a/shared/hashutil/hash_test.go +++ b/shared/hashutil/hash_test.go @@ -5,7 +5,7 @@ import ( "testing" fuzz "github.com/google/gofuzz" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/testing" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/shared/htrutils/BUILD.bazel b/shared/htrutils/BUILD.bazel index cbed68542c..42a25279be 100644 --- a/shared/htrutils/BUILD.bazel +++ b/shared/htrutils/BUILD.bazel @@ -12,7 +12,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/params:go_default_library", @@ -35,7 +35,7 @@ go_test( deps = [ ":go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/hashutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/htrutils/htrutils.go b/shared/htrutils/htrutils.go index aa60b3fba4..dd272e8ebf 100644 --- a/shared/htrutils/htrutils.go +++ b/shared/htrutils/htrutils.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/shared/htrutils/htrutils_test.go b/shared/htrutils/htrutils_test.go index d856dd4191..fc5f6fb480 100644 --- a/shared/htrutils/htrutils_test.go +++ b/shared/htrutils/htrutils_test.go @@ -4,7 +4,7 @@ import ( "testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/interop/BUILD.bazel b/shared/interop/BUILD.bazel index 927a1e6217..c10b8f5e88 100644 --- a/shared/interop/BUILD.bazel +++ b/shared/interop/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//beacon-chain/core/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/hashutil:go_default_library", "//shared/mputil:go_default_library", @@ -36,7 +36,7 @@ go_test( deps = [ ":go_default_library", "//beacon-chain/core/state:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/interop/generate_genesis_state.go b/shared/interop/generate_genesis_state.go index 5187222bc9..0ab2714c37 100644 --- a/shared/interop/generate_genesis_state.go +++ b/shared/interop/generate_genesis_state.go @@ -11,7 +11,7 @@ import ( coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/state" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mputil" diff --git a/shared/interop/generate_genesis_state_test.go b/shared/interop/generate_genesis_state_test.go index c573edf2ec..c35b0ee0c3 100644 --- a/shared/interop/generate_genesis_state_test.go +++ b/shared/interop/generate_genesis_state_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/mock/BUILD.bazel b/shared/mock/BUILD.bazel index a25b04380d..6c3e92e5ad 100644 --- a/shared/mock/BUILD.bazel +++ b/shared/mock/BUILD.bazel @@ -17,7 +17,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/validator/accounts/v2:go_default_library", "@com_github_golang_mock//gomock:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//proto/gateway:go_default_library", diff --git a/shared/mock/beacon_chain_service_mock.go b/shared/mock/beacon_chain_service_mock.go index 17723b4621..8acdf1fb95 100644 --- a/shared/mock/beacon_chain_service_mock.go +++ b/shared/mock/beacon_chain_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer) +// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" ) diff --git a/shared/mock/beacon_service_mock.go b/shared/mock/beacon_service_mock.go index 20a58c681c..8dc444126e 100644 --- a/shared/mock/beacon_service_mock.go +++ b/shared/mock/beacon_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient) +// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/shared/mock/beacon_validator_client_mock.go b/shared/mock/beacon_validator_client_mock.go index 7c8cfbecee..0e0e2e6558 100644 --- a/shared/mock/beacon_validator_client_mock.go +++ b/shared/mock/beacon_validator_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient) +// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/shared/mock/beacon_validator_server_mock.go b/shared/mock/beacon_validator_server_mock.go index 0822b7af29..53dfa7b45c 100644 --- a/shared/mock/beacon_validator_server_mock.go +++ b/shared/mock/beacon_validator_server_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer) +// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/shared/mock/node_service_mock.go b/shared/mock/node_service_mock.go index b46751f469..d50f0547cb 100644 --- a/shared/mock/node_service_mock.go +++ b/shared/mock/node_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/proto/eth/v1alpha1 (interfaces: NodeClient) +// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: NodeClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1alpha1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/shared/slashutil/BUILD.bazel b/shared/slashutil/BUILD.bazel index 1465836d26..6f78d485d3 100644 --- a/shared/slashutil/BUILD.bazel +++ b/shared/slashutil/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/slashutil", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", ], ) @@ -22,7 +22,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], diff --git a/shared/slashutil/surround_votes.go b/shared/slashutil/surround_votes.go index 47f68c3ec8..a33c1c855a 100644 --- a/shared/slashutil/surround_votes.go +++ b/shared/slashutil/surround_votes.go @@ -1,6 +1,6 @@ package slashutil -import ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" +import ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" // IsSurround checks if an attestation, a, is surrounding // another one, b, based on the Ethereum slashing conditions specified diff --git a/shared/slashutil/surround_votes_test.go b/shared/slashutil/surround_votes_test.go index fa3cf2712c..3128bdeeeb 100644 --- a/shared/slashutil/surround_votes_test.go +++ b/shared/slashutil/surround_votes_test.go @@ -4,7 +4,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) func TestIsSurround(t *testing.T) { diff --git a/shared/sszutil/BUILD.bazel b/shared/sszutil/BUILD.bazel index c67065e53c..ef5e5c71e6 100644 --- a/shared/sszutil/BUILD.bazel +++ b/shared/sszutil/BUILD.bazel @@ -18,7 +18,7 @@ go_test( deps = [ ":go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/testutil/assert:go_default_library", ], ) diff --git a/shared/sszutil/deep_equal_test.go b/shared/sszutil/deep_equal_test.go index 85d589aef2..5f3cbdb4b9 100644 --- a/shared/sszutil/deep_equal_test.go +++ b/shared/sszutil/deep_equal_test.go @@ -4,7 +4,7 @@ import ( "testing" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/sszutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/shared/testutil/BUILD.bazel b/shared/testutil/BUILD.bazel index 5261f2b7e2..6d3b17d168 100644 --- a/shared/testutil/BUILD.bazel +++ b/shared/testutil/BUILD.bazel @@ -21,8 +21,8 @@ go_library( "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", @@ -56,8 +56,8 @@ go_test( "//beacon-chain/core/state/stateutils:go_default_library", "//proto/beacon/p2p/v1:go_default_library", "//proto/eth/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/prysm/v2:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", diff --git a/shared/testutil/assertions/BUILD.bazel b/shared/testutil/assertions/BUILD.bazel index 4a9e151691..73253dbd7b 100644 --- a/shared/testutil/assertions/BUILD.bazel +++ b/shared/testutil/assertions/BUILD.bazel @@ -18,7 +18,7 @@ go_test( srcs = ["assertions_test.go"], deps = [ ":go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/testing:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/testutil/assertions/assertions_test.go b/shared/testutil/assertions/assertions_test.go index 505105755e..cbdb740453 100644 --- a/shared/testutil/assertions/assertions_test.go +++ b/shared/testutil/assertions/assertions_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" testpb "github.com/prysmaticlabs/prysm/proto/testing" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/assertions" diff --git a/shared/testutil/attestation.go b/shared/testutil/attestation.go index 38759f2a68..01a37dfb0b 100644 --- a/shared/testutil/attestation.go +++ b/shared/testutil/attestation.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" diff --git a/shared/testutil/attestation_test.go b/shared/testutil/attestation_test.go index 28b22d8041..3f65417a05 100644 --- a/shared/testutil/attestation_test.go +++ b/shared/testutil/attestation_test.go @@ -3,7 +3,7 @@ package testutil import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/testutil/block.go b/shared/testutil/block.go index 32203d179a..7af06e57a7 100644 --- a/shared/testutil/block.go +++ b/shared/testutil/block.go @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" prysmv2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/shared/testutil/block_test.go b/shared/testutil/block_test.go index 502e0535ee..cac212d74e 100644 --- a/shared/testutil/block_test.go +++ b/shared/testutil/block_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" v2 "github.com/prysmaticlabs/prysm/proto/prysm/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/shared/testutil/deposits.go b/shared/testutil/deposits.go index f258212144..1a4f351ece 100644 --- a/shared/testutil/deposits.go +++ b/shared/testutil/deposits.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" diff --git a/shared/testutil/helpers.go b/shared/testutil/helpers.go index 1f205797c9..7d71ec88e6 100644 --- a/shared/testutil/helpers.go +++ b/shared/testutil/helpers.go @@ -10,8 +10,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/state" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/rand" diff --git a/shared/testutil/state.go b/shared/testutil/state.go index b30627facf..bd18032565 100644 --- a/shared/testutil/state.go +++ b/shared/testutil/state.go @@ -8,7 +8,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/shared/trieutil/BUILD.bazel b/shared/trieutil/BUILD.bazel index 0a19d62ad2..49dd4e26ff 100644 --- a/shared/trieutil/BUILD.bazel +++ b/shared/trieutil/BUILD.bazel @@ -28,7 +28,7 @@ go_test( embed = [":go_default_library"], deps = [ "//contracts/deposit-contract:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/params:go_default_library", diff --git a/shared/trieutil/sparse_merkle_test.go b/shared/trieutil/sparse_merkle_test.go index 1c808c9eba..9193b042d1 100644 --- a/shared/trieutil/sparse_merkle_test.go +++ b/shared/trieutil/sparse_merkle_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/slasher/beaconclient/BUILD.bazel b/slasher/beaconclient/BUILD.bazel index 639880d91c..eba21924e2 100644 --- a/slasher/beaconclient/BUILD.bazel +++ b/slasher/beaconclient/BUILD.bazel @@ -16,7 +16,7 @@ go_library( visibility = ["//slasher:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/cmd:go_default_library", "//shared/event:go_default_library", "//shared/grpcutils:go_default_library", @@ -57,7 +57,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/event:go_default_library", "//shared/mock:go_default_library", "//shared/params:go_default_library", diff --git a/slasher/beaconclient/chain_data.go b/slasher/beaconclient/chain_data.go index ad648fd508..a00539dd38 100644 --- a/slasher/beaconclient/chain_data.go +++ b/slasher/beaconclient/chain_data.go @@ -5,7 +5,7 @@ import ( "time" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" "google.golang.org/protobuf/types/known/emptypb" diff --git a/slasher/beaconclient/chain_data_test.go b/slasher/beaconclient/chain_data_test.go index 4f46d5911a..f665673a55 100644 --- a/slasher/beaconclient/chain_data_test.go +++ b/slasher/beaconclient/chain_data_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/slasher/beaconclient/historical_data_retrieval.go b/slasher/beaconclient/historical_data_retrieval.go index f236041b4c..b39615cddd 100644 --- a/slasher/beaconclient/historical_data_retrieval.go +++ b/slasher/beaconclient/historical_data_retrieval.go @@ -4,7 +4,7 @@ import ( "context" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/cmd" "go.opencensus.io/trace" ) diff --git a/slasher/beaconclient/historical_data_retrieval_test.go b/slasher/beaconclient/historical_data_retrieval_test.go index b44891cc6e..9196768870 100644 --- a/slasher/beaconclient/historical_data_retrieval_test.go +++ b/slasher/beaconclient/historical_data_retrieval_test.go @@ -7,7 +7,7 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/slasher/beaconclient/receivers.go b/slasher/beaconclient/receivers.go index 255184d19d..99606fbec7 100644 --- a/slasher/beaconclient/receivers.go +++ b/slasher/beaconclient/receivers.go @@ -7,7 +7,7 @@ import ( "io" "time" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/slotutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/slasher/beaconclient/receivers_test.go b/slasher/beaconclient/receivers_test.go index 5685c514ff..06f535d23a 100644 --- a/slasher/beaconclient/receivers_test.go +++ b/slasher/beaconclient/receivers_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/slotutil" diff --git a/slasher/beaconclient/service.go b/slasher/beaconclient/service.go index 2e5c625605..a3efe52c7c 100644 --- a/slasher/beaconclient/service.go +++ b/slasher/beaconclient/service.go @@ -13,7 +13,7 @@ import ( grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/slasher/cache" diff --git a/slasher/beaconclient/submit.go b/slasher/beaconclient/submit.go index d5c5a89c55..08e8ab6edc 100644 --- a/slasher/beaconclient/submit.go +++ b/slasher/beaconclient/submit.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/slasher/beaconclient/submit_test.go b/slasher/beaconclient/submit_test.go index 6df864ccba..dfda41876b 100644 --- a/slasher/beaconclient/submit_test.go +++ b/slasher/beaconclient/submit_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/slasher/beaconclient/validator_retrieval.go b/slasher/beaconclient/validator_retrieval.go index f12793de9c..cd717e0655 100644 --- a/slasher/beaconclient/validator_retrieval.go +++ b/slasher/beaconclient/validator_retrieval.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/slasher/beaconclient/validator_retrieval_test.go b/slasher/beaconclient/validator_retrieval_test.go index e47075fcf3..c1a32fa6c5 100644 --- a/slasher/beaconclient/validator_retrieval_test.go +++ b/slasher/beaconclient/validator_retrieval_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/slasher/db/iface/BUILD.bazel b/slasher/db/iface/BUILD.bazel index 1748052368..ecbd4eb990 100644 --- a/slasher/db/iface/BUILD.bazel +++ b/slasher/db/iface/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/db/iface", visibility = ["//slasher/db:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/backuputil:go_default_library", "//slasher/db/types:go_default_library", diff --git a/slasher/db/iface/interface.go b/slasher/db/iface/interface.go index 936a973fc1..d11095a475 100644 --- a/slasher/db/iface/interface.go +++ b/slasher/db/iface/interface.go @@ -8,7 +8,7 @@ import ( "io" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "github.com/prysmaticlabs/prysm/shared/backuputil" dbtypes "github.com/prysmaticlabs/prysm/slasher/db/types" diff --git a/slasher/db/kv/BUILD.bazel b/slasher/db/kv/BUILD.bazel index ca8b2894e0..ffc87720bb 100644 --- a/slasher/db/kv/BUILD.bazel +++ b/slasher/db/kv/BUILD.bazel @@ -20,7 +20,7 @@ go_library( visibility = ["//slasher:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", @@ -58,7 +58,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", diff --git a/slasher/db/kv/attester_slashings.go b/slasher/db/kv/attester_slashings.go index 08e089dede..e6081aa8d6 100644 --- a/slasher/db/kv/attester_slashings.go +++ b/slasher/db/kv/attester_slashings.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" slashertypes "github.com/prysmaticlabs/prysm/slasher/db/types" diff --git a/slasher/db/kv/attester_slashings_test.go b/slasher/db/kv/attester_slashings_test.go index 2e097d09a3..8a7e4974ae 100644 --- a/slasher/db/kv/attester_slashings_test.go +++ b/slasher/db/kv/attester_slashings_test.go @@ -6,7 +6,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/slasher/db/kv/block_header.go b/slasher/db/kv/block_header.go index 99634a823c..05ad099868 100644 --- a/slasher/db/kv/block_header.go +++ b/slasher/db/kv/block_header.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" bolt "go.etcd.io/bbolt" diff --git a/slasher/db/kv/block_header_test.go b/slasher/db/kv/block_header_test.go index 5ea76aff61..4b0d4a1132 100644 --- a/slasher/db/kv/block_header_test.go +++ b/slasher/db/kv/block_header_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/slasher/db/kv/chain_data.go b/slasher/db/kv/chain_data.go index 48f1ffcef8..cf07cc0a18 100644 --- a/slasher/db/kv/chain_data.go +++ b/slasher/db/kv/chain_data.go @@ -4,7 +4,7 @@ import ( "context" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" diff --git a/slasher/db/kv/chain_data_test.go b/slasher/db/kv/chain_data_test.go index 07f50d5cbe..26233ae1ea 100644 --- a/slasher/db/kv/chain_data_test.go +++ b/slasher/db/kv/chain_data_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/slasher/db/kv/indexed_attestations.go b/slasher/db/kv/indexed_attestations.go index d41add7434..53e236e85e 100644 --- a/slasher/db/kv/indexed_attestations.go +++ b/slasher/db/kv/indexed_attestations.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" diff --git a/slasher/db/kv/indexed_attestations_test.go b/slasher/db/kv/indexed_attestations_test.go index c005d51d5e..ce605f7d41 100644 --- a/slasher/db/kv/indexed_attestations_test.go +++ b/slasher/db/kv/indexed_attestations_test.go @@ -5,7 +5,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/slasher/db/kv/proposer_slashings.go b/slasher/db/kv/proposer_slashings.go index ec43e4b8c5..2ae01d5d40 100644 --- a/slasher/db/kv/proposer_slashings.go +++ b/slasher/db/kv/proposer_slashings.go @@ -5,7 +5,7 @@ import ( "context" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/slasher/db/types" bolt "go.etcd.io/bbolt" diff --git a/slasher/db/kv/proposer_slashings_test.go b/slasher/db/kv/proposer_slashings_test.go index 31c3b40536..7934a68915 100644 --- a/slasher/db/kv/proposer_slashings_test.go +++ b/slasher/db/kv/proposer_slashings_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/sszutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/slasher/detection/BUILD.bazel b/slasher/detection/BUILD.bazel index 9426b8918b..0aa917e028 100644 --- a/slasher/detection/BUILD.bazel +++ b/slasher/detection/BUILD.bazel @@ -12,7 +12,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection", visibility = ["//slasher:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/attestationutil:go_default_library", "//shared/blockutil:go_default_library", @@ -47,7 +47,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", diff --git a/slasher/detection/attestations/BUILD.bazel b/slasher/detection/attestations/BUILD.bazel index 28e990bdef..161f107b80 100644 --- a/slasher/detection/attestations/BUILD.bazel +++ b/slasher/detection/attestations/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection/attestations", visibility = ["//slasher:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/featureconfig:go_default_library", "//shared/params:go_default_library", "//slasher/db:go_default_library", @@ -32,7 +32,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/featureconfig:go_default_library", "//shared/sliceutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/slasher/detection/attestations/iface/BUILD.bazel b/slasher/detection/attestations/iface/BUILD.bazel index 3746ec84ff..37801b18d7 100644 --- a/slasher/detection/attestations/iface/BUILD.bazel +++ b/slasher/detection/attestations/iface/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection/attestations/iface", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//slasher/detection/attestations/types:go_default_library", ], ) diff --git a/slasher/detection/attestations/iface/iface.go b/slasher/detection/attestations/iface/iface.go index 1990bffccf..eadd3ecaf1 100644 --- a/slasher/detection/attestations/iface/iface.go +++ b/slasher/detection/attestations/iface/iface.go @@ -4,7 +4,7 @@ package iface import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/slasher/detection/attestations/types" ) diff --git a/slasher/detection/attestations/mock_spanner.go b/slasher/detection/attestations/mock_spanner.go index 06494ee9a9..6761bdf5d1 100644 --- a/slasher/detection/attestations/mock_spanner.go +++ b/slasher/detection/attestations/mock_spanner.go @@ -3,7 +3,7 @@ package attestations import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/slasher/detection/attestations/iface" "github.com/prysmaticlabs/prysm/slasher/detection/attestations/types" ) diff --git a/slasher/detection/attestations/spanner.go b/slasher/detection/attestations/spanner.go index 9779df49dc..a0a7cd341c 100644 --- a/slasher/detection/attestations/spanner.go +++ b/slasher/detection/attestations/spanner.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/slasher/db" diff --git a/slasher/detection/attestations/spanner_test.go b/slasher/detection/attestations/spanner_test.go index 4474c9a0b1..2c429c6fff 100644 --- a/slasher/detection/attestations/spanner_test.go +++ b/slasher/detection/attestations/spanner_test.go @@ -6,7 +6,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/slasher/detection/detect.go b/slasher/detection/detect.go index 399c9cc79f..a997d93cde 100644 --- a/slasher/detection/detect.go +++ b/slasher/detection/detect.go @@ -5,7 +5,7 @@ import ( "context" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/slasher/detection/detect_test.go b/slasher/detection/detect_test.go index 25d778ce5d..9e5a6bffce 100644 --- a/slasher/detection/detect_test.go +++ b/slasher/detection/detect_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/slashutil" diff --git a/slasher/detection/listeners.go b/slasher/detection/listeners.go index 9b14f03d1f..2b73356b48 100644 --- a/slasher/detection/listeners.go +++ b/slasher/detection/listeners.go @@ -9,7 +9,7 @@ package detection import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/blockutil" "go.opencensus.io/trace" ) diff --git a/slasher/detection/listeners_test.go b/slasher/detection/listeners_test.go index a092249c7d..f49a7cb36f 100644 --- a/slasher/detection/listeners_test.go +++ b/slasher/detection/listeners_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/testutil/require" testDB "github.com/prysmaticlabs/prysm/slasher/db/testing" diff --git a/slasher/detection/proposals/BUILD.bazel b/slasher/detection/proposals/BUILD.bazel index 6ee893370d..1dbc213947 100644 --- a/slasher/detection/proposals/BUILD.bazel +++ b/slasher/detection/proposals/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection/proposals", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//slasher/db:go_default_library", "//slasher/db/types:go_default_library", "@io_opencensus_go//trace:go_default_library", @@ -22,7 +22,7 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "//slasher/db/testing:go_default_library", diff --git a/slasher/detection/proposals/detector.go b/slasher/detection/proposals/detector.go index 3a0eb26afa..28b3a02eb3 100644 --- a/slasher/detection/proposals/detector.go +++ b/slasher/detection/proposals/detector.go @@ -6,7 +6,7 @@ import ( "bytes" "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/slasher/db" status "github.com/prysmaticlabs/prysm/slasher/db/types" "go.opencensus.io/trace" diff --git a/slasher/detection/proposals/detector_test.go b/slasher/detection/proposals/detector_test.go index b1e423cc84..bba8b3b1f7 100644 --- a/slasher/detection/proposals/detector_test.go +++ b/slasher/detection/proposals/detector_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" testDB "github.com/prysmaticlabs/prysm/slasher/db/testing" diff --git a/slasher/detection/proposals/iface/BUILD.bazel b/slasher/detection/proposals/iface/BUILD.bazel index 50a1b15526..a17d175763 100644 --- a/slasher/detection/proposals/iface/BUILD.bazel +++ b/slasher/detection/proposals/iface/BUILD.bazel @@ -5,5 +5,5 @@ go_library( srcs = ["iface.go"], importpath = "github.com/prysmaticlabs/prysm/slasher/detection/proposals/iface", visibility = ["//visibility:public"], - deps = ["//proto/eth/v1alpha1:go_default_library"], + deps = ["//proto/prysm/v1alpha1:go_default_library"], ) diff --git a/slasher/detection/proposals/iface/iface.go b/slasher/detection/proposals/iface/iface.go index 80bfa3516d..2edead4646 100644 --- a/slasher/detection/proposals/iface/iface.go +++ b/slasher/detection/proposals/iface/iface.go @@ -4,7 +4,7 @@ package iface import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // ProposalsDetector defines an interface for different implementations. diff --git a/slasher/detection/service.go b/slasher/detection/service.go index c9a70ff032..e6671efa7c 100644 --- a/slasher/detection/service.go +++ b/slasher/detection/service.go @@ -5,7 +5,7 @@ import ( "errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/slasher/beaconclient" "github.com/prysmaticlabs/prysm/slasher/db" diff --git a/slasher/detection/testing/BUILD.bazel b/slasher/detection/testing/BUILD.bazel index 4a938b5f52..5d328045a0 100644 --- a/slasher/detection/testing/BUILD.bazel +++ b/slasher/detection/testing/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection/testing", visibility = ["//visibility:public"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/rand:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], diff --git a/slasher/detection/testing/utils.go b/slasher/detection/testing/utils.go index a9beca422e..3f03a1299a 100644 --- a/slasher/detection/testing/utils.go +++ b/slasher/detection/testing/utils.go @@ -4,7 +4,7 @@ package testing import ( types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/rand" ) diff --git a/slasher/rpc/BUILD.bazel b/slasher/rpc/BUILD.bazel index 1042591761..7309638a82 100644 --- a/slasher/rpc/BUILD.bazel +++ b/slasher/rpc/BUILD.bazel @@ -11,7 +11,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/attestationutil:go_default_library", "//shared/bls:go_default_library", @@ -49,7 +49,7 @@ go_test( deps = [ "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/p2p/types:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/copyutil:go_default_library", diff --git a/slasher/rpc/server.go b/slasher/rpc/server.go index 2ee5b9afb2..ccb59f2cee 100644 --- a/slasher/rpc/server.go +++ b/slasher/rpc/server.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/slasher/rpc/server_test.go b/slasher/rpc/server_test.go index 8f76c89941..0dd15e141a 100644 --- a/slasher/rpc/server_test.go +++ b/slasher/rpc/server_test.go @@ -10,7 +10,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/copyutil" diff --git a/spectest/shared/phase0/finality/BUILD.bazel b/spectest/shared/phase0/finality/BUILD.bazel index d6008395ae..4463fe52ce 100644 --- a/spectest/shared/phase0/finality/BUILD.bazel +++ b/spectest/shared/phase0/finality/BUILD.bazel @@ -12,8 +12,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", "//spectest/utils:go_default_library", diff --git a/spectest/shared/phase0/finality/runner.go b/spectest/shared/phase0/finality/runner.go index 864a28fcb4..fa22f6c8ea 100644 --- a/spectest/shared/phase0/finality/runner.go +++ b/spectest/shared/phase0/finality/runner.go @@ -11,8 +11,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/BUILD.bazel b/spectest/shared/phase0/operations/BUILD.bazel index d1e820dc03..bbd6fe95d9 100644 --- a/spectest/shared/phase0/operations/BUILD.bazel +++ b/spectest/shared/phase0/operations/BUILD.bazel @@ -21,9 +21,9 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", "//spectest/utils:go_default_library", diff --git a/spectest/shared/phase0/operations/attestation.go b/spectest/shared/phase0/operations/attestation.go index 8a87086cbb..8567f75683 100644 --- a/spectest/shared/phase0/operations/attestation.go +++ b/spectest/shared/phase0/operations/attestation.go @@ -6,7 +6,7 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/attester_slashing.go b/spectest/shared/phase0/operations/attester_slashing.go index 6f2af106be..eb927e32b9 100644 --- a/spectest/shared/phase0/operations/attester_slashing.go +++ b/spectest/shared/phase0/operations/attester_slashing.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/block_header.go b/spectest/shared/phase0/operations/block_header.go index f18b57683d..d8aadf7e6d 100644 --- a/spectest/shared/phase0/operations/block_header.go +++ b/spectest/shared/phase0/operations/block_header.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/deposit.go b/spectest/shared/phase0/operations/deposit.go index 9641178e0f..46e4041d87 100644 --- a/spectest/shared/phase0/operations/deposit.go +++ b/spectest/shared/phase0/operations/deposit.go @@ -8,8 +8,8 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/helpers.go b/spectest/shared/phase0/operations/helpers.go index 81a6c3d496..89a2b65802 100644 --- a/spectest/shared/phase0/operations/helpers.go +++ b/spectest/shared/phase0/operations/helpers.go @@ -13,9 +13,9 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "google.golang.org/protobuf/proto" diff --git a/spectest/shared/phase0/operations/proposer_slashing.go b/spectest/shared/phase0/operations/proposer_slashing.go index f1071246ae..df4bb7b1d0 100644 --- a/spectest/shared/phase0/operations/proposer_slashing.go +++ b/spectest/shared/phase0/operations/proposer_slashing.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/operations/voluntary_exit.go b/spectest/shared/phase0/operations/voluntary_exit.go index 9aac759fb4..38df23bfcd 100644 --- a/spectest/shared/phase0/operations/voluntary_exit.go +++ b/spectest/shared/phase0/operations/voluntary_exit.go @@ -8,8 +8,8 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" "github.com/prysmaticlabs/prysm/proto/interfaces" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/sanity/BUILD.bazel b/spectest/shared/phase0/sanity/BUILD.bazel index 6c9fac3dab..31576471e3 100644 --- a/spectest/shared/phase0/sanity/BUILD.bazel +++ b/spectest/shared/phase0/sanity/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", "//spectest/utils:go_default_library", diff --git a/spectest/shared/phase0/sanity/block_processing.go b/spectest/shared/phase0/sanity/block_processing.go index 072a6559cb..136f60c981 100644 --- a/spectest/shared/phase0/sanity/block_processing.go +++ b/spectest/shared/phase0/sanity/block_processing.go @@ -15,8 +15,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/spectest/shared/phase0/ssz_static/BUILD.bazel b/spectest/shared/phase0/ssz_static/BUILD.bazel index 5623c28d59..8d2daece21 100644 --- a/spectest/shared/phase0/ssz_static/BUILD.bazel +++ b/spectest/shared/phase0/ssz_static/BUILD.bazel @@ -9,7 +9,7 @@ go_library( deps = [ "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", "//spectest/utils:go_default_library", diff --git a/spectest/shared/phase0/ssz_static/ssz_static.go b/spectest/shared/phase0/ssz_static/ssz_static.go index 45ba298670..f6412b2e67 100644 --- a/spectest/shared/phase0/ssz_static/ssz_static.go +++ b/spectest/shared/phase0/ssz_static/ssz_static.go @@ -11,7 +11,7 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/spectest/utils" diff --git a/tools/benchmark-files-gen/BUILD.bazel b/tools/benchmark-files-gen/BUILD.bazel index 941f1f0914..b92b8b6a90 100644 --- a/tools/benchmark-files-gen/BUILD.bazel +++ b/tools/benchmark-files-gen/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//beacon-chain/state/interface:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/benchutil:go_default_library", "//shared/fileutil:go_default_library", "//shared/interop:go_default_library", diff --git a/tools/benchmark-files-gen/main.go b/tools/benchmark-files-gen/main.go index 011b2cf424..80fe9cd66d 100644 --- a/tools/benchmark-files-gen/main.go +++ b/tools/benchmark-files-gen/main.go @@ -15,8 +15,8 @@ import ( iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/benchutil" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/interop" diff --git a/tools/exploredb/BUILD.bazel b/tools/exploredb/BUILD.bazel index 90efdfc7ee..b226cf8b4b 100644 --- a/tools/exploredb/BUILD.bazel +++ b/tools/exploredb/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//beacon-chain/db/kv:go_default_library", "//beacon-chain/state/interface:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "@com_github_dustin_go_humanize//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/tools/exploredb/main.go b/tools/exploredb/main.go index 6528dbf2d0..c450e12b23 100644 --- a/tools/exploredb/main.go +++ b/tools/exploredb/main.go @@ -21,7 +21,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/db/kv" iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" log "github.com/sirupsen/logrus" "github.com/status-im/keycard-go/hexutils" diff --git a/tools/forkchecker/BUILD.bazel b/tools/forkchecker/BUILD.bazel index 6d9426b700..53639e0d0b 100644 --- a/tools/forkchecker/BUILD.bazel +++ b/tools/forkchecker/BUILD.bazel @@ -7,7 +7,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/forkchecker", visibility = ["//visibility:private"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/tools/forkchecker/forkchecker.go b/tools/forkchecker/forkchecker.go index ce7972a04b..0a9005e771 100644 --- a/tools/forkchecker/forkchecker.go +++ b/tools/forkchecker/forkchecker.go @@ -17,7 +17,7 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" - pb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/tools/genesis-state-gen/BUILD.bazel b/tools/genesis-state-gen/BUILD.bazel index 77ad679170..cd0e6d222f 100644 --- a/tools/genesis-state-gen/BUILD.bazel +++ b/tools/genesis-state-gen/BUILD.bazel @@ -11,7 +11,7 @@ go_library( visibility = ["//visibility:private"], deps = [ "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/fileutil:go_default_library", "//shared/interop:go_default_library", "//shared/params:go_default_library", diff --git a/tools/genesis-state-gen/main.go b/tools/genesis-state-gen/main.go index bb31f64e02..4ea6c6d145 100644 --- a/tools/genesis-state-gen/main.go +++ b/tools/genesis-state-gen/main.go @@ -13,7 +13,7 @@ import ( "github.com/ghodss/yaml" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index ea23ae928f..96b05add4d 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//beacon-chain/core/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/sszutil:go_default_library", "//shared/version:go_default_library", "@com_github_ferranbt_fastssz//:go_default_library", diff --git a/tools/pcli/main.go b/tools/pcli/main.go index c5f183401e..902c74f8e4 100644 --- a/tools/pcli/main.go +++ b/tools/pcli/main.go @@ -14,8 +14,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/state" "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/sszutil" "github.com/prysmaticlabs/prysm/shared/version" log "github.com/sirupsen/logrus" diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel index 155ab5136c..8ba558148d 100644 --- a/validator/accounts/BUILD.bazel +++ b/validator/accounts/BUILD.bazel @@ -25,7 +25,7 @@ go_library( deps = [ "//beacon-chain/core/blocks:go_default_library", "//cmd/validator/flags:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", @@ -71,7 +71,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/validator/flags:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/validator/accounts/v2:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/validator/accounts/accounts_exit.go b/validator/accounts/accounts_exit.go index ec0cc9a3e2..2fe071d36e 100644 --- a/validator/accounts/accounts_exit.go +++ b/validator/accounts/accounts_exit.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/cmd/validator/flags" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + 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/grpcutils" diff --git a/validator/accounts/accounts_exit_test.go b/validator/accounts/accounts_exit_test.go index 66e17a5e04..a3326e8fb8 100644 --- a/validator/accounts/accounts_exit_test.go +++ b/validator/accounts/accounts_exit_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/accounts/accounts_list.go b/validator/accounts/accounts_list.go index 8487fc50f2..3a429f5a4c 100644 --- a/validator/accounts/accounts_list.go +++ b/validator/accounts/accounts_list.go @@ -10,7 +10,7 @@ import ( "github.com/logrusorgru/aurora" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/cmd/validator/flags" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + 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/wallet" diff --git a/validator/accounts/accounts_list_test.go b/validator/accounts/accounts_list_test.go index 1dd2ccab21..0e12166b06 100644 --- a/validator/accounts/accounts_list_test.go +++ b/validator/accounts/accounts_list_test.go @@ -13,7 +13,7 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index cfbf07e216..3d1fade33c 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -21,9 +21,9 @@ go_library( visibility = ["//validator:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", "//proto/interfaces:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/validator/accounts/v2:go_default_library", "//shared/blockutil:go_default_library", "//shared/bls:go_default_library", @@ -99,8 +99,8 @@ go_test( deps = [ "//beacon-chain/core/helpers:go_default_library", "//proto/beacon/p2p/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", - "//proto/eth/v1alpha1/wrapper:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/validator/accounts/v2:go_default_library", "//shared:go_default_library", "//shared/bls:go_default_library", diff --git a/validator/client/aggregate.go b/validator/client/aggregate.go index c17919a274..4e0ab74f91 100644 --- a/validator/client/aggregate.go +++ b/validator/client/aggregate.go @@ -7,7 +7,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/validator/client/aggregate_test.go b/validator/client/aggregate_test.go index 552c2a2b3b..91dc25cc1c 100644 --- a/validator/client/aggregate_test.go +++ b/validator/client/aggregate_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/slotutil" diff --git a/validator/client/attest.go b/validator/client/attest.go index a2dc19f990..09b4830daf 100644 --- a/validator/client/attest.go +++ b/validator/client/attest.go @@ -11,7 +11,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/validator/client/attest_protect.go b/validator/client/attest_protect.go index 5c27382012..d78490924e 100644 --- a/validator/client/attest_protect.go +++ b/validator/client/attest_protect.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/validator/db/kv" diff --git a/validator/client/attest_protect_test.go b/validator/client/attest_protect_test.go index 5b4db69a7d..b75a03ef71 100644 --- a/validator/client/attest_protect_test.go +++ b/validator/client/attest_protect_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/client/attest_test.go b/validator/client/attest_test.go index 6fe77d5ba8..a9c05fcb54 100644 --- a/validator/client/attest_test.go +++ b/validator/client/attest_test.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/validator/client/key_reload.go b/validator/client/key_reload.go index 9818ac7de5..c2adffdf71 100644 --- a/validator/client/key_reload.go +++ b/validator/client/key_reload.go @@ -3,7 +3,7 @@ package client import ( "context" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/validator/client/key_reload_test.go b/validator/client/key_reload_test.go index 1d5b2d118a..e1ade77976 100644 --- a/validator/client/key_reload_test.go +++ b/validator/client/key_reload_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/client/log.go b/validator/client/log.go index b25991490c..8ddf39ec95 100644 --- a/validator/client/log.go +++ b/validator/client/log.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/timeutils" diff --git a/validator/client/log_test.go b/validator/client/log_test.go index 144da6ff47..218326ef90 100644 --- a/validator/client/log_test.go +++ b/validator/client/log_test.go @@ -4,7 +4,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/client/metrics.go b/validator/client/metrics.go index 4ec8e93dec..c55f817a76 100644 --- a/validator/client/metrics.go +++ b/validator/client/metrics.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" diff --git a/validator/client/metrics_test.go b/validator/client/metrics_test.go index 59b7a7733d..e982354594 100644 --- a/validator/client/metrics_test.go +++ b/validator/client/metrics_test.go @@ -4,7 +4,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" logTest "github.com/sirupsen/logrus/hooks/test" diff --git a/validator/client/propose.go b/validator/client/propose.go index a3c366a718..90e55347d4 100644 --- a/validator/client/propose.go +++ b/validator/client/propose.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - wrapperv1 "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + wrapperv1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/validator/client/propose_protect_test.go b/validator/client/propose_protect_test.go index 3cbe4087b3..5ab61c1e68 100644 --- a/validator/client/propose_protect_test.go +++ b/validator/client/propose_protect_test.go @@ -5,8 +5,8 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/client/propose_test.go b/validator/client/propose_test.go index 438583bbb1..99b83a89aa 100644 --- a/validator/client/propose_test.go +++ b/validator/client/propose_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang/mock/gomock" lru "github.com/hashicorp/golang-lru" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/validator/client/service.go b/validator/client/service.go index ebe02b33b4..ae48045599 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -14,7 +14,7 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/grpcutils" diff --git a/validator/client/slashing_protection_interchange_test.go b/validator/client/slashing_protection_interchange_test.go index fa86a071d4..188b076bc8 100644 --- a/validator/client/slashing_protection_interchange_test.go +++ b/validator/client/slashing_protection_interchange_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1/wrapper" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/validator/client/testutil/BUILD.bazel b/validator/client/testutil/BUILD.bazel index 8c5ee513ef..69af122b41 100644 --- a/validator/client/testutil/BUILD.bazel +++ b/validator/client/testutil/BUILD.bazel @@ -10,7 +10,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/client/testutil", visibility = ["//validator:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/timeutils:go_default_library", "//validator/client/iface:go_default_library", diff --git a/validator/client/testutil/helper.go b/validator/client/testutil/helper.go index cfc872f663..893e46d731 100644 --- a/validator/client/testutil/helper.go +++ b/validator/client/testutil/helper.go @@ -2,7 +2,7 @@ package testutil import ( types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" ) diff --git a/validator/client/testutil/mock_validator.go b/validator/client/testutil/mock_validator.go index 7dc9ccad15..7016edcb49 100644 --- a/validator/client/testutil/mock_validator.go +++ b/validator/client/testutil/mock_validator.go @@ -6,7 +6,7 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/timeutils" "github.com/prysmaticlabs/prysm/validator/client/iface" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/validator/client/validator.go b/validator/client/validator.go index aebaa69b2d..b1b86db175 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -19,7 +19,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go index 0f76488250..71580a34f5 100644 --- a/validator/client/validator_test.go +++ b/validator/client/validator_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/validator/client/wait_for_activation.go b/validator/client/wait_for_activation.go index 502cde22b5..87e1f4f454 100644 --- a/validator/client/wait_for_activation.go +++ b/validator/client/wait_for_activation.go @@ -6,7 +6,7 @@ import ( "time" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/validator/client/wait_for_activation_test.go b/validator/client/wait_for_activation_test.go index f98882f6a2..b4b702a305 100644 --- a/validator/client/wait_for_activation_test.go +++ b/validator/client/wait_for_activation_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/validator/db/iface/BUILD.bazel b/validator/db/iface/BUILD.bazel index f405a3e466..4e2c3c767d 100644 --- a/validator/db/iface/BUILD.bazel +++ b/validator/db/iface/BUILD.bazel @@ -7,7 +7,7 @@ go_library( # Other packages must use github.com/prysmaticlabs/prysm/validator/db.Database alias. visibility = ["//validator/db:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/backuputil:go_default_library", "//validator/db/kv:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/validator/db/iface/interface.go b/validator/db/iface/interface.go index 3f12143f19..d43eb1c485 100644 --- a/validator/db/iface/interface.go +++ b/validator/db/iface/interface.go @@ -6,7 +6,7 @@ import ( "io" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/backuputil" "github.com/prysmaticlabs/prysm/validator/db/kv" ) diff --git a/validator/db/kv/BUILD.bazel b/validator/db/kv/BUILD.bazel index 220ef0bb35..aa26284572 100644 --- a/validator/db/kv/BUILD.bazel +++ b/validator/db/kv/BUILD.bazel @@ -22,7 +22,7 @@ go_library( visibility = ["//validator:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/abool:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", @@ -59,7 +59,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", "//shared/params:go_default_library", diff --git a/validator/db/kv/attester_protection.go b/validator/db/kv/attester_protection.go index 5235e37aa4..21765aa447 100644 --- a/validator/db/kv/attester_protection.go +++ b/validator/db/kv/attester_protection.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/shared/traceutil" diff --git a/validator/db/kv/attester_protection_test.go b/validator/db/kv/attester_protection_test.go index ab0c705514..3f38010054 100644 --- a/validator/db/kv/attester_protection_test.go +++ b/validator/db/kv/attester_protection_test.go @@ -9,7 +9,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index 01c002afeb..485b27bf6a 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -17,7 +17,7 @@ go_library( visibility = ["//validator:__subpackages__"], deps = [ "//proto/beacon/rpc/v1:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/validator/accounts/v2:go_default_library", "//shared/bls:go_default_library", "//shared/cmd:go_default_library", @@ -80,7 +80,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/validator/flags:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/validator/accounts/v2:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/validator/rpc/accounts_test.go b/validator/rpc/accounts_test.go index 9d76b9eb57..6557cd3c38 100644 --- a/validator/rpc/accounts_test.go +++ b/validator/rpc/accounts_test.go @@ -13,7 +13,7 @@ import ( "github.com/golang/mock/gomock" "github.com/prysmaticlabs/prysm/cmd/validator/flags" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/validator/rpc/beacon.go b/validator/rpc/beacon.go index 2c3d58974d..1b5b2e5a7a 100644 --- a/validator/rpc/beacon.go +++ b/validator/rpc/beacon.go @@ -11,7 +11,7 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" healthpb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/validator/client" diff --git a/validator/rpc/beacon_test.go b/validator/rpc/beacon_test.go index 3b582c1558..a72a04fd13 100644 --- a/validator/rpc/beacon_test.go +++ b/validator/rpc/beacon_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/mock/gomock" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/rpc/health_test.go b/validator/rpc/health_test.go index deb080c437..1ea4130cab 100644 --- a/validator/rpc/health_test.go +++ b/validator/rpc/health_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/golang/protobuf/ptypes/empty" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/validator/client" diff --git a/validator/rpc/server.go b/validator/rpc/server.go index fea65d0ab7..3ed5cde738 100644 --- a/validator/rpc/server.go +++ b/validator/rpc/server.go @@ -12,7 +12,7 @@ import ( grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" healthpb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/logutil" diff --git a/validator/slashing-protection/BUILD.bazel b/validator/slashing-protection/BUILD.bazel index e9bb76a6d5..dc16b20f3a 100644 --- a/validator/slashing-protection/BUILD.bazel +++ b/validator/slashing-protection/BUILD.bazel @@ -16,7 +16,7 @@ go_library( ], deps = [ "//cmd/validator/flags:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", @@ -48,7 +48,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/validator/flags:go_default_library", - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", diff --git a/validator/slashing-protection/external.go b/validator/slashing-protection/external.go index cc97e8eae6..1502a621f5 100644 --- a/validator/slashing-protection/external.go +++ b/validator/slashing-protection/external.go @@ -3,7 +3,7 @@ package slashingprotection import ( "context" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // CheckBlockSafety this function is part of slashing protection for block proposals it performs diff --git a/validator/slashing-protection/external_test.go b/validator/slashing-protection/external_test.go index 9acb5ace1f..26c5b06410 100644 --- a/validator/slashing-protection/external_test.go +++ b/validator/slashing-protection/external_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" mockSlasher "github.com/prysmaticlabs/prysm/validator/testing" diff --git a/validator/slashing-protection/iface/BUILD.bazel b/validator/slashing-protection/iface/BUILD.bazel index 631f6d1a6c..6272a7f1de 100644 --- a/validator/slashing-protection/iface/BUILD.bazel +++ b/validator/slashing-protection/iface/BUILD.bazel @@ -5,5 +5,5 @@ go_library( srcs = ["protector.go"], importpath = "github.com/prysmaticlabs/prysm/validator/slashing-protection/iface", visibility = ["//validator:__subpackages__"], - deps = ["//proto/eth/v1alpha1:go_default_library"], + deps = ["//proto/prysm/v1alpha1:go_default_library"], ) diff --git a/validator/slashing-protection/iface/protector.go b/validator/slashing-protection/iface/protector.go index 98b2aa4d67..2719b11213 100644 --- a/validator/slashing-protection/iface/protector.go +++ b/validator/slashing-protection/iface/protector.go @@ -3,7 +3,7 @@ package iface import ( "context" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // Protector interface defines the methods of the service that provides slashing protection. diff --git a/validator/slashing-protection/local/standard-protection-format/BUILD.bazel b/validator/slashing-protection/local/standard-protection-format/BUILD.bazel index 75fc7d1077..69600196f0 100644 --- a/validator/slashing-protection/local/standard-protection-format/BUILD.bazel +++ b/validator/slashing-protection/local/standard-protection-format/BUILD.bazel @@ -11,7 +11,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/slashing-protection/local/standard-protection-format", visibility = ["//validator:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/progressutil:go_default_library", @@ -37,7 +37,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "//validator/db/kv:go_default_library", diff --git a/validator/slashing-protection/local/standard-protection-format/import.go b/validator/slashing-protection/local/standard-protection-format/import.go index 2047e04a5f..0a71f62b23 100644 --- a/validator/slashing-protection/local/standard-protection-format/import.go +++ b/validator/slashing-protection/local/standard-protection-format/import.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/validator/db" diff --git a/validator/slashing-protection/local/standard-protection-format/import_test.go b/validator/slashing-protection/local/standard-protection-format/import_test.go index 1d11b691a8..0c42792ebc 100644 --- a/validator/slashing-protection/local/standard-protection-format/import_test.go +++ b/validator/slashing-protection/local/standard-protection-format/import_test.go @@ -10,7 +10,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/validator/db/kv" diff --git a/validator/testing/BUILD.bazel b/validator/testing/BUILD.bazel index 1e4dfb04fd..d52d656827 100644 --- a/validator/testing/BUILD.bazel +++ b/validator/testing/BUILD.bazel @@ -12,7 +12,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/testing", visibility = ["//validator:__subpackages__"], deps = [ - "//proto/eth/v1alpha1:go_default_library", + "//proto/prysm/v1alpha1:go_default_library", "//proto/slashing:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/validator/testing/mock_protector.go b/validator/testing/mock_protector.go index 3edf65d9db..bef63bacde 100644 --- a/validator/testing/mock_protector.go +++ b/validator/testing/mock_protector.go @@ -3,7 +3,7 @@ package testing import ( "context" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) // MockProtector mocks the protector. diff --git a/validator/testing/mock_slasher.go b/validator/testing/mock_slasher.go index ae23575539..0a85cbf43c 100644 --- a/validator/testing/mock_slasher.go +++ b/validator/testing/mock_slasher.go @@ -4,7 +4,7 @@ import ( "context" "errors" - eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" + eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "google.golang.org/grpc" "google.golang.org/protobuf/proto"