From 8eb82dd378d5e0d8b6d0035c8870940fb85b6a5e Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Mon, 9 Oct 2023 23:50:29 -0500 Subject: [PATCH] Update rules_go and gazelle to 0.42 & 0.33 (latest releases) (#13021) * Provide @go_googleapis, update gazelle * fix pb build failures Fix build issues with grpc-gateway --- WORKSPACE | 28 +++- beacon-chain/rpc/eth/beacon/BUILD.bazel | 2 +- beacon-chain/rpc/eth/debug/BUILD.bazel | 2 +- .../rpc/prysm/v1alpha1/debug/BUILD.bazel | 4 +- .../rpc/prysm/v1alpha1/node/BUILD.bazel | 4 +- cmd/validator/accounts/BUILD.bazel | 2 +- deps.bzl | 6 + proto/BUILD.bazel | 3 + proto/engine/v1/BUILD.bazel | 6 +- proto/engine/v1/execution_engine.pb.go | 2 +- proto/eth/ext/BUILD.bazel | 2 +- proto/eth/ext/options.pb.go | 4 +- proto/eth/service/BUILD.bazel | 12 +- proto/eth/service/beacon_chain_service.pb.go | 110 ++++++------ .../eth/service/beacon_chain_service.pb.gw.go | 4 +- proto/eth/service/beacon_debug_service.pb.go | 34 ++-- .../eth/service/beacon_debug_service.pb.gw.go | 6 +- proto/eth/service/events_service.pb.go | 6 +- proto/eth/service/events_service.pb.gw.go | 4 +- proto/eth/service/key_management.pb.go | 74 ++++----- proto/eth/service/key_management.pb.gw.go | 4 +- proto/eth/service/node_service.pb.go | 58 +++---- proto/eth/service/node_service.pb.gw.go | 4 +- proto/eth/service/validator_service.pb.go | 6 +- proto/eth/service/validator_service.pb.gw.go | 4 +- proto/eth/v1/BUILD.bazel | 5 +- proto/eth/v1/attestation.pb.go | 6 +- proto/eth/v1/beacon_block.pb.go | 6 +- proto/eth/v1/beacon_chain.pb.go | 6 +- proto/eth/v1/beacon_state.pb.go | 6 +- proto/eth/v1/events.pb.go | 4 +- proto/eth/v1/node.pb.go | 4 +- proto/eth/v1/validator.pb.go | 4 +- proto/eth/v2/beacon_block.pb.go | 2 +- proto/eth/v2/beacon_chain.pb.go | 4 +- proto/eth/v2/beacon_lightclient.pb.go | 2 +- proto/eth/v2/beacon_state.pb.go | 4 +- proto/eth/v2/blobs.pb.go | 2 +- proto/eth/v2/ssz.pb.go | 4 +- proto/eth/v2/sync_committee.pb.go | 2 +- proto/eth/v2/validator.pb.go | 2 +- proto/eth/v2/version.pb.go | 4 +- proto/eth/v2/withdrawals.pb.go | 4 +- proto/prysm/v1alpha1/BUILD.bazel | 18 +- proto/prysm/v1alpha1/attestation.pb.go | 4 +- proto/prysm/v1alpha1/beacon_block.pb.go | 2 +- proto/prysm/v1alpha1/beacon_chain.pb.go | 74 ++++----- proto/prysm/v1alpha1/beacon_state.pb.go | 4 +- proto/prysm/v1alpha1/blobs.pb.go | 2 +- proto/prysm/v1alpha1/debug.pb.go | 30 ++-- .../finalized_block_root_container.pb.go | 4 +- proto/prysm/v1alpha1/health.pb.go | 20 +-- proto/prysm/v1alpha1/node.pb.go | 126 +++++++------- proto/prysm/v1alpha1/p2p_messages.pb.go | 6 +- proto/prysm/v1alpha1/powchain.pb.go | 4 +- proto/prysm/v1alpha1/slasher.pb.go | 2 +- proto/prysm/v1alpha1/sync_committee.pb.go | 4 +- .../v1alpha1/validator-client/BUILD.bazel | 9 +- .../validator-client/keymanager.pb.go | 20 +-- .../v1alpha1/validator-client/web_api.pb.go | 156 +++++++++--------- proto/prysm/v1alpha1/validator.pb.go | 90 +++++----- proto/prysm/v1alpha1/withdrawals.pb.go | 4 +- proto/testing/test.pb.go | 20 +-- testing/endtoend/evaluators/BUILD.bazel | 2 +- ...ithub_grpc_ecosystem_grpc_gateway_v2.patch | 12 ++ ...cosystem_grpc_gateway_v2_fix_emptypb.patch | 22 +++ validator/client/BUILD.bazel | 6 +- validator/client/beacon-api/BUILD.bazel | 4 +- validator/client/grpc-api/BUILD.bazel | 2 +- validator/client/iface/BUILD.bazel | 2 +- validator/rpc/BUILD.bazel | 4 +- 71 files changed, 588 insertions(+), 527 deletions(-) create mode 100644 third_party/com_github_grpc_ecosystem_grpc_gateway_v2.patch create mode 100644 third_party/com_github_grpc_ecosystem_grpc_gateway_v2_fix_emptypb.patch diff --git a/WORKSPACE b/WORKSPACE index a4290008d6a0..2bf9c2e5602f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -65,10 +65,10 @@ bazel_skylib_workspace() http_archive( name = "bazel_gazelle", - sha256 = "29d5dafc2a5582995488c6735115d1d366fcd6a0fc2e2a153f02988706349825", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.0/bazel-gazelle-v0.31.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.0/bazel-gazelle-v0.31.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) @@ -110,10 +110,10 @@ http_archive( # Expose internals of go_test for custom build transitions. "//third_party:io_bazel_rules_go_test.patch", ], - sha256 = "bfc5ce70b9d1634ae54f4e7b495657a18a04e0d596785f672d35d5f505ab491a", + sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.40.0/rules_go-v0.40.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.40.0/rules_go-v0.40.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip", ], ) @@ -374,6 +374,22 @@ http_archive( ) # External dependencies +http_archive( + name = "googleapis", + sha256 = "9d1a930e767c93c825398b8f8692eca3fe353b9aaadedfbcf1fca2282c85df88", + strip_prefix = "googleapis-64926d52febbf298cb82a8f472ade4a3969ba922", + urls = [ + "https://github.com/googleapis/googleapis/archive/64926d52febbf298cb82a8f472ade4a3969ba922.zip", + ], +) + +load("@googleapis//:repository_rules.bzl", "switched_rules_by_language") + +switched_rules_by_language( + name = "com_google_googleapis_imports", + go = True, +) + load("//:deps.bzl", "prysm_deps") # gazelle:repository_macro deps.bzl%prysm_deps diff --git a/beacon-chain/rpc/eth/beacon/BUILD.bazel b/beacon-chain/rpc/eth/beacon/BUILD.bazel index 8ca35227d757..ae884338e479 100644 --- a/beacon-chain/rpc/eth/beacon/BUILD.bazel +++ b/beacon-chain/rpc/eth/beacon/BUILD.bazel @@ -64,10 +64,10 @@ go_library( "//runtime/version:go_default_library", "//time/slots:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_gorilla_mux//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@io_opencensus_go//trace:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", diff --git a/beacon-chain/rpc/eth/debug/BUILD.bazel b/beacon-chain/rpc/eth/debug/BUILD.bazel index 6400f3e9c86e..abf15283813d 100644 --- a/beacon-chain/rpc/eth/debug/BUILD.bazel +++ b/beacon-chain/rpc/eth/debug/BUILD.bazel @@ -41,7 +41,7 @@ go_test( "//testing/assert:go_default_library", "//testing/require:go_default_library", "//testing/util:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", + "@com_github_golang_protobuf//ptypes/empty", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", ], ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel index 3ea4d36b2f8d..d1c49e71e0ce 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel @@ -24,12 +24,12 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/attestation:go_default_library", "@com_github_ethereum_go_ethereum//log:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_ipfs_go_log_v2//:go_default_library", "@com_github_libp2p_go_libp2p//core/network:go_default_library", "@com_github_libp2p_go_libp2p//core/peer:go_default_library", "@com_github_libp2p_go_libp2p//core/protocol:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", ], @@ -58,7 +58,7 @@ go_test( "//testing/assert:go_default_library", "//testing/require:go_default_library", "//testing/util:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", ], ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel index 64e7d6a4756d..9980a91d1281 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel @@ -14,10 +14,10 @@ go_library( "//io/logs:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//runtime/version:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", + "@com_github_golang_protobuf//ptypes/timestamp", "@com_github_libp2p_go_libp2p//core/network:go_default_library", "@com_github_libp2p_go_libp2p//core/peer:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/cmd/validator/accounts/BUILD.bazel b/cmd/validator/accounts/BUILD.bazel index a2378736a928..6d30bc286219 100644 --- a/cmd/validator/accounts/BUILD.bazel +++ b/cmd/validator/accounts/BUILD.bazel @@ -30,10 +30,10 @@ go_library( "//validator/keymanager/local:go_default_library", "//validator/keymanager/remote-web3signer:go_default_library", "//validator/node:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", ], ) diff --git a/deps.bzl b/deps.bzl index 5b83a96f80de..7f5ec27e24dd 100644 --- a/deps.bzl +++ b/deps.bzl @@ -1747,6 +1747,12 @@ def prysm_deps(): replace = "github.com/prysmaticlabs/grpc-gateway/v2", sum = "h1:4wctORg/1TkgLgXejv9yOSAm3cDBJxoTzl/RNuZmX28=", version = "v2.3.1-0.20230315201114-09284ba20446", + repo_mapping = {"@go_googleapis": "@googleapis"}, + patch_args = ["-p1"], + patches = [ + "//third_party:com_github_grpc_ecosystem_grpc_gateway_v2.patch", + "//third_party:com_github_grpc_ecosystem_grpc_gateway_v2_fix_emptypb.patch", + ], ) go_repository( name = "com_github_guptarohit_asciigraph", diff --git a/proto/BUILD.bazel b/proto/BUILD.bazel index 752a670232fd..fe2200b62d1d 100644 --- a/proto/BUILD.bazel +++ b/proto/BUILD.bazel @@ -4,6 +4,9 @@ load( "string_flag", ) +# gazelle:resolve proto proto google/api/annotations.proto @googleapis//google/api:annotations_proto +# gazelle:resolve proto go google/api/annotations.proto @googleapis//google/api:annotations_go_proto + # Example flag: --//proto:network=minimal string_flag( name = "network", diff --git a/proto/engine/v1/BUILD.bazel b/proto/engine/v1/BUILD.bazel index f5e42a198c2f..6cf4c25192ab 100644 --- a/proto/engine/v1/BUILD.bazel +++ b/proto/engine/v1/BUILD.bazel @@ -21,7 +21,7 @@ proto_library( visibility = ["//visibility:public"], deps = [ "//proto/eth/ext:proto", - "@go_googleapis//google/api:annotations_proto", + "@googleapis//google/api:annotations_proto", ], ) @@ -59,7 +59,7 @@ go_proto_library( "//consensus-types/primitives:go_default_library", "//proto/eth/ext:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", @@ -91,7 +91,7 @@ go_library( "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@org_golang_google_protobuf//encoding/protojson:go_default_library", diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go index f773ed44b299..45a135302c84 100755 --- a/proto/engine/v1/execution_engine.pb.go +++ b/proto/engine/v1/execution_engine.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/engine/v1/execution_engine.proto diff --git a/proto/eth/ext/BUILD.bazel b/proto/eth/ext/BUILD.bazel index 724685e68070..72ce87150bf5 100644 --- a/proto/eth/ext/BUILD.bazel +++ b/proto/eth/ext/BUILD.bazel @@ -29,7 +29,7 @@ go_proto_library( visibility = ["//visibility:public"], deps = [ "@com_github_golang_protobuf//proto:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", diff --git a/proto/eth/ext/options.pb.go b/proto/eth/ext/options.pb.go index 5095c819ecad..341680640803 100755 --- a/proto/eth/ext/options.pb.go +++ b/proto/eth/ext/options.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/ext/options.proto package ext diff --git a/proto/eth/service/BUILD.bazel b/proto/eth/service/BUILD.bazel index a007e74573a8..abd8a54a5788 100644 --- a/proto/eth/service/BUILD.bazel +++ b/proto/eth/service/BUILD.bazel @@ -22,7 +22,7 @@ proto_library( "@com_google_protobuf//:descriptor_proto", "@com_google_protobuf//:empty_proto", "@com_google_protobuf//:timestamp_proto", - "@go_googleapis//google/api:annotations_proto", + "@googleapis//google/api:annotations_proto", "@com_github_grpc_ecosystem_grpc_gateway_v2//proto/gateway:event_source_proto", ], ) @@ -40,9 +40,11 @@ go_proto_library( "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@io_bazel_rules_go//proto/wkt:empty_go_proto", "//consensus-types/primitives:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//proto/gateway:go_default_library", + "@org_golang_google_protobuf//types/descriptorpb:go_default_library", + "@org_golang_google_protobuf//types/known/emptypb:go_default_library", ], ) @@ -82,7 +84,7 @@ go_proto_library( "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@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", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", "@com_github_grpc_ecosystem_grpc_gateway_v2//proto/gateway:go_default_library", @@ -94,4 +96,8 @@ go_library( embed = [":go_grpc_gateway_library"], importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/service", visibility = ["//visibility:public"], + deps = [ + "@org_golang_google_protobuf//types/descriptorpb", + "@org_golang_google_protobuf//types/known/emptypb", + ], ) diff --git a/proto/eth/service/beacon_chain_service.pb.go b/proto/eth/service/beacon_chain_service.pb.go index b5dcd00e0d8b..634facf67926 100755 --- a/proto/eth/service/beacon_chain_service.pb.go +++ b/proto/eth/service/beacon_chain_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/service/beacon_chain_service.proto @@ -10,8 +10,6 @@ import ( context "context" reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - empty "github.com/golang/protobuf/ptypes/empty" v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +18,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -247,7 +247,7 @@ var file_proto_eth_service_beacon_chain_service_proto_rawDesc = []byte{ } var file_proto_eth_service_beacon_chain_service_proto_goTypes = []interface{}{ - (*empty.Empty)(nil), // 0: google.protobuf.Empty + (*emptypb.Empty)(nil), // 0: google.protobuf.Empty (*v1.StateRequest)(nil), // 1: ethereum.eth.v1.StateRequest (*v2.StateSyncCommitteesRequest)(nil), // 2: ethereum.eth.v2.StateSyncCommitteesRequest (*v2.RandaoRequest)(nil), // 3: ethereum.eth.v2.RandaoRequest @@ -355,7 +355,7 @@ const _ = grpc.SupportPackageIsVersion6 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type BeaconChainClient interface { // Deprecated: Do not use. - GetWeakSubjectivity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.WeakSubjectivityResponse, error) + GetWeakSubjectivity(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.WeakSubjectivityResponse, error) GetStateRoot(ctx context.Context, in *v1.StateRequest, opts ...grpc.CallOption) (*v1.StateRootResponse, error) ListSyncCommittees(ctx context.Context, in *v2.StateSyncCommitteesRequest, opts ...grpc.CallOption) (*v2.StateSyncCommitteesResponse, error) GetRandao(ctx context.Context, in *v2.RandaoRequest, opts ...grpc.CallOption) (*v2.RandaoResponse, error) @@ -368,14 +368,14 @@ type BeaconChainClient interface { GetBlindedBlockSSZ(ctx context.Context, in *v1.BlockRequest, opts ...grpc.CallOption) (*v2.SSZContainer, error) GetBlockSSZV2(ctx context.Context, in *v2.BlockRequestV2, opts ...grpc.CallOption) (*v2.SSZContainer, error) ListBlockAttestations(ctx context.Context, in *v1.BlockRequest, opts ...grpc.CallOption) (*v1.BlockAttestationsResponse, error) - ListPoolAttesterSlashings(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.AttesterSlashingsPoolResponse, error) - SubmitAttesterSlashing(ctx context.Context, in *v1.AttesterSlashing, opts ...grpc.CallOption) (*empty.Empty, error) - ListPoolProposerSlashings(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ProposerSlashingPoolResponse, error) - SubmitProposerSlashing(ctx context.Context, in *v1.ProposerSlashing, opts ...grpc.CallOption) (*empty.Empty, error) - SubmitSignedBLSToExecutionChanges(ctx context.Context, in *v2.SubmitBLSToExecutionChangesRequest, opts ...grpc.CallOption) (*empty.Empty, error) - ListBLSToExecutionChanges(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v2.BLSToExecutionChangesPoolResponse, error) - GetForkSchedule(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ForkScheduleResponse, error) - GetSpec(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.SpecResponse, error) + ListPoolAttesterSlashings(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.AttesterSlashingsPoolResponse, error) + SubmitAttesterSlashing(ctx context.Context, in *v1.AttesterSlashing, opts ...grpc.CallOption) (*emptypb.Empty, error) + ListPoolProposerSlashings(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ProposerSlashingPoolResponse, error) + SubmitProposerSlashing(ctx context.Context, in *v1.ProposerSlashing, opts ...grpc.CallOption) (*emptypb.Empty, error) + SubmitSignedBLSToExecutionChanges(ctx context.Context, in *v2.SubmitBLSToExecutionChangesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + ListBLSToExecutionChanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v2.BLSToExecutionChangesPoolResponse, error) + GetForkSchedule(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ForkScheduleResponse, error) + GetSpec(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.SpecResponse, error) } type beaconChainClient struct { @@ -387,7 +387,7 @@ func NewBeaconChainClient(cc grpc.ClientConnInterface) BeaconChainClient { } // Deprecated: Do not use. -func (c *beaconChainClient) GetWeakSubjectivity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.WeakSubjectivityResponse, error) { +func (c *beaconChainClient) GetWeakSubjectivity(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.WeakSubjectivityResponse, error) { out := new(v1.WeakSubjectivityResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/GetWeakSubjectivity", in, out, opts...) if err != nil { @@ -488,7 +488,7 @@ func (c *beaconChainClient) ListBlockAttestations(ctx context.Context, in *v1.Bl return out, nil } -func (c *beaconChainClient) ListPoolAttesterSlashings(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.AttesterSlashingsPoolResponse, error) { +func (c *beaconChainClient) ListPoolAttesterSlashings(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.AttesterSlashingsPoolResponse, error) { out := new(v1.AttesterSlashingsPoolResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/ListPoolAttesterSlashings", in, out, opts...) if err != nil { @@ -497,8 +497,8 @@ func (c *beaconChainClient) ListPoolAttesterSlashings(ctx context.Context, in *e return out, nil } -func (c *beaconChainClient) SubmitAttesterSlashing(ctx context.Context, in *v1.AttesterSlashing, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconChainClient) SubmitAttesterSlashing(ctx context.Context, in *v1.AttesterSlashing, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/SubmitAttesterSlashing", in, out, opts...) if err != nil { return nil, err @@ -506,7 +506,7 @@ func (c *beaconChainClient) SubmitAttesterSlashing(ctx context.Context, in *v1.A return out, nil } -func (c *beaconChainClient) ListPoolProposerSlashings(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ProposerSlashingPoolResponse, error) { +func (c *beaconChainClient) ListPoolProposerSlashings(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ProposerSlashingPoolResponse, error) { out := new(v1.ProposerSlashingPoolResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/ListPoolProposerSlashings", in, out, opts...) if err != nil { @@ -515,8 +515,8 @@ func (c *beaconChainClient) ListPoolProposerSlashings(ctx context.Context, in *e return out, nil } -func (c *beaconChainClient) SubmitProposerSlashing(ctx context.Context, in *v1.ProposerSlashing, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconChainClient) SubmitProposerSlashing(ctx context.Context, in *v1.ProposerSlashing, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/SubmitProposerSlashing", in, out, opts...) if err != nil { return nil, err @@ -524,8 +524,8 @@ func (c *beaconChainClient) SubmitProposerSlashing(ctx context.Context, in *v1.P return out, nil } -func (c *beaconChainClient) SubmitSignedBLSToExecutionChanges(ctx context.Context, in *v2.SubmitBLSToExecutionChangesRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconChainClient) SubmitSignedBLSToExecutionChanges(ctx context.Context, in *v2.SubmitBLSToExecutionChangesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/SubmitSignedBLSToExecutionChanges", in, out, opts...) if err != nil { return nil, err @@ -533,7 +533,7 @@ func (c *beaconChainClient) SubmitSignedBLSToExecutionChanges(ctx context.Contex return out, nil } -func (c *beaconChainClient) ListBLSToExecutionChanges(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v2.BLSToExecutionChangesPoolResponse, error) { +func (c *beaconChainClient) ListBLSToExecutionChanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v2.BLSToExecutionChangesPoolResponse, error) { out := new(v2.BLSToExecutionChangesPoolResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/ListBLSToExecutionChanges", in, out, opts...) if err != nil { @@ -542,7 +542,7 @@ func (c *beaconChainClient) ListBLSToExecutionChanges(ctx context.Context, in *e return out, nil } -func (c *beaconChainClient) GetForkSchedule(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ForkScheduleResponse, error) { +func (c *beaconChainClient) GetForkSchedule(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ForkScheduleResponse, error) { out := new(v1.ForkScheduleResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/GetForkSchedule", in, out, opts...) if err != nil { @@ -551,7 +551,7 @@ func (c *beaconChainClient) GetForkSchedule(ctx context.Context, in *empty.Empty return out, nil } -func (c *beaconChainClient) GetSpec(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.SpecResponse, error) { +func (c *beaconChainClient) GetSpec(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.SpecResponse, error) { out := new(v1.SpecResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconChain/GetSpec", in, out, opts...) if err != nil { @@ -563,7 +563,7 @@ func (c *beaconChainClient) GetSpec(ctx context.Context, in *empty.Empty, opts . // BeaconChainServer is the server API for BeaconChain service. type BeaconChainServer interface { // Deprecated: Do not use. - GetWeakSubjectivity(context.Context, *empty.Empty) (*v1.WeakSubjectivityResponse, error) + GetWeakSubjectivity(context.Context, *emptypb.Empty) (*v1.WeakSubjectivityResponse, error) GetStateRoot(context.Context, *v1.StateRequest) (*v1.StateRootResponse, error) ListSyncCommittees(context.Context, *v2.StateSyncCommitteesRequest) (*v2.StateSyncCommitteesResponse, error) GetRandao(context.Context, *v2.RandaoRequest) (*v2.RandaoResponse, error) @@ -576,21 +576,21 @@ type BeaconChainServer interface { GetBlindedBlockSSZ(context.Context, *v1.BlockRequest) (*v2.SSZContainer, error) GetBlockSSZV2(context.Context, *v2.BlockRequestV2) (*v2.SSZContainer, error) ListBlockAttestations(context.Context, *v1.BlockRequest) (*v1.BlockAttestationsResponse, error) - ListPoolAttesterSlashings(context.Context, *empty.Empty) (*v1.AttesterSlashingsPoolResponse, error) - SubmitAttesterSlashing(context.Context, *v1.AttesterSlashing) (*empty.Empty, error) - ListPoolProposerSlashings(context.Context, *empty.Empty) (*v1.ProposerSlashingPoolResponse, error) - SubmitProposerSlashing(context.Context, *v1.ProposerSlashing) (*empty.Empty, error) - SubmitSignedBLSToExecutionChanges(context.Context, *v2.SubmitBLSToExecutionChangesRequest) (*empty.Empty, error) - ListBLSToExecutionChanges(context.Context, *empty.Empty) (*v2.BLSToExecutionChangesPoolResponse, error) - GetForkSchedule(context.Context, *empty.Empty) (*v1.ForkScheduleResponse, error) - GetSpec(context.Context, *empty.Empty) (*v1.SpecResponse, error) + ListPoolAttesterSlashings(context.Context, *emptypb.Empty) (*v1.AttesterSlashingsPoolResponse, error) + SubmitAttesterSlashing(context.Context, *v1.AttesterSlashing) (*emptypb.Empty, error) + ListPoolProposerSlashings(context.Context, *emptypb.Empty) (*v1.ProposerSlashingPoolResponse, error) + SubmitProposerSlashing(context.Context, *v1.ProposerSlashing) (*emptypb.Empty, error) + SubmitSignedBLSToExecutionChanges(context.Context, *v2.SubmitBLSToExecutionChangesRequest) (*emptypb.Empty, error) + ListBLSToExecutionChanges(context.Context, *emptypb.Empty) (*v2.BLSToExecutionChangesPoolResponse, error) + GetForkSchedule(context.Context, *emptypb.Empty) (*v1.ForkScheduleResponse, error) + GetSpec(context.Context, *emptypb.Empty) (*v1.SpecResponse, error) } // UnimplementedBeaconChainServer can be embedded to have forward compatible implementations. type UnimplementedBeaconChainServer struct { } -func (*UnimplementedBeaconChainServer) GetWeakSubjectivity(context.Context, *empty.Empty) (*v1.WeakSubjectivityResponse, error) { +func (*UnimplementedBeaconChainServer) GetWeakSubjectivity(context.Context, *emptypb.Empty) (*v1.WeakSubjectivityResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetWeakSubjectivity not implemented") } func (*UnimplementedBeaconChainServer) GetStateRoot(context.Context, *v1.StateRequest) (*v1.StateRootResponse, error) { @@ -623,28 +623,28 @@ func (*UnimplementedBeaconChainServer) GetBlockSSZV2(context.Context, *v2.BlockR func (*UnimplementedBeaconChainServer) ListBlockAttestations(context.Context, *v1.BlockRequest) (*v1.BlockAttestationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListBlockAttestations not implemented") } -func (*UnimplementedBeaconChainServer) ListPoolAttesterSlashings(context.Context, *empty.Empty) (*v1.AttesterSlashingsPoolResponse, error) { +func (*UnimplementedBeaconChainServer) ListPoolAttesterSlashings(context.Context, *emptypb.Empty) (*v1.AttesterSlashingsPoolResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPoolAttesterSlashings not implemented") } -func (*UnimplementedBeaconChainServer) SubmitAttesterSlashing(context.Context, *v1.AttesterSlashing) (*empty.Empty, error) { +func (*UnimplementedBeaconChainServer) SubmitAttesterSlashing(context.Context, *v1.AttesterSlashing) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitAttesterSlashing not implemented") } -func (*UnimplementedBeaconChainServer) ListPoolProposerSlashings(context.Context, *empty.Empty) (*v1.ProposerSlashingPoolResponse, error) { +func (*UnimplementedBeaconChainServer) ListPoolProposerSlashings(context.Context, *emptypb.Empty) (*v1.ProposerSlashingPoolResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPoolProposerSlashings not implemented") } -func (*UnimplementedBeaconChainServer) SubmitProposerSlashing(context.Context, *v1.ProposerSlashing) (*empty.Empty, error) { +func (*UnimplementedBeaconChainServer) SubmitProposerSlashing(context.Context, *v1.ProposerSlashing) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitProposerSlashing not implemented") } -func (*UnimplementedBeaconChainServer) SubmitSignedBLSToExecutionChanges(context.Context, *v2.SubmitBLSToExecutionChangesRequest) (*empty.Empty, error) { +func (*UnimplementedBeaconChainServer) SubmitSignedBLSToExecutionChanges(context.Context, *v2.SubmitBLSToExecutionChangesRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitSignedBLSToExecutionChanges not implemented") } -func (*UnimplementedBeaconChainServer) ListBLSToExecutionChanges(context.Context, *empty.Empty) (*v2.BLSToExecutionChangesPoolResponse, error) { +func (*UnimplementedBeaconChainServer) ListBLSToExecutionChanges(context.Context, *emptypb.Empty) (*v2.BLSToExecutionChangesPoolResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListBLSToExecutionChanges not implemented") } -func (*UnimplementedBeaconChainServer) GetForkSchedule(context.Context, *empty.Empty) (*v1.ForkScheduleResponse, error) { +func (*UnimplementedBeaconChainServer) GetForkSchedule(context.Context, *emptypb.Empty) (*v1.ForkScheduleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetForkSchedule not implemented") } -func (*UnimplementedBeaconChainServer) GetSpec(context.Context, *empty.Empty) (*v1.SpecResponse, error) { +func (*UnimplementedBeaconChainServer) GetSpec(context.Context, *emptypb.Empty) (*v1.SpecResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSpec not implemented") } @@ -653,7 +653,7 @@ func RegisterBeaconChainServer(s *grpc.Server, srv BeaconChainServer) { } func _BeaconChain_GetWeakSubjectivity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -665,7 +665,7 @@ func _BeaconChain_GetWeakSubjectivity_Handler(srv interface{}, ctx context.Conte FullMethod: "/ethereum.eth.service.BeaconChain/GetWeakSubjectivity", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetWeakSubjectivity(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetWeakSubjectivity(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -851,7 +851,7 @@ func _BeaconChain_ListBlockAttestations_Handler(srv interface{}, ctx context.Con } func _BeaconChain_ListPoolAttesterSlashings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -863,7 +863,7 @@ func _BeaconChain_ListPoolAttesterSlashings_Handler(srv interface{}, ctx context FullMethod: "/ethereum.eth.service.BeaconChain/ListPoolAttesterSlashings", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).ListPoolAttesterSlashings(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).ListPoolAttesterSlashings(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -887,7 +887,7 @@ func _BeaconChain_SubmitAttesterSlashing_Handler(srv interface{}, ctx context.Co } func _BeaconChain_ListPoolProposerSlashings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -899,7 +899,7 @@ func _BeaconChain_ListPoolProposerSlashings_Handler(srv interface{}, ctx context FullMethod: "/ethereum.eth.service.BeaconChain/ListPoolProposerSlashings", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).ListPoolProposerSlashings(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).ListPoolProposerSlashings(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -941,7 +941,7 @@ func _BeaconChain_SubmitSignedBLSToExecutionChanges_Handler(srv interface{}, ctx } func _BeaconChain_ListBLSToExecutionChanges_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -953,13 +953,13 @@ func _BeaconChain_ListBLSToExecutionChanges_Handler(srv interface{}, ctx context FullMethod: "/ethereum.eth.service.BeaconChain/ListBLSToExecutionChanges", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).ListBLSToExecutionChanges(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).ListBLSToExecutionChanges(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _BeaconChain_GetForkSchedule_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -971,13 +971,13 @@ func _BeaconChain_GetForkSchedule_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.service.BeaconChain/GetForkSchedule", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetForkSchedule(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetForkSchedule(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _BeaconChain_GetSpec_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -989,7 +989,7 @@ func _BeaconChain_GetSpec_Handler(srv interface{}, ctx context.Context, dec func FullMethod: "/ethereum.eth.service.BeaconChain/GetSpec", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetSpec(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetSpec(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/eth/service/beacon_chain_service.pb.gw.go b/proto/eth/service/beacon_chain_service.pb.gw.go index 6c7b9f8c9726..76f19d9021dd 100755 --- a/proto/eth/service/beacon_chain_service.pb.gw.go +++ b/proto/eth/service/beacon_chain_service.pb.gw.go @@ -13,8 +13,6 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" @@ -26,6 +24,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -37,7 +36,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} func request_BeaconChain_GetWeakSubjectivity_0(ctx context.Context, marshaler runtime.Marshaler, client BeaconChainClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq emptypb.Empty diff --git a/proto/eth/service/beacon_debug_service.pb.go b/proto/eth/service/beacon_debug_service.pb.go index 90115a01ed2a..7e9d35611444 100755 --- a/proto/eth/service/beacon_debug_service.pb.go +++ b/proto/eth/service/beacon_debug_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/service/beacon_debug_service.proto package service @@ -10,8 +10,6 @@ import ( context "context" reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - empty "github.com/golang/protobuf/ptypes/empty" v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +18,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -109,7 +109,7 @@ var file_proto_eth_service_beacon_debug_service_proto_rawDesc = []byte{ var file_proto_eth_service_beacon_debug_service_proto_goTypes = []interface{}{ (*v1.StateRequest)(nil), // 0: ethereum.eth.v1.StateRequest (*v2.BeaconStateRequestV2)(nil), // 1: ethereum.eth.v2.BeaconStateRequestV2 - (*empty.Empty)(nil), // 2: google.protobuf.Empty + (*emptypb.Empty)(nil), // 2: google.protobuf.Empty (*v2.SSZContainer)(nil), // 3: ethereum.eth.v2.SSZContainer (*v2.BeaconStateResponseV2)(nil), // 4: ethereum.eth.v2.BeaconStateResponseV2 (*v2.ForkChoiceHeadsResponse)(nil), // 5: ethereum.eth.v2.ForkChoiceHeadsResponse @@ -172,8 +172,8 @@ type BeaconDebugClient interface { GetBeaconStateSSZ(ctx context.Context, in *v1.StateRequest, opts ...grpc.CallOption) (*v2.SSZContainer, error) GetBeaconStateV2(ctx context.Context, in *v2.BeaconStateRequestV2, opts ...grpc.CallOption) (*v2.BeaconStateResponseV2, error) GetBeaconStateSSZV2(ctx context.Context, in *v2.BeaconStateRequestV2, opts ...grpc.CallOption) (*v2.SSZContainer, error) - ListForkChoiceHeadsV2(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v2.ForkChoiceHeadsResponse, error) - GetForkChoice(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ForkChoiceDump, error) + ListForkChoiceHeadsV2(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v2.ForkChoiceHeadsResponse, error) + GetForkChoice(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ForkChoiceDump, error) } type beaconDebugClient struct { @@ -211,7 +211,7 @@ func (c *beaconDebugClient) GetBeaconStateSSZV2(ctx context.Context, in *v2.Beac return out, nil } -func (c *beaconDebugClient) ListForkChoiceHeadsV2(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v2.ForkChoiceHeadsResponse, error) { +func (c *beaconDebugClient) ListForkChoiceHeadsV2(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v2.ForkChoiceHeadsResponse, error) { out := new(v2.ForkChoiceHeadsResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconDebug/ListForkChoiceHeadsV2", in, out, opts...) if err != nil { @@ -220,7 +220,7 @@ func (c *beaconDebugClient) ListForkChoiceHeadsV2(ctx context.Context, in *empty return out, nil } -func (c *beaconDebugClient) GetForkChoice(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.ForkChoiceDump, error) { +func (c *beaconDebugClient) GetForkChoice(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.ForkChoiceDump, error) { out := new(v1.ForkChoiceDump) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconDebug/GetForkChoice", in, out, opts...) if err != nil { @@ -234,8 +234,8 @@ type BeaconDebugServer interface { GetBeaconStateSSZ(context.Context, *v1.StateRequest) (*v2.SSZContainer, error) GetBeaconStateV2(context.Context, *v2.BeaconStateRequestV2) (*v2.BeaconStateResponseV2, error) GetBeaconStateSSZV2(context.Context, *v2.BeaconStateRequestV2) (*v2.SSZContainer, error) - ListForkChoiceHeadsV2(context.Context, *empty.Empty) (*v2.ForkChoiceHeadsResponse, error) - GetForkChoice(context.Context, *empty.Empty) (*v1.ForkChoiceDump, error) + ListForkChoiceHeadsV2(context.Context, *emptypb.Empty) (*v2.ForkChoiceHeadsResponse, error) + GetForkChoice(context.Context, *emptypb.Empty) (*v1.ForkChoiceDump, error) } // UnimplementedBeaconDebugServer can be embedded to have forward compatible implementations. @@ -251,10 +251,10 @@ func (*UnimplementedBeaconDebugServer) GetBeaconStateV2(context.Context, *v2.Bea func (*UnimplementedBeaconDebugServer) GetBeaconStateSSZV2(context.Context, *v2.BeaconStateRequestV2) (*v2.SSZContainer, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBeaconStateSSZV2 not implemented") } -func (*UnimplementedBeaconDebugServer) ListForkChoiceHeadsV2(context.Context, *empty.Empty) (*v2.ForkChoiceHeadsResponse, error) { +func (*UnimplementedBeaconDebugServer) ListForkChoiceHeadsV2(context.Context, *emptypb.Empty) (*v2.ForkChoiceHeadsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListForkChoiceHeadsV2 not implemented") } -func (*UnimplementedBeaconDebugServer) GetForkChoice(context.Context, *empty.Empty) (*v1.ForkChoiceDump, error) { +func (*UnimplementedBeaconDebugServer) GetForkChoice(context.Context, *emptypb.Empty) (*v1.ForkChoiceDump, error) { return nil, status.Errorf(codes.Unimplemented, "method GetForkChoice not implemented") } @@ -317,7 +317,7 @@ func _BeaconDebug_GetBeaconStateSSZV2_Handler(srv interface{}, ctx context.Conte } func _BeaconDebug_ListForkChoiceHeadsV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -329,13 +329,13 @@ func _BeaconDebug_ListForkChoiceHeadsV2_Handler(srv interface{}, ctx context.Con FullMethod: "/ethereum.eth.service.BeaconDebug/ListForkChoiceHeadsV2", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconDebugServer).ListForkChoiceHeadsV2(ctx, req.(*empty.Empty)) + return srv.(BeaconDebugServer).ListForkChoiceHeadsV2(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _BeaconDebug_GetForkChoice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -347,7 +347,7 @@ func _BeaconDebug_GetForkChoice_Handler(srv interface{}, ctx context.Context, de FullMethod: "/ethereum.eth.service.BeaconDebug/GetForkChoice", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconDebugServer).GetForkChoice(ctx, req.(*empty.Empty)) + return srv.(BeaconDebugServer).GetForkChoice(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/eth/service/beacon_debug_service.pb.gw.go b/proto/eth/service/beacon_debug_service.pb.gw.go index 74ed0723dbe7..a835c976073f 100755 --- a/proto/eth/service/beacon_debug_service.pb.gw.go +++ b/proto/eth/service/beacon_debug_service.pb.gw.go @@ -13,12 +13,10 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -26,6 +24,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -37,7 +36,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} func request_BeaconDebug_GetBeaconStateSSZ_0(ctx context.Context, marshaler runtime.Marshaler, client BeaconDebugClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq v1.StateRequest diff --git a/proto/eth/service/events_service.pb.go b/proto/eth/service/events_service.pb.go index f85b34a21be1..17562da37b15 100755 --- a/proto/eth/service/events_service.pb.go +++ b/proto/eth/service/events_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/service/events_service.proto package service @@ -10,7 +10,6 @@ import ( context "context" reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" gateway "github.com/grpc-ecosystem/grpc-gateway/v2/proto/gateway" v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -19,6 +18,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/service/events_service.pb.gw.go b/proto/eth/service/events_service.pb.gw.go index 6c1b7bd0fa69..d7b3bcee68d8 100755 --- a/proto/eth/service/events_service.pb.gw.go +++ b/proto/eth/service/events_service.pb.gw.go @@ -13,8 +13,6 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" @@ -25,6 +23,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -36,7 +35,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} var ( filter_Events_StreamEvents_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} diff --git a/proto/eth/service/key_management.pb.go b/proto/eth/service/key_management.pb.go index ea332d5c3ae4..9b9a4c22d841 100755 --- a/proto/eth/service/key_management.pb.go +++ b/proto/eth/service/key_management.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/service/key_management.proto package service @@ -11,8 +11,6 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -21,6 +19,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -2142,7 +2142,7 @@ var file_proto_eth_service_key_management_proto_goTypes = []interface{}{ (*GetGasLimitResponse_GasLimit)(nil), // 30: ethereum.eth.service.GetGasLimitResponse.GasLimit (*SetVoluntaryExitResponse_SignedVoluntaryExit)(nil), // 31: ethereum.eth.service.SetVoluntaryExitResponse.SignedVoluntaryExit (*SetVoluntaryExitResponse_SignedVoluntaryExit_VoluntaryExit)(nil), // 32: ethereum.eth.service.SetVoluntaryExitResponse.SignedVoluntaryExit.VoluntaryExit - (*empty.Empty)(nil), // 33: google.protobuf.Empty + (*emptypb.Empty)(nil), // 33: google.protobuf.Empty } var file_proto_eth_service_key_management_proto_depIdxs = []int32{ 26, // 0: ethereum.eth.service.ListKeystoresResponse.data:type_name -> ethereum.eth.service.ListKeystoresResponse.Keystore @@ -2581,18 +2581,18 @@ const _ = grpc.SupportPackageIsVersion6 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type KeyManagementClient interface { - ListKeystores(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListKeystoresResponse, error) + ListKeystores(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListKeystoresResponse, error) ImportKeystores(ctx context.Context, in *ImportKeystoresRequest, opts ...grpc.CallOption) (*ImportKeystoresResponse, error) DeleteKeystores(ctx context.Context, in *DeleteKeystoresRequest, opts ...grpc.CallOption) (*DeleteKeystoresResponse, error) - ListRemoteKeys(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListRemoteKeysResponse, error) + ListRemoteKeys(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListRemoteKeysResponse, error) ImportRemoteKeys(ctx context.Context, in *ImportRemoteKeysRequest, opts ...grpc.CallOption) (*ImportRemoteKeysResponse, error) DeleteRemoteKeys(ctx context.Context, in *DeleteRemoteKeysRequest, opts ...grpc.CallOption) (*DeleteRemoteKeysResponse, error) ListFeeRecipientByPubkey(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*GetFeeRecipientByPubkeyResponse, error) - SetFeeRecipientByPubkey(ctx context.Context, in *SetFeeRecipientByPubkeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) - DeleteFeeRecipientByPubkey(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) + SetFeeRecipientByPubkey(ctx context.Context, in *SetFeeRecipientByPubkeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteFeeRecipientByPubkey(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) GetGasLimit(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*GetGasLimitResponse, error) - SetGasLimit(ctx context.Context, in *SetGasLimitRequest, opts ...grpc.CallOption) (*empty.Empty, error) - DeleteGasLimit(ctx context.Context, in *DeleteGasLimitRequest, opts ...grpc.CallOption) (*empty.Empty, error) + SetGasLimit(ctx context.Context, in *SetGasLimitRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteGasLimit(ctx context.Context, in *DeleteGasLimitRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) SetVoluntaryExit(ctx context.Context, in *SetVoluntaryExitRequest, opts ...grpc.CallOption) (*SetVoluntaryExitResponse, error) } @@ -2604,7 +2604,7 @@ func NewKeyManagementClient(cc grpc.ClientConnInterface) KeyManagementClient { return &keyManagementClient{cc} } -func (c *keyManagementClient) ListKeystores(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListKeystoresResponse, error) { +func (c *keyManagementClient) ListKeystores(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListKeystoresResponse, error) { out := new(ListKeystoresResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/ListKeystores", in, out, opts...) if err != nil { @@ -2631,7 +2631,7 @@ func (c *keyManagementClient) DeleteKeystores(ctx context.Context, in *DeleteKey return out, nil } -func (c *keyManagementClient) ListRemoteKeys(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListRemoteKeysResponse, error) { +func (c *keyManagementClient) ListRemoteKeys(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListRemoteKeysResponse, error) { out := new(ListRemoteKeysResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/ListRemoteKeys", in, out, opts...) if err != nil { @@ -2667,8 +2667,8 @@ func (c *keyManagementClient) ListFeeRecipientByPubkey(ctx context.Context, in * return out, nil } -func (c *keyManagementClient) SetFeeRecipientByPubkey(ctx context.Context, in *SetFeeRecipientByPubkeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *keyManagementClient) SetFeeRecipientByPubkey(ctx context.Context, in *SetFeeRecipientByPubkeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/SetFeeRecipientByPubkey", in, out, opts...) if err != nil { return nil, err @@ -2676,8 +2676,8 @@ func (c *keyManagementClient) SetFeeRecipientByPubkey(ctx context.Context, in *S return out, nil } -func (c *keyManagementClient) DeleteFeeRecipientByPubkey(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *keyManagementClient) DeleteFeeRecipientByPubkey(ctx context.Context, in *PubkeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/DeleteFeeRecipientByPubkey", in, out, opts...) if err != nil { return nil, err @@ -2694,8 +2694,8 @@ func (c *keyManagementClient) GetGasLimit(ctx context.Context, in *PubkeyRequest return out, nil } -func (c *keyManagementClient) SetGasLimit(ctx context.Context, in *SetGasLimitRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *keyManagementClient) SetGasLimit(ctx context.Context, in *SetGasLimitRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/SetGasLimit", in, out, opts...) if err != nil { return nil, err @@ -2703,8 +2703,8 @@ func (c *keyManagementClient) SetGasLimit(ctx context.Context, in *SetGasLimitRe return out, nil } -func (c *keyManagementClient) DeleteGasLimit(ctx context.Context, in *DeleteGasLimitRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *keyManagementClient) DeleteGasLimit(ctx context.Context, in *DeleteGasLimitRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.KeyManagement/DeleteGasLimit", in, out, opts...) if err != nil { return nil, err @@ -2723,18 +2723,18 @@ func (c *keyManagementClient) SetVoluntaryExit(ctx context.Context, in *SetVolun // KeyManagementServer is the server API for KeyManagement service. type KeyManagementServer interface { - ListKeystores(context.Context, *empty.Empty) (*ListKeystoresResponse, error) + ListKeystores(context.Context, *emptypb.Empty) (*ListKeystoresResponse, error) ImportKeystores(context.Context, *ImportKeystoresRequest) (*ImportKeystoresResponse, error) DeleteKeystores(context.Context, *DeleteKeystoresRequest) (*DeleteKeystoresResponse, error) - ListRemoteKeys(context.Context, *empty.Empty) (*ListRemoteKeysResponse, error) + ListRemoteKeys(context.Context, *emptypb.Empty) (*ListRemoteKeysResponse, error) ImportRemoteKeys(context.Context, *ImportRemoteKeysRequest) (*ImportRemoteKeysResponse, error) DeleteRemoteKeys(context.Context, *DeleteRemoteKeysRequest) (*DeleteRemoteKeysResponse, error) ListFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*GetFeeRecipientByPubkeyResponse, error) - SetFeeRecipientByPubkey(context.Context, *SetFeeRecipientByPubkeyRequest) (*empty.Empty, error) - DeleteFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*empty.Empty, error) + SetFeeRecipientByPubkey(context.Context, *SetFeeRecipientByPubkeyRequest) (*emptypb.Empty, error) + DeleteFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*emptypb.Empty, error) GetGasLimit(context.Context, *PubkeyRequest) (*GetGasLimitResponse, error) - SetGasLimit(context.Context, *SetGasLimitRequest) (*empty.Empty, error) - DeleteGasLimit(context.Context, *DeleteGasLimitRequest) (*empty.Empty, error) + SetGasLimit(context.Context, *SetGasLimitRequest) (*emptypb.Empty, error) + DeleteGasLimit(context.Context, *DeleteGasLimitRequest) (*emptypb.Empty, error) SetVoluntaryExit(context.Context, *SetVoluntaryExitRequest) (*SetVoluntaryExitResponse, error) } @@ -2742,7 +2742,7 @@ type KeyManagementServer interface { type UnimplementedKeyManagementServer struct { } -func (*UnimplementedKeyManagementServer) ListKeystores(context.Context, *empty.Empty) (*ListKeystoresResponse, error) { +func (*UnimplementedKeyManagementServer) ListKeystores(context.Context, *emptypb.Empty) (*ListKeystoresResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListKeystores not implemented") } func (*UnimplementedKeyManagementServer) ImportKeystores(context.Context, *ImportKeystoresRequest) (*ImportKeystoresResponse, error) { @@ -2751,7 +2751,7 @@ func (*UnimplementedKeyManagementServer) ImportKeystores(context.Context, *Impor func (*UnimplementedKeyManagementServer) DeleteKeystores(context.Context, *DeleteKeystoresRequest) (*DeleteKeystoresResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteKeystores not implemented") } -func (*UnimplementedKeyManagementServer) ListRemoteKeys(context.Context, *empty.Empty) (*ListRemoteKeysResponse, error) { +func (*UnimplementedKeyManagementServer) ListRemoteKeys(context.Context, *emptypb.Empty) (*ListRemoteKeysResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListRemoteKeys not implemented") } func (*UnimplementedKeyManagementServer) ImportRemoteKeys(context.Context, *ImportRemoteKeysRequest) (*ImportRemoteKeysResponse, error) { @@ -2763,19 +2763,19 @@ func (*UnimplementedKeyManagementServer) DeleteRemoteKeys(context.Context, *Dele func (*UnimplementedKeyManagementServer) ListFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*GetFeeRecipientByPubkeyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListFeeRecipientByPubkey not implemented") } -func (*UnimplementedKeyManagementServer) SetFeeRecipientByPubkey(context.Context, *SetFeeRecipientByPubkeyRequest) (*empty.Empty, error) { +func (*UnimplementedKeyManagementServer) SetFeeRecipientByPubkey(context.Context, *SetFeeRecipientByPubkeyRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SetFeeRecipientByPubkey not implemented") } -func (*UnimplementedKeyManagementServer) DeleteFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*empty.Empty, error) { +func (*UnimplementedKeyManagementServer) DeleteFeeRecipientByPubkey(context.Context, *PubkeyRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteFeeRecipientByPubkey not implemented") } func (*UnimplementedKeyManagementServer) GetGasLimit(context.Context, *PubkeyRequest) (*GetGasLimitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetGasLimit not implemented") } -func (*UnimplementedKeyManagementServer) SetGasLimit(context.Context, *SetGasLimitRequest) (*empty.Empty, error) { +func (*UnimplementedKeyManagementServer) SetGasLimit(context.Context, *SetGasLimitRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SetGasLimit not implemented") } -func (*UnimplementedKeyManagementServer) DeleteGasLimit(context.Context, *DeleteGasLimitRequest) (*empty.Empty, error) { +func (*UnimplementedKeyManagementServer) DeleteGasLimit(context.Context, *DeleteGasLimitRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteGasLimit not implemented") } func (*UnimplementedKeyManagementServer) SetVoluntaryExit(context.Context, *SetVoluntaryExitRequest) (*SetVoluntaryExitResponse, error) { @@ -2787,7 +2787,7 @@ func RegisterKeyManagementServer(s *grpc.Server, srv KeyManagementServer) { } func _KeyManagement_ListKeystores_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -2799,7 +2799,7 @@ func _KeyManagement_ListKeystores_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.service.KeyManagement/ListKeystores", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(KeyManagementServer).ListKeystores(ctx, req.(*empty.Empty)) + return srv.(KeyManagementServer).ListKeystores(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -2841,7 +2841,7 @@ func _KeyManagement_DeleteKeystores_Handler(srv interface{}, ctx context.Context } func _KeyManagement_ListRemoteKeys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -2853,7 +2853,7 @@ func _KeyManagement_ListRemoteKeys_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.service.KeyManagement/ListRemoteKeys", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(KeyManagementServer).ListRemoteKeys(ctx, req.(*empty.Empty)) + return srv.(KeyManagementServer).ListRemoteKeys(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/eth/service/key_management.pb.gw.go b/proto/eth/service/key_management.pb.gw.go index cc446408b341..7f56afe10a82 100755 --- a/proto/eth/service/key_management.pb.gw.go +++ b/proto/eth/service/key_management.pb.gw.go @@ -13,8 +13,6 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" @@ -24,6 +22,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -35,7 +34,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} func request_KeyManagement_ListKeystores_0(ctx context.Context, marshaler runtime.Marshaler, client KeyManagementClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq emptypb.Empty diff --git a/proto/eth/service/node_service.pb.go b/proto/eth/service/node_service.pb.go index 4b4301cc139e..72e74edcfce4 100755 --- a/proto/eth/service/node_service.pb.go +++ b/proto/eth/service/node_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/service/node_service.proto @@ -10,8 +10,6 @@ import ( context "context" reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - empty "github.com/golang/protobuf/ptypes/empty" v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -19,6 +17,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -98,7 +98,7 @@ var file_proto_eth_service_node_service_proto_rawDesc = []byte{ } var file_proto_eth_service_node_service_proto_goTypes = []interface{}{ - (*empty.Empty)(nil), // 0: google.protobuf.Empty + (*emptypb.Empty)(nil), // 0: google.protobuf.Empty (*v1.PeersRequest)(nil), // 1: ethereum.eth.v1.PeersRequest (*v1.PeerRequest)(nil), // 2: ethereum.eth.v1.PeerRequest (*v1.IdentityResponse)(nil), // 3: ethereum.eth.v1.IdentityResponse @@ -163,12 +163,12 @@ const _ = grpc.SupportPackageIsVersion6 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type BeaconNodeClient interface { - GetIdentity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.IdentityResponse, error) + GetIdentity(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.IdentityResponse, error) ListPeers(ctx context.Context, in *v1.PeersRequest, opts ...grpc.CallOption) (*v1.PeersResponse, error) GetPeer(ctx context.Context, in *v1.PeerRequest, opts ...grpc.CallOption) (*v1.PeerResponse, error) - PeerCount(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.PeerCountResponse, error) - GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.VersionResponse, error) - GetHealth(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error) + PeerCount(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.PeerCountResponse, error) + GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.VersionResponse, error) + GetHealth(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) } type beaconNodeClient struct { @@ -179,7 +179,7 @@ func NewBeaconNodeClient(cc grpc.ClientConnInterface) BeaconNodeClient { return &beaconNodeClient{cc} } -func (c *beaconNodeClient) GetIdentity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.IdentityResponse, error) { +func (c *beaconNodeClient) GetIdentity(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.IdentityResponse, error) { out := new(v1.IdentityResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconNode/GetIdentity", in, out, opts...) if err != nil { @@ -206,7 +206,7 @@ func (c *beaconNodeClient) GetPeer(ctx context.Context, in *v1.PeerRequest, opts return out, nil } -func (c *beaconNodeClient) PeerCount(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.PeerCountResponse, error) { +func (c *beaconNodeClient) PeerCount(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.PeerCountResponse, error) { out := new(v1.PeerCountResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconNode/PeerCount", in, out, opts...) if err != nil { @@ -215,7 +215,7 @@ func (c *beaconNodeClient) PeerCount(ctx context.Context, in *empty.Empty, opts return out, nil } -func (c *beaconNodeClient) GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1.VersionResponse, error) { +func (c *beaconNodeClient) GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1.VersionResponse, error) { out := new(v1.VersionResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconNode/GetVersion", in, out, opts...) if err != nil { @@ -224,8 +224,8 @@ func (c *beaconNodeClient) GetVersion(ctx context.Context, in *empty.Empty, opts return out, nil } -func (c *beaconNodeClient) GetHealth(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeClient) GetHealth(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.service.BeaconNode/GetHealth", in, out, opts...) if err != nil { return nil, err @@ -235,19 +235,19 @@ func (c *beaconNodeClient) GetHealth(ctx context.Context, in *empty.Empty, opts // BeaconNodeServer is the server API for BeaconNode service. type BeaconNodeServer interface { - GetIdentity(context.Context, *empty.Empty) (*v1.IdentityResponse, error) + GetIdentity(context.Context, *emptypb.Empty) (*v1.IdentityResponse, error) ListPeers(context.Context, *v1.PeersRequest) (*v1.PeersResponse, error) GetPeer(context.Context, *v1.PeerRequest) (*v1.PeerResponse, error) - PeerCount(context.Context, *empty.Empty) (*v1.PeerCountResponse, error) - GetVersion(context.Context, *empty.Empty) (*v1.VersionResponse, error) - GetHealth(context.Context, *empty.Empty) (*empty.Empty, error) + PeerCount(context.Context, *emptypb.Empty) (*v1.PeerCountResponse, error) + GetVersion(context.Context, *emptypb.Empty) (*v1.VersionResponse, error) + GetHealth(context.Context, *emptypb.Empty) (*emptypb.Empty, error) } // UnimplementedBeaconNodeServer can be embedded to have forward compatible implementations. type UnimplementedBeaconNodeServer struct { } -func (*UnimplementedBeaconNodeServer) GetIdentity(context.Context, *empty.Empty) (*v1.IdentityResponse, error) { +func (*UnimplementedBeaconNodeServer) GetIdentity(context.Context, *emptypb.Empty) (*v1.IdentityResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetIdentity not implemented") } func (*UnimplementedBeaconNodeServer) ListPeers(context.Context, *v1.PeersRequest) (*v1.PeersResponse, error) { @@ -256,13 +256,13 @@ func (*UnimplementedBeaconNodeServer) ListPeers(context.Context, *v1.PeersReques func (*UnimplementedBeaconNodeServer) GetPeer(context.Context, *v1.PeerRequest) (*v1.PeerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPeer not implemented") } -func (*UnimplementedBeaconNodeServer) PeerCount(context.Context, *empty.Empty) (*v1.PeerCountResponse, error) { +func (*UnimplementedBeaconNodeServer) PeerCount(context.Context, *emptypb.Empty) (*v1.PeerCountResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PeerCount not implemented") } -func (*UnimplementedBeaconNodeServer) GetVersion(context.Context, *empty.Empty) (*v1.VersionResponse, error) { +func (*UnimplementedBeaconNodeServer) GetVersion(context.Context, *emptypb.Empty) (*v1.VersionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetVersion not implemented") } -func (*UnimplementedBeaconNodeServer) GetHealth(context.Context, *empty.Empty) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeServer) GetHealth(context.Context, *emptypb.Empty) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method GetHealth not implemented") } @@ -271,7 +271,7 @@ func RegisterBeaconNodeServer(s *grpc.Server, srv BeaconNodeServer) { } func _BeaconNode_GetIdentity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -283,7 +283,7 @@ func _BeaconNode_GetIdentity_Handler(srv interface{}, ctx context.Context, dec f FullMethod: "/ethereum.eth.service.BeaconNode/GetIdentity", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconNodeServer).GetIdentity(ctx, req.(*empty.Empty)) + return srv.(BeaconNodeServer).GetIdentity(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -325,7 +325,7 @@ func _BeaconNode_GetPeer_Handler(srv interface{}, ctx context.Context, dec func( } func _BeaconNode_PeerCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -337,13 +337,13 @@ func _BeaconNode_PeerCount_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: "/ethereum.eth.service.BeaconNode/PeerCount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconNodeServer).PeerCount(ctx, req.(*empty.Empty)) + return srv.(BeaconNodeServer).PeerCount(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _BeaconNode_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -355,13 +355,13 @@ func _BeaconNode_GetVersion_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/ethereum.eth.service.BeaconNode/GetVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconNodeServer).GetVersion(ctx, req.(*empty.Empty)) + return srv.(BeaconNodeServer).GetVersion(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _BeaconNode_GetHealth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -373,7 +373,7 @@ func _BeaconNode_GetHealth_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: "/ethereum.eth.service.BeaconNode/GetHealth", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconNodeServer).GetHealth(ctx, req.(*empty.Empty)) + return srv.(BeaconNodeServer).GetHealth(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/eth/service/node_service.pb.gw.go b/proto/eth/service/node_service.pb.gw.go index 62fb677274e6..86b3756ace0f 100755 --- a/proto/eth/service/node_service.pb.gw.go +++ b/proto/eth/service/node_service.pb.gw.go @@ -13,8 +13,6 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" @@ -25,6 +23,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -36,7 +35,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} func request_BeaconNode_GetIdentity_0(ctx context.Context, marshaler runtime.Marshaler, client BeaconNodeClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq emptypb.Empty diff --git a/proto/eth/service/validator_service.pb.go b/proto/eth/service/validator_service.pb.go index c37eef42c599..d83cb93c38a7 100755 --- a/proto/eth/service/validator_service.pb.go +++ b/proto/eth/service/validator_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/service/validator_service.proto @@ -10,8 +10,6 @@ import ( context "context" reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - _ "github.com/golang/protobuf/ptypes/empty" v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +18,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + _ "google.golang.org/protobuf/types/known/emptypb" ) const ( diff --git a/proto/eth/service/validator_service.pb.gw.go b/proto/eth/service/validator_service.pb.gw.go index 6252a711d506..687a7d0dbef8 100755 --- a/proto/eth/service/validator_service.pb.gw.go +++ b/proto/eth/service/validator_service.pb.gw.go @@ -13,8 +13,6 @@ import ( "io" "net/http" - "github.com/golang/protobuf/ptypes/empty" - emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" @@ -25,6 +23,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/emptypb" ) // Suppress "imported and not used" errors @@ -36,7 +35,6 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} -var _ = empty.Empty{} var ( filter_BeaconValidator_ProduceBlockV2_0 = &utilities.DoubleArray{Encoding: map[string]int{"slot": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} diff --git a/proto/eth/v1/BUILD.bazel b/proto/eth/v1/BUILD.bazel index cc6b945203ec..1279c2dd8828 100644 --- a/proto/eth/v1/BUILD.bazel +++ b/proto/eth/v1/BUILD.bazel @@ -79,6 +79,7 @@ go_proto_library( "//consensus-types/primitives:go_default_library", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", + "@org_golang_google_protobuf//types/descriptorpb:go_default_library", ], ) @@ -103,7 +104,9 @@ go_library( ], importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1", visibility = ["//visibility:public"], - deps = SSZ_DEPS + deps = SSZ_DEPS + [ + "@org_golang_google_protobuf//types/descriptorpb", + ], ) ssz_proto_files( diff --git a/proto/eth/v1/attestation.pb.go b/proto/eth/v1/attestation.pb.go index 66cc9c38fd4b..a75d3e3ce5c5 100755 --- a/proto/eth/v1/attestation.pb.go +++ b/proto/eth/v1/attestation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v1/attestation.proto package v1 @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v1/beacon_block.pb.go b/proto/eth/v1/beacon_block.pb.go index e5bc0d053ec1..c6ce0ba74fe3 100755 --- a/proto/eth/v1/beacon_block.pb.go +++ b/proto/eth/v1/beacon_block.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v1/beacon_block.proto package v1 @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v1/beacon_chain.pb.go b/proto/eth/v1/beacon_chain.pb.go index 45607f3c90cf..68bea2a8e93a 100755 --- a/proto/eth/v1/beacon_chain.pb.go +++ b/proto/eth/v1/beacon_chain.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v1/beacon_chain.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - _ "github.com/golang/protobuf/ptypes/timestamp" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + _ "google.golang.org/protobuf/types/known/timestamppb" ) const ( diff --git a/proto/eth/v1/beacon_state.pb.go b/proto/eth/v1/beacon_state.pb.go index ca9ed789c8a8..bf917ca58a55 100755 --- a/proto/eth/v1/beacon_state.pb.go +++ b/proto/eth/v1/beacon_state.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v1/beacon_state.proto package v1 @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v1/events.pb.go b/proto/eth/v1/events.pb.go index ab1c2944967a..8b1f50b35d31 100755 --- a/proto/eth/v1/events.pb.go +++ b/proto/eth/v1/events.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v1/events.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v1/node.pb.go b/proto/eth/v1/node.pb.go index 16e618d768f1..4805f1d0249f 100755 --- a/proto/eth/v1/node.pb.go +++ b/proto/eth/v1/node.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v1/node.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v1/validator.pb.go b/proto/eth/v1/validator.pb.go index c6b77f2de8ca..7f6a60042330 100755 --- a/proto/eth/v1/validator.pb.go +++ b/proto/eth/v1/validator.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v1/validator.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/eth/v2/beacon_block.pb.go b/proto/eth/v2/beacon_block.pb.go index 8daf0bd24e53..e480de3422ff 100755 --- a/proto/eth/v2/beacon_block.pb.go +++ b/proto/eth/v2/beacon_block.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v2/beacon_block.proto diff --git a/proto/eth/v2/beacon_chain.pb.go b/proto/eth/v2/beacon_chain.pb.go index 5af3487dfbd2..9d04c828da52 100755 --- a/proto/eth/v2/beacon_chain.pb.go +++ b/proto/eth/v2/beacon_chain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v2/beacon_chain.proto package eth diff --git a/proto/eth/v2/beacon_lightclient.pb.go b/proto/eth/v2/beacon_lightclient.pb.go index df0bc8b18cc8..82af99c28b7a 100755 --- a/proto/eth/v2/beacon_lightclient.pb.go +++ b/proto/eth/v2/beacon_lightclient.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v2/beacon_lightclient.proto diff --git a/proto/eth/v2/beacon_state.pb.go b/proto/eth/v2/beacon_state.pb.go index 40b69f080fa0..892234f3968b 100755 --- a/proto/eth/v2/beacon_state.pb.go +++ b/proto/eth/v2/beacon_state.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v2/beacon_state.proto package eth diff --git a/proto/eth/v2/blobs.pb.go b/proto/eth/v2/blobs.pb.go index 10b22491e26e..28ff3aaa08bc 100755 --- a/proto/eth/v2/blobs.pb.go +++ b/proto/eth/v2/blobs.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v2/blobs.proto diff --git a/proto/eth/v2/ssz.pb.go b/proto/eth/v2/ssz.pb.go index 16a5c391dc22..4dbb82e29b66 100755 --- a/proto/eth/v2/ssz.pb.go +++ b/proto/eth/v2/ssz.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v2/ssz.proto package eth diff --git a/proto/eth/v2/sync_committee.pb.go b/proto/eth/v2/sync_committee.pb.go index 337118eaf4ff..9dc8392ece4b 100755 --- a/proto/eth/v2/sync_committee.pb.go +++ b/proto/eth/v2/sync_committee.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v2/sync_committee.proto diff --git a/proto/eth/v2/validator.pb.go b/proto/eth/v2/validator.pb.go index 0fef984ed56d..87e9f5d949f4 100755 --- a/proto/eth/v2/validator.pb.go +++ b/proto/eth/v2/validator.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/eth/v2/validator.proto diff --git a/proto/eth/v2/version.pb.go b/proto/eth/v2/version.pb.go index 833fe0e672eb..799a3fb47954 100755 --- a/proto/eth/v2/version.pb.go +++ b/proto/eth/v2/version.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v2/version.proto package eth diff --git a/proto/eth/v2/withdrawals.pb.go b/proto/eth/v2/withdrawals.pb.go index 8e5362705d7c..6441ffbb5100 100755 --- a/proto/eth/v2/withdrawals.pb.go +++ b/proto/eth/v2/withdrawals.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/eth/v2/withdrawals.proto package eth diff --git a/proto/prysm/v1alpha1/BUILD.bazel b/proto/prysm/v1alpha1/BUILD.bazel index bd7cec63d736..3e2ad12af5b6 100644 --- a/proto/prysm/v1alpha1/BUILD.bazel +++ b/proto/prysm/v1alpha1/BUILD.bazel @@ -42,7 +42,7 @@ proto_library( "@com_google_protobuf//:descriptor_proto", "@com_google_protobuf//:empty_proto", "@com_google_protobuf//:timestamp_proto", - "@go_googleapis//google/api:annotations_proto", + "@googleapis//google/api:annotations_proto", ], ) @@ -155,13 +155,14 @@ go_proto_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_go_bitfield//:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", + "@org_golang_google_protobuf//types/known/emptypb:go_default_library", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", + "@org_golang_google_protobuf//types/descriptorpb:go_default_library", ], ) @@ -179,9 +180,10 @@ go_proto_library( "//proto/eth/ext: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", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", + "@org_golang_google_protobuf//types/known/emptypb:go_default_library", + "@org_golang_google_protobuf//types/descriptorpb:go_default_library", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", ], ) @@ -205,7 +207,6 @@ go_library( "//encoding/bytesutil: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", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//grpclog:go_default_library", @@ -215,10 +216,13 @@ go_library( "@com_github_golang_protobuf//proto:go_default_library", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", # keep - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", + "@org_golang_google_protobuf//types/known/emptypb:go_default_library", + "@org_golang_google_protobuf//types/descriptorpb:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-openapiv2/options:options_go_proto", + "@io_bazel_rules_go//proto/wkt:empty_go_proto", ], ) diff --git a/proto/prysm/v1alpha1/attestation.pb.go b/proto/prysm/v1alpha1/attestation.pb.go index c9bfde880a3e..ddbe455d8773 100755 --- a/proto/prysm/v1alpha1/attestation.pb.go +++ b/proto/prysm/v1alpha1/attestation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/attestation.proto package eth diff --git a/proto/prysm/v1alpha1/beacon_block.pb.go b/proto/prysm/v1alpha1/beacon_block.pb.go index 2096e43074f4..aef907ff7755 100755 --- a/proto/prysm/v1alpha1/beacon_block.pb.go +++ b/proto/prysm/v1alpha1/beacon_block.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/prysm/v1alpha1/beacon_block.proto diff --git a/proto/prysm/v1alpha1/beacon_chain.pb.go b/proto/prysm/v1alpha1/beacon_chain.pb.go index c871ece44b52..0629c44314c8 100755 --- a/proto/prysm/v1alpha1/beacon_chain.pb.go +++ b/proto/prysm/v1alpha1/beacon_chain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/beacon_chain.proto package eth @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +19,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -4292,7 +4292,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_goTypes = []interface{}{ (*SignedBlindedBeaconBlockDeneb)(nil), // 49: ethereum.eth.v1alpha1.SignedBlindedBeaconBlockDeneb (*ValidatorParticipation)(nil), // 50: ethereum.eth.v1alpha1.ValidatorParticipation (*Validator)(nil), // 51: ethereum.eth.v1alpha1.Validator - (*empty.Empty)(nil), // 52: google.protobuf.Empty + (*emptypb.Empty)(nil), // 52: google.protobuf.Empty (*StreamBlocksRequest)(nil), // 53: ethereum.eth.v1alpha1.StreamBlocksRequest (*AttesterSlashing)(nil), // 54: ethereum.eth.v1alpha1.AttesterSlashing (*ProposerSlashing)(nil), // 55: ethereum.eth.v1alpha1.ProposerSlashing @@ -4917,27 +4917,27 @@ type BeaconChainClient interface { ListAttestations(ctx context.Context, in *ListAttestationsRequest, opts ...grpc.CallOption) (*ListAttestationsResponse, error) ListIndexedAttestations(ctx context.Context, in *ListIndexedAttestationsRequest, opts ...grpc.CallOption) (*ListIndexedAttestationsResponse, error) // Deprecated: Do not use. - StreamAttestations(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamAttestationsClient, error) + StreamAttestations(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamAttestationsClient, error) // Deprecated: Do not use. - StreamIndexedAttestations(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamIndexedAttestationsClient, error) + StreamIndexedAttestations(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamIndexedAttestationsClient, error) AttestationPool(ctx context.Context, in *AttestationPoolRequest, opts ...grpc.CallOption) (*AttestationPoolResponse, error) ListBeaconBlocks(ctx context.Context, in *ListBlocksRequest, opts ...grpc.CallOption) (*ListBeaconBlocksResponse, error) // Deprecated: Do not use. StreamBlocks(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (BeaconChain_StreamBlocksClient, error) // Deprecated: Do not use. - StreamChainHead(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamChainHeadClient, error) + StreamChainHead(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamChainHeadClient, error) // Deprecated: Do not use. - GetChainHead(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ChainHead, error) + GetChainHead(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ChainHead, error) ListBeaconCommittees(ctx context.Context, in *ListCommitteesRequest, opts ...grpc.CallOption) (*BeaconCommittees, error) ListValidatorBalances(ctx context.Context, in *ListValidatorBalancesRequest, opts ...grpc.CallOption) (*ValidatorBalances, error) ListValidators(ctx context.Context, in *ListValidatorsRequest, opts ...grpc.CallOption) (*Validators, error) GetValidator(ctx context.Context, in *GetValidatorRequest, opts ...grpc.CallOption) (*Validator, error) GetValidatorActiveSetChanges(ctx context.Context, in *GetValidatorActiveSetChangesRequest, opts ...grpc.CallOption) (*ActiveSetChanges, error) - GetValidatorQueue(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ValidatorQueue, error) + GetValidatorQueue(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ValidatorQueue, error) GetValidatorPerformance(ctx context.Context, in *ValidatorPerformanceRequest, opts ...grpc.CallOption) (*ValidatorPerformanceResponse, error) ListValidatorAssignments(ctx context.Context, in *ListValidatorAssignmentsRequest, opts ...grpc.CallOption) (*ValidatorAssignments, error) GetValidatorParticipation(ctx context.Context, in *GetValidatorParticipationRequest, opts ...grpc.CallOption) (*ValidatorParticipationResponse, error) - GetBeaconConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*BeaconConfig, error) + GetBeaconConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*BeaconConfig, error) // Deprecated: Do not use. StreamValidatorsInfo(ctx context.Context, opts ...grpc.CallOption) (BeaconChain_StreamValidatorsInfoClient, error) SubmitAttesterSlashing(ctx context.Context, in *AttesterSlashing, opts ...grpc.CallOption) (*SubmitSlashingResponse, error) @@ -4972,7 +4972,7 @@ func (c *beaconChainClient) ListIndexedAttestations(ctx context.Context, in *Lis } // Deprecated: Do not use. -func (c *beaconChainClient) StreamAttestations(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamAttestationsClient, error) { +func (c *beaconChainClient) StreamAttestations(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamAttestationsClient, error) { stream, err := c.cc.NewStream(ctx, &_BeaconChain_serviceDesc.Streams[0], "/ethereum.eth.v1alpha1.BeaconChain/StreamAttestations", opts...) if err != nil { return nil, err @@ -5005,7 +5005,7 @@ func (x *beaconChainStreamAttestationsClient) Recv() (*Attestation, error) { } // Deprecated: Do not use. -func (c *beaconChainClient) StreamIndexedAttestations(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamIndexedAttestationsClient, error) { +func (c *beaconChainClient) StreamIndexedAttestations(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamIndexedAttestationsClient, error) { stream, err := c.cc.NewStream(ctx, &_BeaconChain_serviceDesc.Streams[1], "/ethereum.eth.v1alpha1.BeaconChain/StreamIndexedAttestations", opts...) if err != nil { return nil, err @@ -5089,7 +5089,7 @@ func (x *beaconChainStreamBlocksClient) Recv() (*SignedBeaconBlock, error) { } // Deprecated: Do not use. -func (c *beaconChainClient) StreamChainHead(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconChain_StreamChainHeadClient, error) { +func (c *beaconChainClient) StreamChainHead(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconChain_StreamChainHeadClient, error) { stream, err := c.cc.NewStream(ctx, &_BeaconChain_serviceDesc.Streams[3], "/ethereum.eth.v1alpha1.BeaconChain/StreamChainHead", opts...) if err != nil { return nil, err @@ -5122,7 +5122,7 @@ func (x *beaconChainStreamChainHeadClient) Recv() (*ChainHead, error) { } // Deprecated: Do not use. -func (c *beaconChainClient) GetChainHead(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ChainHead, error) { +func (c *beaconChainClient) GetChainHead(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ChainHead, error) { out := new(ChainHead) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconChain/GetChainHead", in, out, opts...) if err != nil { @@ -5176,7 +5176,7 @@ func (c *beaconChainClient) GetValidatorActiveSetChanges(ctx context.Context, in return out, nil } -func (c *beaconChainClient) GetValidatorQueue(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ValidatorQueue, error) { +func (c *beaconChainClient) GetValidatorQueue(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ValidatorQueue, error) { out := new(ValidatorQueue) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconChain/GetValidatorQueue", in, out, opts...) if err != nil { @@ -5212,7 +5212,7 @@ func (c *beaconChainClient) GetValidatorParticipation(ctx context.Context, in *G return out, nil } -func (c *beaconChainClient) GetBeaconConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*BeaconConfig, error) { +func (c *beaconChainClient) GetBeaconConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*BeaconConfig, error) { out := new(BeaconConfig) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconChain/GetBeaconConfig", in, out, opts...) if err != nil { @@ -5285,27 +5285,27 @@ type BeaconChainServer interface { ListAttestations(context.Context, *ListAttestationsRequest) (*ListAttestationsResponse, error) ListIndexedAttestations(context.Context, *ListIndexedAttestationsRequest) (*ListIndexedAttestationsResponse, error) // Deprecated: Do not use. - StreamAttestations(*empty.Empty, BeaconChain_StreamAttestationsServer) error + StreamAttestations(*emptypb.Empty, BeaconChain_StreamAttestationsServer) error // Deprecated: Do not use. - StreamIndexedAttestations(*empty.Empty, BeaconChain_StreamIndexedAttestationsServer) error + StreamIndexedAttestations(*emptypb.Empty, BeaconChain_StreamIndexedAttestationsServer) error AttestationPool(context.Context, *AttestationPoolRequest) (*AttestationPoolResponse, error) ListBeaconBlocks(context.Context, *ListBlocksRequest) (*ListBeaconBlocksResponse, error) // Deprecated: Do not use. StreamBlocks(*StreamBlocksRequest, BeaconChain_StreamBlocksServer) error // Deprecated: Do not use. - StreamChainHead(*empty.Empty, BeaconChain_StreamChainHeadServer) error + StreamChainHead(*emptypb.Empty, BeaconChain_StreamChainHeadServer) error // Deprecated: Do not use. - GetChainHead(context.Context, *empty.Empty) (*ChainHead, error) + GetChainHead(context.Context, *emptypb.Empty) (*ChainHead, error) ListBeaconCommittees(context.Context, *ListCommitteesRequest) (*BeaconCommittees, error) ListValidatorBalances(context.Context, *ListValidatorBalancesRequest) (*ValidatorBalances, error) ListValidators(context.Context, *ListValidatorsRequest) (*Validators, error) GetValidator(context.Context, *GetValidatorRequest) (*Validator, error) GetValidatorActiveSetChanges(context.Context, *GetValidatorActiveSetChangesRequest) (*ActiveSetChanges, error) - GetValidatorQueue(context.Context, *empty.Empty) (*ValidatorQueue, error) + GetValidatorQueue(context.Context, *emptypb.Empty) (*ValidatorQueue, error) GetValidatorPerformance(context.Context, *ValidatorPerformanceRequest) (*ValidatorPerformanceResponse, error) ListValidatorAssignments(context.Context, *ListValidatorAssignmentsRequest) (*ValidatorAssignments, error) GetValidatorParticipation(context.Context, *GetValidatorParticipationRequest) (*ValidatorParticipationResponse, error) - GetBeaconConfig(context.Context, *empty.Empty) (*BeaconConfig, error) + GetBeaconConfig(context.Context, *emptypb.Empty) (*BeaconConfig, error) // Deprecated: Do not use. StreamValidatorsInfo(BeaconChain_StreamValidatorsInfoServer) error SubmitAttesterSlashing(context.Context, *AttesterSlashing) (*SubmitSlashingResponse, error) @@ -5323,10 +5323,10 @@ func (*UnimplementedBeaconChainServer) ListAttestations(context.Context, *ListAt func (*UnimplementedBeaconChainServer) ListIndexedAttestations(context.Context, *ListIndexedAttestationsRequest) (*ListIndexedAttestationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListIndexedAttestations not implemented") } -func (*UnimplementedBeaconChainServer) StreamAttestations(*empty.Empty, BeaconChain_StreamAttestationsServer) error { +func (*UnimplementedBeaconChainServer) StreamAttestations(*emptypb.Empty, BeaconChain_StreamAttestationsServer) error { return status.Errorf(codes.Unimplemented, "method StreamAttestations not implemented") } -func (*UnimplementedBeaconChainServer) StreamIndexedAttestations(*empty.Empty, BeaconChain_StreamIndexedAttestationsServer) error { +func (*UnimplementedBeaconChainServer) StreamIndexedAttestations(*emptypb.Empty, BeaconChain_StreamIndexedAttestationsServer) error { return status.Errorf(codes.Unimplemented, "method StreamIndexedAttestations not implemented") } func (*UnimplementedBeaconChainServer) AttestationPool(context.Context, *AttestationPoolRequest) (*AttestationPoolResponse, error) { @@ -5338,10 +5338,10 @@ func (*UnimplementedBeaconChainServer) ListBeaconBlocks(context.Context, *ListBl func (*UnimplementedBeaconChainServer) StreamBlocks(*StreamBlocksRequest, BeaconChain_StreamBlocksServer) error { return status.Errorf(codes.Unimplemented, "method StreamBlocks not implemented") } -func (*UnimplementedBeaconChainServer) StreamChainHead(*empty.Empty, BeaconChain_StreamChainHeadServer) error { +func (*UnimplementedBeaconChainServer) StreamChainHead(*emptypb.Empty, BeaconChain_StreamChainHeadServer) error { return status.Errorf(codes.Unimplemented, "method StreamChainHead not implemented") } -func (*UnimplementedBeaconChainServer) GetChainHead(context.Context, *empty.Empty) (*ChainHead, error) { +func (*UnimplementedBeaconChainServer) GetChainHead(context.Context, *emptypb.Empty) (*ChainHead, error) { return nil, status.Errorf(codes.Unimplemented, "method GetChainHead not implemented") } func (*UnimplementedBeaconChainServer) ListBeaconCommittees(context.Context, *ListCommitteesRequest) (*BeaconCommittees, error) { @@ -5359,7 +5359,7 @@ func (*UnimplementedBeaconChainServer) GetValidator(context.Context, *GetValidat func (*UnimplementedBeaconChainServer) GetValidatorActiveSetChanges(context.Context, *GetValidatorActiveSetChangesRequest) (*ActiveSetChanges, error) { return nil, status.Errorf(codes.Unimplemented, "method GetValidatorActiveSetChanges not implemented") } -func (*UnimplementedBeaconChainServer) GetValidatorQueue(context.Context, *empty.Empty) (*ValidatorQueue, error) { +func (*UnimplementedBeaconChainServer) GetValidatorQueue(context.Context, *emptypb.Empty) (*ValidatorQueue, error) { return nil, status.Errorf(codes.Unimplemented, "method GetValidatorQueue not implemented") } func (*UnimplementedBeaconChainServer) GetValidatorPerformance(context.Context, *ValidatorPerformanceRequest) (*ValidatorPerformanceResponse, error) { @@ -5371,7 +5371,7 @@ func (*UnimplementedBeaconChainServer) ListValidatorAssignments(context.Context, func (*UnimplementedBeaconChainServer) GetValidatorParticipation(context.Context, *GetValidatorParticipationRequest) (*ValidatorParticipationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetValidatorParticipation not implemented") } -func (*UnimplementedBeaconChainServer) GetBeaconConfig(context.Context, *empty.Empty) (*BeaconConfig, error) { +func (*UnimplementedBeaconChainServer) GetBeaconConfig(context.Context, *emptypb.Empty) (*BeaconConfig, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBeaconConfig not implemented") } func (*UnimplementedBeaconChainServer) StreamValidatorsInfo(BeaconChain_StreamValidatorsInfoServer) error { @@ -5428,7 +5428,7 @@ func _BeaconChain_ListIndexedAttestations_Handler(srv interface{}, ctx context.C } func _BeaconChain_StreamAttestations_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -5449,7 +5449,7 @@ func (x *beaconChainStreamAttestationsServer) Send(m *Attestation) error { } func _BeaconChain_StreamIndexedAttestations_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -5527,7 +5527,7 @@ func (x *beaconChainStreamBlocksServer) Send(m *SignedBeaconBlock) error { } func _BeaconChain_StreamChainHead_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -5548,7 +5548,7 @@ func (x *beaconChainStreamChainHeadServer) Send(m *ChainHead) error { } func _BeaconChain_GetChainHead_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -5560,7 +5560,7 @@ func _BeaconChain_GetChainHead_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/ethereum.eth.v1alpha1.BeaconChain/GetChainHead", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetChainHead(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetChainHead(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -5656,7 +5656,7 @@ func _BeaconChain_GetValidatorActiveSetChanges_Handler(srv interface{}, ctx cont } func _BeaconChain_GetValidatorQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -5668,7 +5668,7 @@ func _BeaconChain_GetValidatorQueue_Handler(srv interface{}, ctx context.Context FullMethod: "/ethereum.eth.v1alpha1.BeaconChain/GetValidatorQueue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetValidatorQueue(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetValidatorQueue(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -5728,7 +5728,7 @@ func _BeaconChain_GetValidatorParticipation_Handler(srv interface{}, ctx context } func _BeaconChain_GetBeaconConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -5740,7 +5740,7 @@ func _BeaconChain_GetBeaconConfig_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.v1alpha1.BeaconChain/GetBeaconConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconChainServer).GetBeaconConfig(ctx, req.(*empty.Empty)) + return srv.(BeaconChainServer).GetBeaconConfig(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/beacon_state.pb.go b/proto/prysm/v1alpha1/beacon_state.pb.go index 04833b1d8eee..d0eae83dff16 100755 --- a/proto/prysm/v1alpha1/beacon_state.pb.go +++ b/proto/prysm/v1alpha1/beacon_state.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/beacon_state.proto package eth diff --git a/proto/prysm/v1alpha1/blobs.pb.go b/proto/prysm/v1alpha1/blobs.pb.go index e0dd64040ddb..b564e957c253 100755 --- a/proto/prysm/v1alpha1/blobs.pb.go +++ b/proto/prysm/v1alpha1/blobs.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/prysm/v1alpha1/blobs.proto diff --git a/proto/prysm/v1alpha1/debug.pb.go b/proto/prysm/v1alpha1/debug.pb.go index 573361103fc0..d40fc9c7645f 100755 --- a/proto/prysm/v1alpha1/debug.pb.go +++ b/proto/prysm/v1alpha1/debug.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/debug.proto package eth @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +19,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -1074,7 +1074,7 @@ var file_proto_prysm_v1alpha1_debug_proto_goTypes = []interface{}{ (*Status)(nil), // 15: ethereum.eth.v1alpha1.Status (*MetaDataV0)(nil), // 16: ethereum.eth.v1alpha1.MetaDataV0 (*MetaDataV1)(nil), // 17: ethereum.eth.v1alpha1.MetaDataV1 - (*empty.Empty)(nil), // 18: google.protobuf.Empty + (*emptypb.Empty)(nil), // 18: google.protobuf.Empty (*PeerRequest)(nil), // 19: ethereum.eth.v1alpha1.PeerRequest } var file_proto_prysm_v1alpha1_debug_proto_depIdxs = []int32{ @@ -1288,8 +1288,8 @@ const _ = grpc.SupportPackageIsVersion6 type DebugClient interface { GetBeaconState(ctx context.Context, in *BeaconStateRequest, opts ...grpc.CallOption) (*SSZResponse, error) GetBlock(ctx context.Context, in *BlockRequestByRoot, opts ...grpc.CallOption) (*SSZResponse, error) - SetLoggingLevel(ctx context.Context, in *LoggingLevelRequest, opts ...grpc.CallOption) (*empty.Empty, error) - ListPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*DebugPeerResponses, error) + SetLoggingLevel(ctx context.Context, in *LoggingLevelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + ListPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*DebugPeerResponses, error) GetPeer(ctx context.Context, in *PeerRequest, opts ...grpc.CallOption) (*DebugPeerResponse, error) // Deprecated: Do not use. GetInclusionSlot(ctx context.Context, in *InclusionSlotRequest, opts ...grpc.CallOption) (*InclusionSlotResponse, error) @@ -1321,8 +1321,8 @@ func (c *debugClient) GetBlock(ctx context.Context, in *BlockRequestByRoot, opts return out, nil } -func (c *debugClient) SetLoggingLevel(ctx context.Context, in *LoggingLevelRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *debugClient) SetLoggingLevel(ctx context.Context, in *LoggingLevelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Debug/SetLoggingLevel", in, out, opts...) if err != nil { return nil, err @@ -1330,7 +1330,7 @@ func (c *debugClient) SetLoggingLevel(ctx context.Context, in *LoggingLevelReque return out, nil } -func (c *debugClient) ListPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*DebugPeerResponses, error) { +func (c *debugClient) ListPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*DebugPeerResponses, error) { out := new(DebugPeerResponses) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Debug/ListPeers", in, out, opts...) if err != nil { @@ -1362,8 +1362,8 @@ func (c *debugClient) GetInclusionSlot(ctx context.Context, in *InclusionSlotReq type DebugServer interface { GetBeaconState(context.Context, *BeaconStateRequest) (*SSZResponse, error) GetBlock(context.Context, *BlockRequestByRoot) (*SSZResponse, error) - SetLoggingLevel(context.Context, *LoggingLevelRequest) (*empty.Empty, error) - ListPeers(context.Context, *empty.Empty) (*DebugPeerResponses, error) + SetLoggingLevel(context.Context, *LoggingLevelRequest) (*emptypb.Empty, error) + ListPeers(context.Context, *emptypb.Empty) (*DebugPeerResponses, error) GetPeer(context.Context, *PeerRequest) (*DebugPeerResponse, error) // Deprecated: Do not use. GetInclusionSlot(context.Context, *InclusionSlotRequest) (*InclusionSlotResponse, error) @@ -1379,10 +1379,10 @@ func (*UnimplementedDebugServer) GetBeaconState(context.Context, *BeaconStateReq func (*UnimplementedDebugServer) GetBlock(context.Context, *BlockRequestByRoot) (*SSZResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBlock not implemented") } -func (*UnimplementedDebugServer) SetLoggingLevel(context.Context, *LoggingLevelRequest) (*empty.Empty, error) { +func (*UnimplementedDebugServer) SetLoggingLevel(context.Context, *LoggingLevelRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SetLoggingLevel not implemented") } -func (*UnimplementedDebugServer) ListPeers(context.Context, *empty.Empty) (*DebugPeerResponses, error) { +func (*UnimplementedDebugServer) ListPeers(context.Context, *emptypb.Empty) (*DebugPeerResponses, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPeers not implemented") } func (*UnimplementedDebugServer) GetPeer(context.Context, *PeerRequest) (*DebugPeerResponse, error) { @@ -1451,7 +1451,7 @@ func _Debug_SetLoggingLevel_Handler(srv interface{}, ctx context.Context, dec fu } func _Debug_ListPeers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1463,7 +1463,7 @@ func _Debug_ListPeers_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/ethereum.eth.v1alpha1.Debug/ListPeers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(DebugServer).ListPeers(ctx, req.(*empty.Empty)) + return srv.(DebugServer).ListPeers(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/finalized_block_root_container.pb.go b/proto/prysm/v1alpha1/finalized_block_root_container.pb.go index 58ff028f9d2d..e6e0a4b7e5fd 100755 --- a/proto/prysm/v1alpha1/finalized_block_root_container.pb.go +++ b/proto/prysm/v1alpha1/finalized_block_root_container.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/finalized_block_root_container.proto package eth diff --git a/proto/prysm/v1alpha1/health.pb.go b/proto/prysm/v1alpha1/health.pb.go index e354b5937755..97812312ca51 100755 --- a/proto/prysm/v1alpha1/health.pb.go +++ b/proto/prysm/v1alpha1/health.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/health.proto package eth @@ -11,13 +11,13 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -123,8 +123,8 @@ func file_proto_prysm_v1alpha1_health_proto_rawDescGZIP() []byte { var file_proto_prysm_v1alpha1_health_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_proto_prysm_v1alpha1_health_proto_goTypes = []interface{}{ - (*LogsResponse)(nil), // 0: ethereum.eth.v1alpha1.LogsResponse - (*empty.Empty)(nil), // 1: google.protobuf.Empty + (*LogsResponse)(nil), // 0: ethereum.eth.v1alpha1.LogsResponse + (*emptypb.Empty)(nil), // 1: google.protobuf.Empty } var file_proto_prysm_v1alpha1_health_proto_depIdxs = []int32{ 1, // 0: ethereum.eth.v1alpha1.Health.StreamBeaconLogs:input_type -> google.protobuf.Empty @@ -188,7 +188,7 @@ const _ = grpc.SupportPackageIsVersion6 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type HealthClient interface { // Deprecated: Do not use. - StreamBeaconLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) + StreamBeaconLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) } type healthClient struct { @@ -200,7 +200,7 @@ func NewHealthClient(cc grpc.ClientConnInterface) HealthClient { } // Deprecated: Do not use. -func (c *healthClient) StreamBeaconLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) { +func (c *healthClient) StreamBeaconLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) { stream, err := c.cc.NewStream(ctx, &_Health_serviceDesc.Streams[0], "/ethereum.eth.v1alpha1.Health/StreamBeaconLogs", opts...) if err != nil { return nil, err @@ -235,14 +235,14 @@ func (x *healthStreamBeaconLogsClient) Recv() (*LogsResponse, error) { // HealthServer is the server API for Health service. type HealthServer interface { // Deprecated: Do not use. - StreamBeaconLogs(*empty.Empty, Health_StreamBeaconLogsServer) error + StreamBeaconLogs(*emptypb.Empty, Health_StreamBeaconLogsServer) error } // UnimplementedHealthServer can be embedded to have forward compatible implementations. type UnimplementedHealthServer struct { } -func (*UnimplementedHealthServer) StreamBeaconLogs(*empty.Empty, Health_StreamBeaconLogsServer) error { +func (*UnimplementedHealthServer) StreamBeaconLogs(*emptypb.Empty, Health_StreamBeaconLogsServer) error { return status.Errorf(codes.Unimplemented, "method StreamBeaconLogs not implemented") } @@ -251,7 +251,7 @@ func RegisterHealthServer(s *grpc.Server, srv HealthServer) { } func _Health_StreamBeaconLogs_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } diff --git a/proto/prysm/v1alpha1/node.pb.go b/proto/prysm/v1alpha1/node.pb.go index 5609aa59c203..470f291e8990 100755 --- a/proto/prysm/v1alpha1/node.pb.go +++ b/proto/prysm/v1alpha1/node.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/node.proto package eth @@ -11,8 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -20,6 +18,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" ) const ( @@ -182,9 +182,9 @@ type Genesis struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GenesisTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` - DepositContractAddress []byte `protobuf:"bytes,2,opt,name=deposit_contract_address,json=depositContractAddress,proto3" json:"deposit_contract_address,omitempty"` - GenesisValidatorsRoot []byte `protobuf:"bytes,3,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` + GenesisTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` + DepositContractAddress []byte `protobuf:"bytes,2,opt,name=deposit_contract_address,json=depositContractAddress,proto3" json:"deposit_contract_address,omitempty"` + GenesisValidatorsRoot []byte `protobuf:"bytes,3,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` } func (x *Genesis) Reset() { @@ -219,7 +219,7 @@ func (*Genesis) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_node_proto_rawDescGZIP(), []int{1} } -func (x *Genesis) GetGenesisTime() *timestamp.Timestamp { +func (x *Genesis) GetGenesisTime() *timestamppb.Timestamp { if x != nil { return x.GenesisTime } @@ -817,19 +817,19 @@ func file_proto_prysm_v1alpha1_node_proto_rawDescGZIP() []byte { var file_proto_prysm_v1alpha1_node_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_proto_prysm_v1alpha1_node_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_proto_prysm_v1alpha1_node_proto_goTypes = []interface{}{ - (PeerDirection)(0), // 0: ethereum.eth.v1alpha1.PeerDirection - (ConnectionState)(0), // 1: ethereum.eth.v1alpha1.ConnectionState - (*SyncStatus)(nil), // 2: ethereum.eth.v1alpha1.SyncStatus - (*Genesis)(nil), // 3: ethereum.eth.v1alpha1.Genesis - (*Version)(nil), // 4: ethereum.eth.v1alpha1.Version - (*ImplementedServices)(nil), // 5: ethereum.eth.v1alpha1.ImplementedServices - (*PeerRequest)(nil), // 6: ethereum.eth.v1alpha1.PeerRequest - (*Peers)(nil), // 7: ethereum.eth.v1alpha1.Peers - (*Peer)(nil), // 8: ethereum.eth.v1alpha1.Peer - (*HostData)(nil), // 9: ethereum.eth.v1alpha1.HostData - (*ETH1ConnectionStatus)(nil), // 10: ethereum.eth.v1alpha1.ETH1ConnectionStatus - (*timestamp.Timestamp)(nil), // 11: google.protobuf.Timestamp - (*empty.Empty)(nil), // 12: google.protobuf.Empty + (PeerDirection)(0), // 0: ethereum.eth.v1alpha1.PeerDirection + (ConnectionState)(0), // 1: ethereum.eth.v1alpha1.ConnectionState + (*SyncStatus)(nil), // 2: ethereum.eth.v1alpha1.SyncStatus + (*Genesis)(nil), // 3: ethereum.eth.v1alpha1.Genesis + (*Version)(nil), // 4: ethereum.eth.v1alpha1.Version + (*ImplementedServices)(nil), // 5: ethereum.eth.v1alpha1.ImplementedServices + (*PeerRequest)(nil), // 6: ethereum.eth.v1alpha1.PeerRequest + (*Peers)(nil), // 7: ethereum.eth.v1alpha1.Peers + (*Peer)(nil), // 8: ethereum.eth.v1alpha1.Peer + (*HostData)(nil), // 9: ethereum.eth.v1alpha1.HostData + (*ETH1ConnectionStatus)(nil), // 10: ethereum.eth.v1alpha1.ETH1ConnectionStatus + (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp + (*emptypb.Empty)(nil), // 12: google.protobuf.Empty } var file_proto_prysm_v1alpha1_node_proto_depIdxs = []int32{ 11, // 0: ethereum.eth.v1alpha1.Genesis.genesis_time:type_name -> google.protobuf.Timestamp @@ -1007,14 +1007,14 @@ const _ = grpc.SupportPackageIsVersion6 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type NodeClient interface { - GetSyncStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SyncStatus, error) - GetGenesis(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Genesis, error) - GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Version, error) - ListImplementedServices(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ImplementedServices, error) - GetHost(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*HostData, error) + GetSyncStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SyncStatus, error) + GetGenesis(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Genesis, error) + GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Version, error) + ListImplementedServices(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ImplementedServices, error) + GetHost(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*HostData, error) GetPeer(ctx context.Context, in *PeerRequest, opts ...grpc.CallOption) (*Peer, error) - ListPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Peers, error) - GetETH1ConnectionStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ETH1ConnectionStatus, error) + ListPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Peers, error) + GetETH1ConnectionStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ETH1ConnectionStatus, error) } type nodeClient struct { @@ -1025,7 +1025,7 @@ func NewNodeClient(cc grpc.ClientConnInterface) NodeClient { return &nodeClient{cc} } -func (c *nodeClient) GetSyncStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SyncStatus, error) { +func (c *nodeClient) GetSyncStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SyncStatus, error) { out := new(SyncStatus) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/GetSyncStatus", in, out, opts...) if err != nil { @@ -1034,7 +1034,7 @@ func (c *nodeClient) GetSyncStatus(ctx context.Context, in *empty.Empty, opts .. return out, nil } -func (c *nodeClient) GetGenesis(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Genesis, error) { +func (c *nodeClient) GetGenesis(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Genesis, error) { out := new(Genesis) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/GetGenesis", in, out, opts...) if err != nil { @@ -1043,7 +1043,7 @@ func (c *nodeClient) GetGenesis(ctx context.Context, in *empty.Empty, opts ...gr return out, nil } -func (c *nodeClient) GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Version, error) { +func (c *nodeClient) GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Version, error) { out := new(Version) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/GetVersion", in, out, opts...) if err != nil { @@ -1052,7 +1052,7 @@ func (c *nodeClient) GetVersion(ctx context.Context, in *empty.Empty, opts ...gr return out, nil } -func (c *nodeClient) ListImplementedServices(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ImplementedServices, error) { +func (c *nodeClient) ListImplementedServices(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ImplementedServices, error) { out := new(ImplementedServices) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/ListImplementedServices", in, out, opts...) if err != nil { @@ -1061,7 +1061,7 @@ func (c *nodeClient) ListImplementedServices(ctx context.Context, in *empty.Empt return out, nil } -func (c *nodeClient) GetHost(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*HostData, error) { +func (c *nodeClient) GetHost(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*HostData, error) { out := new(HostData) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/GetHost", in, out, opts...) if err != nil { @@ -1079,7 +1079,7 @@ func (c *nodeClient) GetPeer(ctx context.Context, in *PeerRequest, opts ...grpc. return out, nil } -func (c *nodeClient) ListPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*Peers, error) { +func (c *nodeClient) ListPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*Peers, error) { out := new(Peers) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/ListPeers", in, out, opts...) if err != nil { @@ -1088,7 +1088,7 @@ func (c *nodeClient) ListPeers(ctx context.Context, in *empty.Empty, opts ...grp return out, nil } -func (c *nodeClient) GetETH1ConnectionStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ETH1ConnectionStatus, error) { +func (c *nodeClient) GetETH1ConnectionStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ETH1ConnectionStatus, error) { out := new(ETH1ConnectionStatus) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.Node/GetETH1ConnectionStatus", in, out, opts...) if err != nil { @@ -1099,42 +1099,42 @@ func (c *nodeClient) GetETH1ConnectionStatus(ctx context.Context, in *empty.Empt // NodeServer is the server API for Node service. type NodeServer interface { - GetSyncStatus(context.Context, *empty.Empty) (*SyncStatus, error) - GetGenesis(context.Context, *empty.Empty) (*Genesis, error) - GetVersion(context.Context, *empty.Empty) (*Version, error) - ListImplementedServices(context.Context, *empty.Empty) (*ImplementedServices, error) - GetHost(context.Context, *empty.Empty) (*HostData, error) + GetSyncStatus(context.Context, *emptypb.Empty) (*SyncStatus, error) + GetGenesis(context.Context, *emptypb.Empty) (*Genesis, error) + GetVersion(context.Context, *emptypb.Empty) (*Version, error) + ListImplementedServices(context.Context, *emptypb.Empty) (*ImplementedServices, error) + GetHost(context.Context, *emptypb.Empty) (*HostData, error) GetPeer(context.Context, *PeerRequest) (*Peer, error) - ListPeers(context.Context, *empty.Empty) (*Peers, error) - GetETH1ConnectionStatus(context.Context, *empty.Empty) (*ETH1ConnectionStatus, error) + ListPeers(context.Context, *emptypb.Empty) (*Peers, error) + GetETH1ConnectionStatus(context.Context, *emptypb.Empty) (*ETH1ConnectionStatus, error) } // UnimplementedNodeServer can be embedded to have forward compatible implementations. type UnimplementedNodeServer struct { } -func (*UnimplementedNodeServer) GetSyncStatus(context.Context, *empty.Empty) (*SyncStatus, error) { +func (*UnimplementedNodeServer) GetSyncStatus(context.Context, *emptypb.Empty) (*SyncStatus, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSyncStatus not implemented") } -func (*UnimplementedNodeServer) GetGenesis(context.Context, *empty.Empty) (*Genesis, error) { +func (*UnimplementedNodeServer) GetGenesis(context.Context, *emptypb.Empty) (*Genesis, error) { return nil, status.Errorf(codes.Unimplemented, "method GetGenesis not implemented") } -func (*UnimplementedNodeServer) GetVersion(context.Context, *empty.Empty) (*Version, error) { +func (*UnimplementedNodeServer) GetVersion(context.Context, *emptypb.Empty) (*Version, error) { return nil, status.Errorf(codes.Unimplemented, "method GetVersion not implemented") } -func (*UnimplementedNodeServer) ListImplementedServices(context.Context, *empty.Empty) (*ImplementedServices, error) { +func (*UnimplementedNodeServer) ListImplementedServices(context.Context, *emptypb.Empty) (*ImplementedServices, error) { return nil, status.Errorf(codes.Unimplemented, "method ListImplementedServices not implemented") } -func (*UnimplementedNodeServer) GetHost(context.Context, *empty.Empty) (*HostData, error) { +func (*UnimplementedNodeServer) GetHost(context.Context, *emptypb.Empty) (*HostData, error) { return nil, status.Errorf(codes.Unimplemented, "method GetHost not implemented") } func (*UnimplementedNodeServer) GetPeer(context.Context, *PeerRequest) (*Peer, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPeer not implemented") } -func (*UnimplementedNodeServer) ListPeers(context.Context, *empty.Empty) (*Peers, error) { +func (*UnimplementedNodeServer) ListPeers(context.Context, *emptypb.Empty) (*Peers, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPeers not implemented") } -func (*UnimplementedNodeServer) GetETH1ConnectionStatus(context.Context, *empty.Empty) (*ETH1ConnectionStatus, error) { +func (*UnimplementedNodeServer) GetETH1ConnectionStatus(context.Context, *emptypb.Empty) (*ETH1ConnectionStatus, error) { return nil, status.Errorf(codes.Unimplemented, "method GetETH1ConnectionStatus not implemented") } @@ -1143,7 +1143,7 @@ func RegisterNodeServer(s *grpc.Server, srv NodeServer) { } func _Node_GetSyncStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1155,13 +1155,13 @@ func _Node_GetSyncStatus_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: "/ethereum.eth.v1alpha1.Node/GetSyncStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).GetSyncStatus(ctx, req.(*empty.Empty)) + return srv.(NodeServer).GetSyncStatus(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Node_GetGenesis_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1173,13 +1173,13 @@ func _Node_GetGenesis_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/ethereum.eth.v1alpha1.Node/GetGenesis", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).GetGenesis(ctx, req.(*empty.Empty)) + return srv.(NodeServer).GetGenesis(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Node_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1191,13 +1191,13 @@ func _Node_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/ethereum.eth.v1alpha1.Node/GetVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).GetVersion(ctx, req.(*empty.Empty)) + return srv.(NodeServer).GetVersion(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Node_ListImplementedServices_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1209,13 +1209,13 @@ func _Node_ListImplementedServices_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.v1alpha1.Node/ListImplementedServices", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).ListImplementedServices(ctx, req.(*empty.Empty)) + return srv.(NodeServer).ListImplementedServices(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Node_GetHost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1227,7 +1227,7 @@ func _Node_GetHost_Handler(srv interface{}, ctx context.Context, dec func(interf FullMethod: "/ethereum.eth.v1alpha1.Node/GetHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).GetHost(ctx, req.(*empty.Empty)) + return srv.(NodeServer).GetHost(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -1251,7 +1251,7 @@ func _Node_GetPeer_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Node_ListPeers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1263,13 +1263,13 @@ func _Node_ListPeers_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/ethereum.eth.v1alpha1.Node/ListPeers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).ListPeers(ctx, req.(*empty.Empty)) + return srv.(NodeServer).ListPeers(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Node_GetETH1ConnectionStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1281,7 +1281,7 @@ func _Node_GetETH1ConnectionStatus_Handler(srv interface{}, ctx context.Context, FullMethod: "/ethereum.eth.v1alpha1.Node/GetETH1ConnectionStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(NodeServer).GetETH1ConnectionStatus(ctx, req.(*empty.Empty)) + return srv.(NodeServer).GetETH1ConnectionStatus(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/p2p_messages.pb.go b/proto/prysm/v1alpha1/p2p_messages.pb.go index 20525238386e..686ba831a69d 100755 --- a/proto/prysm/v1alpha1/p2p_messages.pb.go +++ b/proto/prysm/v1alpha1/p2p_messages.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/p2p_messages.proto package eth @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" ) const ( diff --git a/proto/prysm/v1alpha1/powchain.pb.go b/proto/prysm/v1alpha1/powchain.pb.go index 111c8e206854..6ac28a60a2b9 100755 --- a/proto/prysm/v1alpha1/powchain.pb.go +++ b/proto/prysm/v1alpha1/powchain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/powchain.proto package eth diff --git a/proto/prysm/v1alpha1/slasher.pb.go b/proto/prysm/v1alpha1/slasher.pb.go index 6c86aa862626..a0cd280a3456 100755 --- a/proto/prysm/v1alpha1/slasher.pb.go +++ b/proto/prysm/v1alpha1/slasher.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v4.23.3 // source: proto/prysm/v1alpha1/slasher.proto diff --git a/proto/prysm/v1alpha1/sync_committee.pb.go b/proto/prysm/v1alpha1/sync_committee.pb.go index 69a9f32b3283..8f654d9b6970 100755 --- a/proto/prysm/v1alpha1/sync_committee.pb.go +++ b/proto/prysm/v1alpha1/sync_committee.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/sync_committee.proto package eth diff --git a/proto/prysm/v1alpha1/validator-client/BUILD.bazel b/proto/prysm/v1alpha1/validator-client/BUILD.bazel index 3b30e118bdf2..8f95e1ba7797 100644 --- a/proto/prysm/v1alpha1/validator-client/BUILD.bazel +++ b/proto/prysm/v1alpha1/validator-client/BUILD.bazel @@ -31,7 +31,7 @@ proto_library( "@com_google_protobuf//:descriptor_proto", "@com_google_protobuf//:empty_proto", "@com_google_protobuf//:timestamp_proto", - "@go_googleapis//google/api:annotations_proto", + "@googleapis//google/api:annotations_proto", ], ) @@ -55,9 +55,10 @@ go_proto_library( "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "//consensus-types/primitives:go_default_library", "//consensus-types/validator:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", + "@org_golang_google_protobuf//types/known/emptypb:go_default_library", ], ) @@ -76,7 +77,7 @@ go_proto_library( "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@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", + "@googleapis//google/api:annotations_go_proto", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", ], @@ -107,7 +108,7 @@ go_library( "@com_github_golang_protobuf//proto:go_default_library", "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", # keep - "@go_googleapis//google/api:annotations_go_proto", + "@googleapis//google/api:annotations_go_proto", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-openapiv2/options:options_go_proto", diff --git a/proto/prysm/v1alpha1/validator-client/keymanager.pb.go b/proto/prysm/v1alpha1/validator-client/keymanager.pb.go index e2baffdaee83..dd9bc7b8b0a5 100755 --- a/proto/prysm/v1alpha1/validator-client/keymanager.pb.go +++ b/proto/prysm/v1alpha1/validator-client/keymanager.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/validator-client/keymanager.proto package validatorpb @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" github_com_prysmaticlabs_prysm_v4_consensus_types_validator "github.com/prysmaticlabs/prysm/v4/consensus-types/validator" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" @@ -22,6 +21,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -987,7 +987,7 @@ var file_proto_prysm_v1alpha1_validator_client_keymanager_proto_goTypes = []inte (*v1alpha1.BlindedBeaconBlockDeneb)(nil), // 21: ethereum.eth.v1alpha1.BlindedBeaconBlockDeneb (*v1alpha1.BlobSidecar)(nil), // 22: ethereum.eth.v1alpha1.BlobSidecar (*v1alpha1.BlindedBlobSidecar)(nil), // 23: ethereum.eth.v1alpha1.BlindedBlobSidecar - (*empty.Empty)(nil), // 24: google.protobuf.Empty + (*emptypb.Empty)(nil), // 24: google.protobuf.Empty } var file_proto_prysm_v1alpha1_validator_client_keymanager_proto_depIdxs = []int32{ 8, // 0: ethereum.validator.accounts.v2.SignRequest.block:type_name -> ethereum.eth.v1alpha1.BeaconBlock @@ -1155,7 +1155,7 @@ const _ = grpc.SupportPackageIsVersion6 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type RemoteSignerClient interface { - ListValidatingPublicKeys(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListPublicKeysResponse, error) + ListValidatingPublicKeys(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListPublicKeysResponse, error) Sign(ctx context.Context, in *SignRequest, opts ...grpc.CallOption) (*SignResponse, error) } @@ -1167,7 +1167,7 @@ func NewRemoteSignerClient(cc grpc.ClientConnInterface) RemoteSignerClient { return &remoteSignerClient{cc} } -func (c *remoteSignerClient) ListValidatingPublicKeys(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListPublicKeysResponse, error) { +func (c *remoteSignerClient) ListValidatingPublicKeys(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListPublicKeysResponse, error) { out := new(ListPublicKeysResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.RemoteSigner/ListValidatingPublicKeys", in, out, opts...) if err != nil { @@ -1187,7 +1187,7 @@ func (c *remoteSignerClient) Sign(ctx context.Context, in *SignRequest, opts ... // RemoteSignerServer is the server API for RemoteSigner service. type RemoteSignerServer interface { - ListValidatingPublicKeys(context.Context, *empty.Empty) (*ListPublicKeysResponse, error) + ListValidatingPublicKeys(context.Context, *emptypb.Empty) (*ListPublicKeysResponse, error) Sign(context.Context, *SignRequest) (*SignResponse, error) } @@ -1195,7 +1195,7 @@ type RemoteSignerServer interface { type UnimplementedRemoteSignerServer struct { } -func (*UnimplementedRemoteSignerServer) ListValidatingPublicKeys(context.Context, *empty.Empty) (*ListPublicKeysResponse, error) { +func (*UnimplementedRemoteSignerServer) ListValidatingPublicKeys(context.Context, *emptypb.Empty) (*ListPublicKeysResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListValidatingPublicKeys not implemented") } func (*UnimplementedRemoteSignerServer) Sign(context.Context, *SignRequest) (*SignResponse, error) { @@ -1207,7 +1207,7 @@ func RegisterRemoteSignerServer(s *grpc.Server, srv RemoteSignerServer) { } func _RemoteSigner_ListValidatingPublicKeys_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -1219,7 +1219,7 @@ func _RemoteSigner_ListValidatingPublicKeys_Handler(srv interface{}, ctx context FullMethod: "/ethereum.validator.accounts.v2.RemoteSigner/ListValidatingPublicKeys", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RemoteSignerServer).ListValidatingPublicKeys(ctx, req.(*empty.Empty)) + return srv.(RemoteSignerServer).ListValidatingPublicKeys(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/validator-client/web_api.pb.go b/proto/prysm/v1alpha1/validator-client/web_api.pb.go index 529a39ad2bb8..fec57ef0ee3e 100755 --- a/proto/prysm/v1alpha1/validator-client/web_api.pb.go +++ b/proto/prysm/v1alpha1/validator-client/web_api.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/validator-client/web_api.proto package validatorpb @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -19,6 +18,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -2264,7 +2264,7 @@ var file_proto_prysm_v1alpha1_validator_client_web_api_proto_goTypes = []interfa (*ExportSlashingProtectionResponse)(nil), // 27: ethereum.validator.accounts.v2.ExportSlashingProtectionResponse (*ImportSlashingProtectionRequest)(nil), // 28: ethereum.validator.accounts.v2.ImportSlashingProtectionRequest (*v1alpha1.ChainHead)(nil), // 29: ethereum.eth.v1alpha1.ChainHead - (*empty.Empty)(nil), // 30: google.protobuf.Empty + (*emptypb.Empty)(nil), // 30: google.protobuf.Empty (*v1alpha1.GetValidatorParticipationRequest)(nil), // 31: ethereum.eth.v1alpha1.GetValidatorParticipationRequest (*v1alpha1.ValidatorPerformanceRequest)(nil), // 32: ethereum.eth.v1alpha1.ValidatorPerformanceRequest (*v1alpha1.ListValidatorsRequest)(nil), // 33: ethereum.eth.v1alpha1.ListValidatorsRequest @@ -2713,9 +2713,9 @@ type WalletClient interface { // Deprecated: Do not use. CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) // Deprecated: Do not use. - WalletConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*WalletResponse, error) + WalletConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*WalletResponse, error) // Deprecated: Do not use. - ValidateKeystores(ctx context.Context, in *ValidateKeystoresRequest, opts ...grpc.CallOption) (*empty.Empty, error) + ValidateKeystores(ctx context.Context, in *ValidateKeystoresRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) // Deprecated: Do not use. RecoverWallet(ctx context.Context, in *RecoverWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) } @@ -2739,7 +2739,7 @@ func (c *walletClient) CreateWallet(ctx context.Context, in *CreateWalletRequest } // Deprecated: Do not use. -func (c *walletClient) WalletConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*WalletResponse, error) { +func (c *walletClient) WalletConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*WalletResponse, error) { out := new(WalletResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Wallet/WalletConfig", in, out, opts...) if err != nil { @@ -2749,8 +2749,8 @@ func (c *walletClient) WalletConfig(ctx context.Context, in *empty.Empty, opts . } // Deprecated: Do not use. -func (c *walletClient) ValidateKeystores(ctx context.Context, in *ValidateKeystoresRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *walletClient) ValidateKeystores(ctx context.Context, in *ValidateKeystoresRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Wallet/ValidateKeystores", in, out, opts...) if err != nil { return nil, err @@ -2773,9 +2773,9 @@ type WalletServer interface { // Deprecated: Do not use. CreateWallet(context.Context, *CreateWalletRequest) (*CreateWalletResponse, error) // Deprecated: Do not use. - WalletConfig(context.Context, *empty.Empty) (*WalletResponse, error) + WalletConfig(context.Context, *emptypb.Empty) (*WalletResponse, error) // Deprecated: Do not use. - ValidateKeystores(context.Context, *ValidateKeystoresRequest) (*empty.Empty, error) + ValidateKeystores(context.Context, *ValidateKeystoresRequest) (*emptypb.Empty, error) // Deprecated: Do not use. RecoverWallet(context.Context, *RecoverWalletRequest) (*CreateWalletResponse, error) } @@ -2787,10 +2787,10 @@ type UnimplementedWalletServer struct { func (*UnimplementedWalletServer) CreateWallet(context.Context, *CreateWalletRequest) (*CreateWalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateWallet not implemented") } -func (*UnimplementedWalletServer) WalletConfig(context.Context, *empty.Empty) (*WalletResponse, error) { +func (*UnimplementedWalletServer) WalletConfig(context.Context, *emptypb.Empty) (*WalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method WalletConfig not implemented") } -func (*UnimplementedWalletServer) ValidateKeystores(context.Context, *ValidateKeystoresRequest) (*empty.Empty, error) { +func (*UnimplementedWalletServer) ValidateKeystores(context.Context, *ValidateKeystoresRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ValidateKeystores not implemented") } func (*UnimplementedWalletServer) RecoverWallet(context.Context, *RecoverWalletRequest) (*CreateWalletResponse, error) { @@ -2820,7 +2820,7 @@ func _Wallet_CreateWallet_Handler(srv interface{}, ctx context.Context, dec func } func _Wallet_WalletConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -2832,7 +2832,7 @@ func _Wallet_WalletConfig_Handler(srv interface{}, ctx context.Context, dec func FullMethod: "/ethereum.validator.accounts.v2.Wallet/WalletConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(WalletServer).WalletConfig(ctx, req.(*empty.Empty)) + return srv.(WalletServer).WalletConfig(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -3056,7 +3056,7 @@ var _Accounts_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type BeaconClient interface { // Deprecated: Do not use. - GetBeaconStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*BeaconStatusResponse, error) + GetBeaconStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*BeaconStatusResponse, error) // Deprecated: Do not use. GetValidatorParticipation(ctx context.Context, in *v1alpha1.GetValidatorParticipationRequest, opts ...grpc.CallOption) (*v1alpha1.ValidatorParticipationResponse, error) // Deprecated: Do not use. @@ -3066,9 +3066,9 @@ type BeaconClient interface { // Deprecated: Do not use. GetValidatorBalances(ctx context.Context, in *v1alpha1.ListValidatorBalancesRequest, opts ...grpc.CallOption) (*v1alpha1.ValidatorBalances, error) // Deprecated: Do not use. - GetValidatorQueue(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1alpha1.ValidatorQueue, error) + GetValidatorQueue(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1alpha1.ValidatorQueue, error) // Deprecated: Do not use. - GetPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1alpha1.Peers, error) + GetPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1alpha1.Peers, error) } type beaconClient struct { @@ -3080,7 +3080,7 @@ func NewBeaconClient(cc grpc.ClientConnInterface) BeaconClient { } // Deprecated: Do not use. -func (c *beaconClient) GetBeaconStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*BeaconStatusResponse, error) { +func (c *beaconClient) GetBeaconStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*BeaconStatusResponse, error) { out := new(BeaconStatusResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Beacon/GetBeaconStatus", in, out, opts...) if err != nil { @@ -3130,7 +3130,7 @@ func (c *beaconClient) GetValidatorBalances(ctx context.Context, in *v1alpha1.Li } // Deprecated: Do not use. -func (c *beaconClient) GetValidatorQueue(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1alpha1.ValidatorQueue, error) { +func (c *beaconClient) GetValidatorQueue(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1alpha1.ValidatorQueue, error) { out := new(v1alpha1.ValidatorQueue) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Beacon/GetValidatorQueue", in, out, opts...) if err != nil { @@ -3140,7 +3140,7 @@ func (c *beaconClient) GetValidatorQueue(ctx context.Context, in *empty.Empty, o } // Deprecated: Do not use. -func (c *beaconClient) GetPeers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*v1alpha1.Peers, error) { +func (c *beaconClient) GetPeers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*v1alpha1.Peers, error) { out := new(v1alpha1.Peers) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Beacon/GetPeers", in, out, opts...) if err != nil { @@ -3152,7 +3152,7 @@ func (c *beaconClient) GetPeers(ctx context.Context, in *empty.Empty, opts ...gr // BeaconServer is the server API for Beacon service. type BeaconServer interface { // Deprecated: Do not use. - GetBeaconStatus(context.Context, *empty.Empty) (*BeaconStatusResponse, error) + GetBeaconStatus(context.Context, *emptypb.Empty) (*BeaconStatusResponse, error) // Deprecated: Do not use. GetValidatorParticipation(context.Context, *v1alpha1.GetValidatorParticipationRequest) (*v1alpha1.ValidatorParticipationResponse, error) // Deprecated: Do not use. @@ -3162,16 +3162,16 @@ type BeaconServer interface { // Deprecated: Do not use. GetValidatorBalances(context.Context, *v1alpha1.ListValidatorBalancesRequest) (*v1alpha1.ValidatorBalances, error) // Deprecated: Do not use. - GetValidatorQueue(context.Context, *empty.Empty) (*v1alpha1.ValidatorQueue, error) + GetValidatorQueue(context.Context, *emptypb.Empty) (*v1alpha1.ValidatorQueue, error) // Deprecated: Do not use. - GetPeers(context.Context, *empty.Empty) (*v1alpha1.Peers, error) + GetPeers(context.Context, *emptypb.Empty) (*v1alpha1.Peers, error) } // UnimplementedBeaconServer can be embedded to have forward compatible implementations. type UnimplementedBeaconServer struct { } -func (*UnimplementedBeaconServer) GetBeaconStatus(context.Context, *empty.Empty) (*BeaconStatusResponse, error) { +func (*UnimplementedBeaconServer) GetBeaconStatus(context.Context, *emptypb.Empty) (*BeaconStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBeaconStatus not implemented") } func (*UnimplementedBeaconServer) GetValidatorParticipation(context.Context, *v1alpha1.GetValidatorParticipationRequest) (*v1alpha1.ValidatorParticipationResponse, error) { @@ -3186,10 +3186,10 @@ func (*UnimplementedBeaconServer) GetValidators(context.Context, *v1alpha1.ListV func (*UnimplementedBeaconServer) GetValidatorBalances(context.Context, *v1alpha1.ListValidatorBalancesRequest) (*v1alpha1.ValidatorBalances, error) { return nil, status.Errorf(codes.Unimplemented, "method GetValidatorBalances not implemented") } -func (*UnimplementedBeaconServer) GetValidatorQueue(context.Context, *empty.Empty) (*v1alpha1.ValidatorQueue, error) { +func (*UnimplementedBeaconServer) GetValidatorQueue(context.Context, *emptypb.Empty) (*v1alpha1.ValidatorQueue, error) { return nil, status.Errorf(codes.Unimplemented, "method GetValidatorQueue not implemented") } -func (*UnimplementedBeaconServer) GetPeers(context.Context, *empty.Empty) (*v1alpha1.Peers, error) { +func (*UnimplementedBeaconServer) GetPeers(context.Context, *emptypb.Empty) (*v1alpha1.Peers, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPeers not implemented") } @@ -3198,7 +3198,7 @@ func RegisterBeaconServer(s *grpc.Server, srv BeaconServer) { } func _Beacon_GetBeaconStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3210,7 +3210,7 @@ func _Beacon_GetBeaconStatus_Handler(srv interface{}, ctx context.Context, dec f FullMethod: "/ethereum.validator.accounts.v2.Beacon/GetBeaconStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconServer).GetBeaconStatus(ctx, req.(*empty.Empty)) + return srv.(BeaconServer).GetBeaconStatus(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -3288,7 +3288,7 @@ func _Beacon_GetValidatorBalances_Handler(srv interface{}, ctx context.Context, } func _Beacon_GetValidatorQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3300,13 +3300,13 @@ func _Beacon_GetValidatorQueue_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/ethereum.validator.accounts.v2.Beacon/GetValidatorQueue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconServer).GetValidatorQueue(ctx, req.(*empty.Empty)) + return srv.(BeaconServer).GetValidatorQueue(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Beacon_GetPeers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3318,7 +3318,7 @@ func _Beacon_GetPeers_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/ethereum.validator.accounts.v2.Beacon/GetPeers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconServer).GetPeers(ctx, req.(*empty.Empty)) + return srv.(BeaconServer).GetPeers(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -3365,9 +3365,9 @@ var _Beacon_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type SlashingProtectionClient interface { // Deprecated: Do not use. - ExportSlashingProtection(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ExportSlashingProtectionResponse, error) + ExportSlashingProtection(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ExportSlashingProtectionResponse, error) // Deprecated: Do not use. - ImportSlashingProtection(ctx context.Context, in *ImportSlashingProtectionRequest, opts ...grpc.CallOption) (*empty.Empty, error) + ImportSlashingProtection(ctx context.Context, in *ImportSlashingProtectionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type slashingProtectionClient struct { @@ -3379,7 +3379,7 @@ func NewSlashingProtectionClient(cc grpc.ClientConnInterface) SlashingProtection } // Deprecated: Do not use. -func (c *slashingProtectionClient) ExportSlashingProtection(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ExportSlashingProtectionResponse, error) { +func (c *slashingProtectionClient) ExportSlashingProtection(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ExportSlashingProtectionResponse, error) { out := new(ExportSlashingProtectionResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.SlashingProtection/ExportSlashingProtection", in, out, opts...) if err != nil { @@ -3389,8 +3389,8 @@ func (c *slashingProtectionClient) ExportSlashingProtection(ctx context.Context, } // Deprecated: Do not use. -func (c *slashingProtectionClient) ImportSlashingProtection(ctx context.Context, in *ImportSlashingProtectionRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *slashingProtectionClient) ImportSlashingProtection(ctx context.Context, in *ImportSlashingProtectionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.SlashingProtection/ImportSlashingProtection", in, out, opts...) if err != nil { return nil, err @@ -3401,19 +3401,19 @@ func (c *slashingProtectionClient) ImportSlashingProtection(ctx context.Context, // SlashingProtectionServer is the server API for SlashingProtection service. type SlashingProtectionServer interface { // Deprecated: Do not use. - ExportSlashingProtection(context.Context, *empty.Empty) (*ExportSlashingProtectionResponse, error) + ExportSlashingProtection(context.Context, *emptypb.Empty) (*ExportSlashingProtectionResponse, error) // Deprecated: Do not use. - ImportSlashingProtection(context.Context, *ImportSlashingProtectionRequest) (*empty.Empty, error) + ImportSlashingProtection(context.Context, *ImportSlashingProtectionRequest) (*emptypb.Empty, error) } // UnimplementedSlashingProtectionServer can be embedded to have forward compatible implementations. type UnimplementedSlashingProtectionServer struct { } -func (*UnimplementedSlashingProtectionServer) ExportSlashingProtection(context.Context, *empty.Empty) (*ExportSlashingProtectionResponse, error) { +func (*UnimplementedSlashingProtectionServer) ExportSlashingProtection(context.Context, *emptypb.Empty) (*ExportSlashingProtectionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ExportSlashingProtection not implemented") } -func (*UnimplementedSlashingProtectionServer) ImportSlashingProtection(context.Context, *ImportSlashingProtectionRequest) (*empty.Empty, error) { +func (*UnimplementedSlashingProtectionServer) ImportSlashingProtection(context.Context, *ImportSlashingProtectionRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ImportSlashingProtection not implemented") } @@ -3422,7 +3422,7 @@ func RegisterSlashingProtectionServer(s *grpc.Server, srv SlashingProtectionServ } func _SlashingProtection_ExportSlashingProtection_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3434,7 +3434,7 @@ func _SlashingProtection_ExportSlashingProtection_Handler(srv interface{}, ctx c FullMethod: "/ethereum.validator.accounts.v2.SlashingProtection/ExportSlashingProtection", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SlashingProtectionServer).ExportSlashingProtection(ctx, req.(*empty.Empty)) + return srv.(SlashingProtectionServer).ExportSlashingProtection(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -3479,15 +3479,15 @@ var _SlashingProtection_serviceDesc = grpc.ServiceDesc{ // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type HealthClient interface { // Deprecated: Do not use. - GetBeaconNodeConnection(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NodeConnectionResponse, error) + GetBeaconNodeConnection(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NodeConnectionResponse, error) // Deprecated: Do not use. - GetLogsEndpoints(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*LogsEndpointResponse, error) + GetLogsEndpoints(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*LogsEndpointResponse, error) // Deprecated: Do not use. - GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*VersionResponse, error) + GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*VersionResponse, error) // Deprecated: Do not use. - StreamBeaconLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) + StreamBeaconLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) // Deprecated: Do not use. - StreamValidatorLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamValidatorLogsClient, error) + StreamValidatorLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamValidatorLogsClient, error) } type healthClient struct { @@ -3499,7 +3499,7 @@ func NewHealthClient(cc grpc.ClientConnInterface) HealthClient { } // Deprecated: Do not use. -func (c *healthClient) GetBeaconNodeConnection(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NodeConnectionResponse, error) { +func (c *healthClient) GetBeaconNodeConnection(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NodeConnectionResponse, error) { out := new(NodeConnectionResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Health/GetBeaconNodeConnection", in, out, opts...) if err != nil { @@ -3509,7 +3509,7 @@ func (c *healthClient) GetBeaconNodeConnection(ctx context.Context, in *empty.Em } // Deprecated: Do not use. -func (c *healthClient) GetLogsEndpoints(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*LogsEndpointResponse, error) { +func (c *healthClient) GetLogsEndpoints(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*LogsEndpointResponse, error) { out := new(LogsEndpointResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Health/GetLogsEndpoints", in, out, opts...) if err != nil { @@ -3519,7 +3519,7 @@ func (c *healthClient) GetLogsEndpoints(ctx context.Context, in *empty.Empty, op } // Deprecated: Do not use. -func (c *healthClient) GetVersion(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*VersionResponse, error) { +func (c *healthClient) GetVersion(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*VersionResponse, error) { out := new(VersionResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Health/GetVersion", in, out, opts...) if err != nil { @@ -3529,7 +3529,7 @@ func (c *healthClient) GetVersion(ctx context.Context, in *empty.Empty, opts ... } // Deprecated: Do not use. -func (c *healthClient) StreamBeaconLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) { +func (c *healthClient) StreamBeaconLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamBeaconLogsClient, error) { stream, err := c.cc.NewStream(ctx, &_Health_serviceDesc.Streams[0], "/ethereum.validator.accounts.v2.Health/StreamBeaconLogs", opts...) if err != nil { return nil, err @@ -3562,7 +3562,7 @@ func (x *healthStreamBeaconLogsClient) Recv() (*v1alpha1.LogsResponse, error) { } // Deprecated: Do not use. -func (c *healthClient) StreamValidatorLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Health_StreamValidatorLogsClient, error) { +func (c *healthClient) StreamValidatorLogs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Health_StreamValidatorLogsClient, error) { stream, err := c.cc.NewStream(ctx, &_Health_serviceDesc.Streams[1], "/ethereum.validator.accounts.v2.Health/StreamValidatorLogs", opts...) if err != nil { return nil, err @@ -3597,34 +3597,34 @@ func (x *healthStreamValidatorLogsClient) Recv() (*v1alpha1.LogsResponse, error) // HealthServer is the server API for Health service. type HealthServer interface { // Deprecated: Do not use. - GetBeaconNodeConnection(context.Context, *empty.Empty) (*NodeConnectionResponse, error) + GetBeaconNodeConnection(context.Context, *emptypb.Empty) (*NodeConnectionResponse, error) // Deprecated: Do not use. - GetLogsEndpoints(context.Context, *empty.Empty) (*LogsEndpointResponse, error) + GetLogsEndpoints(context.Context, *emptypb.Empty) (*LogsEndpointResponse, error) // Deprecated: Do not use. - GetVersion(context.Context, *empty.Empty) (*VersionResponse, error) + GetVersion(context.Context, *emptypb.Empty) (*VersionResponse, error) // Deprecated: Do not use. - StreamBeaconLogs(*empty.Empty, Health_StreamBeaconLogsServer) error + StreamBeaconLogs(*emptypb.Empty, Health_StreamBeaconLogsServer) error // Deprecated: Do not use. - StreamValidatorLogs(*empty.Empty, Health_StreamValidatorLogsServer) error + StreamValidatorLogs(*emptypb.Empty, Health_StreamValidatorLogsServer) error } // UnimplementedHealthServer can be embedded to have forward compatible implementations. type UnimplementedHealthServer struct { } -func (*UnimplementedHealthServer) GetBeaconNodeConnection(context.Context, *empty.Empty) (*NodeConnectionResponse, error) { +func (*UnimplementedHealthServer) GetBeaconNodeConnection(context.Context, *emptypb.Empty) (*NodeConnectionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBeaconNodeConnection not implemented") } -func (*UnimplementedHealthServer) GetLogsEndpoints(context.Context, *empty.Empty) (*LogsEndpointResponse, error) { +func (*UnimplementedHealthServer) GetLogsEndpoints(context.Context, *emptypb.Empty) (*LogsEndpointResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetLogsEndpoints not implemented") } -func (*UnimplementedHealthServer) GetVersion(context.Context, *empty.Empty) (*VersionResponse, error) { +func (*UnimplementedHealthServer) GetVersion(context.Context, *emptypb.Empty) (*VersionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetVersion not implemented") } -func (*UnimplementedHealthServer) StreamBeaconLogs(*empty.Empty, Health_StreamBeaconLogsServer) error { +func (*UnimplementedHealthServer) StreamBeaconLogs(*emptypb.Empty, Health_StreamBeaconLogsServer) error { return status.Errorf(codes.Unimplemented, "method StreamBeaconLogs not implemented") } -func (*UnimplementedHealthServer) StreamValidatorLogs(*empty.Empty, Health_StreamValidatorLogsServer) error { +func (*UnimplementedHealthServer) StreamValidatorLogs(*emptypb.Empty, Health_StreamValidatorLogsServer) error { return status.Errorf(codes.Unimplemented, "method StreamValidatorLogs not implemented") } @@ -3633,7 +3633,7 @@ func RegisterHealthServer(s *grpc.Server, srv HealthServer) { } func _Health_GetBeaconNodeConnection_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3645,13 +3645,13 @@ func _Health_GetBeaconNodeConnection_Handler(srv interface{}, ctx context.Contex FullMethod: "/ethereum.validator.accounts.v2.Health/GetBeaconNodeConnection", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(HealthServer).GetBeaconNodeConnection(ctx, req.(*empty.Empty)) + return srv.(HealthServer).GetBeaconNodeConnection(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Health_GetLogsEndpoints_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3663,13 +3663,13 @@ func _Health_GetLogsEndpoints_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/ethereum.validator.accounts.v2.Health/GetLogsEndpoints", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(HealthServer).GetLogsEndpoints(ctx, req.(*empty.Empty)) + return srv.(HealthServer).GetLogsEndpoints(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Health_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3681,13 +3681,13 @@ func _Health_GetVersion_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: "/ethereum.validator.accounts.v2.Health/GetVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(HealthServer).GetVersion(ctx, req.(*empty.Empty)) + return srv.(HealthServer).GetVersion(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _Health_StreamBeaconLogs_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -3708,7 +3708,7 @@ func (x *healthStreamBeaconLogsServer) Send(m *v1alpha1.LogsResponse) error { } func _Health_StreamValidatorLogs_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -3764,7 +3764,7 @@ var _Health_serviceDesc = grpc.ServiceDesc{ // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type AuthClient interface { - Initialize(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*InitializeAuthResponse, error) + Initialize(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*InitializeAuthResponse, error) } type authClient struct { @@ -3775,7 +3775,7 @@ func NewAuthClient(cc grpc.ClientConnInterface) AuthClient { return &authClient{cc} } -func (c *authClient) Initialize(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*InitializeAuthResponse, error) { +func (c *authClient) Initialize(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*InitializeAuthResponse, error) { out := new(InitializeAuthResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Auth/Initialize", in, out, opts...) if err != nil { @@ -3786,14 +3786,14 @@ func (c *authClient) Initialize(ctx context.Context, in *empty.Empty, opts ...gr // AuthServer is the server API for Auth service. type AuthServer interface { - Initialize(context.Context, *empty.Empty) (*InitializeAuthResponse, error) + Initialize(context.Context, *emptypb.Empty) (*InitializeAuthResponse, error) } // UnimplementedAuthServer can be embedded to have forward compatible implementations. type UnimplementedAuthServer struct { } -func (*UnimplementedAuthServer) Initialize(context.Context, *empty.Empty) (*InitializeAuthResponse, error) { +func (*UnimplementedAuthServer) Initialize(context.Context, *emptypb.Empty) (*InitializeAuthResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Initialize not implemented") } @@ -3802,7 +3802,7 @@ func RegisterAuthServer(s *grpc.Server, srv AuthServer) { } func _Auth_Initialize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -3814,7 +3814,7 @@ func _Auth_Initialize_Handler(srv interface{}, ctx context.Context, dec func(int FullMethod: "/ethereum.validator.accounts.v2.Auth/Initialize", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AuthServer).Initialize(ctx, req.(*empty.Empty)) + return srv.(AuthServer).Initialize(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/validator.pb.go b/proto/prysm/v1alpha1/validator.pb.go index b8e385cca5e3..1c532e6604f8 100755 --- a/proto/prysm/v1alpha1/validator.pb.go +++ b/proto/prysm/v1alpha1/validator.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/validator.proto package eth @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -20,6 +19,7 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -3847,7 +3847,7 @@ var file_proto_prysm_v1alpha1_validator_proto_goTypes = []interface{}{ (*AggregateAttestationAndProof)(nil), // 52: ethereum.eth.v1alpha1.AggregateAttestationAndProof (*SignedAggregateAttestationAndProof)(nil), // 53: ethereum.eth.v1alpha1.SignedAggregateAttestationAndProof (*SyncCommitteeMessage)(nil), // 54: ethereum.eth.v1alpha1.SyncCommitteeMessage - (*empty.Empty)(nil), // 55: google.protobuf.Empty + (*emptypb.Empty)(nil), // 55: google.protobuf.Empty (*GenericSignedBeaconBlock)(nil), // 56: ethereum.eth.v1alpha1.GenericSignedBeaconBlock (*Attestation)(nil), // 57: ethereum.eth.v1alpha1.Attestation (*SignedVoluntaryExit)(nil), // 58: ethereum.eth.v1alpha1.SignedVoluntaryExit @@ -4549,31 +4549,31 @@ type BeaconNodeValidatorClient interface { StreamDuties(ctx context.Context, in *DutiesRequest, opts ...grpc.CallOption) (BeaconNodeValidator_StreamDutiesClient, error) DomainData(ctx context.Context, in *DomainRequest, opts ...grpc.CallOption) (*DomainResponse, error) // Deprecated: Do not use. - WaitForChainStart(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconNodeValidator_WaitForChainStartClient, error) + WaitForChainStart(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconNodeValidator_WaitForChainStartClient, error) WaitForActivation(ctx context.Context, in *ValidatorActivationRequest, opts ...grpc.CallOption) (BeaconNodeValidator_WaitForActivationClient, error) ValidatorIndex(ctx context.Context, in *ValidatorIndexRequest, opts ...grpc.CallOption) (*ValidatorIndexResponse, error) ValidatorStatus(ctx context.Context, in *ValidatorStatusRequest, opts ...grpc.CallOption) (*ValidatorStatusResponse, error) MultipleValidatorStatus(ctx context.Context, in *MultipleValidatorStatusRequest, opts ...grpc.CallOption) (*MultipleValidatorStatusResponse, error) GetBeaconBlock(ctx context.Context, in *BlockRequest, opts ...grpc.CallOption) (*GenericBeaconBlock, error) ProposeBeaconBlock(ctx context.Context, in *GenericSignedBeaconBlock, opts ...grpc.CallOption) (*ProposeResponse, error) - PrepareBeaconProposer(ctx context.Context, in *PrepareBeaconProposerRequest, opts ...grpc.CallOption) (*empty.Empty, error) + PrepareBeaconProposer(ctx context.Context, in *PrepareBeaconProposerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) GetFeeRecipientByPubKey(ctx context.Context, in *FeeRecipientByPubKeyRequest, opts ...grpc.CallOption) (*FeeRecipientByPubKeyResponse, error) GetAttestationData(ctx context.Context, in *AttestationDataRequest, opts ...grpc.CallOption) (*AttestationData, error) ProposeAttestation(ctx context.Context, in *Attestation, opts ...grpc.CallOption) (*AttestResponse, error) SubmitAggregateSelectionProof(ctx context.Context, in *AggregateSelectionRequest, opts ...grpc.CallOption) (*AggregateSelectionResponse, error) SubmitSignedAggregateSelectionProof(ctx context.Context, in *SignedAggregateSubmitRequest, opts ...grpc.CallOption) (*SignedAggregateSubmitResponse, error) ProposeExit(ctx context.Context, in *SignedVoluntaryExit, opts ...grpc.CallOption) (*ProposeExitResponse, error) - SubscribeCommitteeSubnets(ctx context.Context, in *CommitteeSubnetsSubscribeRequest, opts ...grpc.CallOption) (*empty.Empty, error) + SubscribeCommitteeSubnets(ctx context.Context, in *CommitteeSubnetsSubscribeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) CheckDoppelGanger(ctx context.Context, in *DoppelGangerRequest, opts ...grpc.CallOption) (*DoppelGangerResponse, error) - GetSyncMessageBlockRoot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SyncMessageBlockRootResponse, error) - SubmitSyncMessage(ctx context.Context, in *SyncCommitteeMessage, opts ...grpc.CallOption) (*empty.Empty, error) + GetSyncMessageBlockRoot(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SyncMessageBlockRootResponse, error) + SubmitSyncMessage(ctx context.Context, in *SyncCommitteeMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) GetSyncSubcommitteeIndex(ctx context.Context, in *SyncSubcommitteeIndexRequest, opts ...grpc.CallOption) (*SyncSubcommitteeIndexResponse, error) GetSyncCommitteeContribution(ctx context.Context, in *SyncCommitteeContributionRequest, opts ...grpc.CallOption) (*SyncCommitteeContribution, error) - SubmitSignedContributionAndProof(ctx context.Context, in *SignedContributionAndProof, opts ...grpc.CallOption) (*empty.Empty, error) + SubmitSignedContributionAndProof(ctx context.Context, in *SignedContributionAndProof, opts ...grpc.CallOption) (*emptypb.Empty, error) // Deprecated: Do not use. StreamBlocksAltair(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (BeaconNodeValidator_StreamBlocksAltairClient, error) - SubmitValidatorRegistrations(ctx context.Context, in *SignedValidatorRegistrationsV1, opts ...grpc.CallOption) (*empty.Empty, error) - AssignValidatorToSubnet(ctx context.Context, in *AssignValidatorToSubnetRequest, opts ...grpc.CallOption) (*empty.Empty, error) + SubmitValidatorRegistrations(ctx context.Context, in *SignedValidatorRegistrationsV1, opts ...grpc.CallOption) (*emptypb.Empty, error) + AssignValidatorToSubnet(ctx context.Context, in *AssignValidatorToSubnetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) AggregatedSigAndAggregationBits(ctx context.Context, in *AggregatedSigAndAggregationBitsRequest, opts ...grpc.CallOption) (*AggregatedSigAndAggregationBitsResponse, error) } @@ -4637,7 +4637,7 @@ func (c *beaconNodeValidatorClient) DomainData(ctx context.Context, in *DomainRe } // Deprecated: Do not use. -func (c *beaconNodeValidatorClient) WaitForChainStart(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (BeaconNodeValidator_WaitForChainStartClient, error) { +func (c *beaconNodeValidatorClient) WaitForChainStart(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (BeaconNodeValidator_WaitForChainStartClient, error) { stream, err := c.cc.NewStream(ctx, &_BeaconNodeValidator_serviceDesc.Streams[1], "/ethereum.eth.v1alpha1.BeaconNodeValidator/WaitForChainStart", opts...) if err != nil { return nil, err @@ -4746,8 +4746,8 @@ func (c *beaconNodeValidatorClient) ProposeBeaconBlock(ctx context.Context, in * return out, nil } -func (c *beaconNodeValidatorClient) PrepareBeaconProposer(ctx context.Context, in *PrepareBeaconProposerRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) PrepareBeaconProposer(ctx context.Context, in *PrepareBeaconProposerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/PrepareBeaconProposer", in, out, opts...) if err != nil { return nil, err @@ -4809,8 +4809,8 @@ func (c *beaconNodeValidatorClient) ProposeExit(ctx context.Context, in *SignedV return out, nil } -func (c *beaconNodeValidatorClient) SubscribeCommitteeSubnets(ctx context.Context, in *CommitteeSubnetsSubscribeRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) SubscribeCommitteeSubnets(ctx context.Context, in *CommitteeSubnetsSubscribeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/SubscribeCommitteeSubnets", in, out, opts...) if err != nil { return nil, err @@ -4827,7 +4827,7 @@ func (c *beaconNodeValidatorClient) CheckDoppelGanger(ctx context.Context, in *D return out, nil } -func (c *beaconNodeValidatorClient) GetSyncMessageBlockRoot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SyncMessageBlockRootResponse, error) { +func (c *beaconNodeValidatorClient) GetSyncMessageBlockRoot(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*SyncMessageBlockRootResponse, error) { out := new(SyncMessageBlockRootResponse) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/GetSyncMessageBlockRoot", in, out, opts...) if err != nil { @@ -4836,8 +4836,8 @@ func (c *beaconNodeValidatorClient) GetSyncMessageBlockRoot(ctx context.Context, return out, nil } -func (c *beaconNodeValidatorClient) SubmitSyncMessage(ctx context.Context, in *SyncCommitteeMessage, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) SubmitSyncMessage(ctx context.Context, in *SyncCommitteeMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/SubmitSyncMessage", in, out, opts...) if err != nil { return nil, err @@ -4863,8 +4863,8 @@ func (c *beaconNodeValidatorClient) GetSyncCommitteeContribution(ctx context.Con return out, nil } -func (c *beaconNodeValidatorClient) SubmitSignedContributionAndProof(ctx context.Context, in *SignedContributionAndProof, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) SubmitSignedContributionAndProof(ctx context.Context, in *SignedContributionAndProof, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/SubmitSignedContributionAndProof", in, out, opts...) if err != nil { return nil, err @@ -4905,8 +4905,8 @@ func (x *beaconNodeValidatorStreamBlocksAltairClient) Recv() (*StreamBlocksRespo return m, nil } -func (c *beaconNodeValidatorClient) SubmitValidatorRegistrations(ctx context.Context, in *SignedValidatorRegistrationsV1, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) SubmitValidatorRegistrations(ctx context.Context, in *SignedValidatorRegistrationsV1, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/SubmitValidatorRegistrations", in, out, opts...) if err != nil { return nil, err @@ -4914,8 +4914,8 @@ func (c *beaconNodeValidatorClient) SubmitValidatorRegistrations(ctx context.Con return out, nil } -func (c *beaconNodeValidatorClient) AssignValidatorToSubnet(ctx context.Context, in *AssignValidatorToSubnetRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *beaconNodeValidatorClient) AssignValidatorToSubnet(ctx context.Context, in *AssignValidatorToSubnetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/ethereum.eth.v1alpha1.BeaconNodeValidator/AssignValidatorToSubnet", in, out, opts...) if err != nil { return nil, err @@ -4939,31 +4939,31 @@ type BeaconNodeValidatorServer interface { StreamDuties(*DutiesRequest, BeaconNodeValidator_StreamDutiesServer) error DomainData(context.Context, *DomainRequest) (*DomainResponse, error) // Deprecated: Do not use. - WaitForChainStart(*empty.Empty, BeaconNodeValidator_WaitForChainStartServer) error + WaitForChainStart(*emptypb.Empty, BeaconNodeValidator_WaitForChainStartServer) error WaitForActivation(*ValidatorActivationRequest, BeaconNodeValidator_WaitForActivationServer) error ValidatorIndex(context.Context, *ValidatorIndexRequest) (*ValidatorIndexResponse, error) ValidatorStatus(context.Context, *ValidatorStatusRequest) (*ValidatorStatusResponse, error) MultipleValidatorStatus(context.Context, *MultipleValidatorStatusRequest) (*MultipleValidatorStatusResponse, error) GetBeaconBlock(context.Context, *BlockRequest) (*GenericBeaconBlock, error) ProposeBeaconBlock(context.Context, *GenericSignedBeaconBlock) (*ProposeResponse, error) - PrepareBeaconProposer(context.Context, *PrepareBeaconProposerRequest) (*empty.Empty, error) + PrepareBeaconProposer(context.Context, *PrepareBeaconProposerRequest) (*emptypb.Empty, error) GetFeeRecipientByPubKey(context.Context, *FeeRecipientByPubKeyRequest) (*FeeRecipientByPubKeyResponse, error) GetAttestationData(context.Context, *AttestationDataRequest) (*AttestationData, error) ProposeAttestation(context.Context, *Attestation) (*AttestResponse, error) SubmitAggregateSelectionProof(context.Context, *AggregateSelectionRequest) (*AggregateSelectionResponse, error) SubmitSignedAggregateSelectionProof(context.Context, *SignedAggregateSubmitRequest) (*SignedAggregateSubmitResponse, error) ProposeExit(context.Context, *SignedVoluntaryExit) (*ProposeExitResponse, error) - SubscribeCommitteeSubnets(context.Context, *CommitteeSubnetsSubscribeRequest) (*empty.Empty, error) + SubscribeCommitteeSubnets(context.Context, *CommitteeSubnetsSubscribeRequest) (*emptypb.Empty, error) CheckDoppelGanger(context.Context, *DoppelGangerRequest) (*DoppelGangerResponse, error) - GetSyncMessageBlockRoot(context.Context, *empty.Empty) (*SyncMessageBlockRootResponse, error) - SubmitSyncMessage(context.Context, *SyncCommitteeMessage) (*empty.Empty, error) + GetSyncMessageBlockRoot(context.Context, *emptypb.Empty) (*SyncMessageBlockRootResponse, error) + SubmitSyncMessage(context.Context, *SyncCommitteeMessage) (*emptypb.Empty, error) GetSyncSubcommitteeIndex(context.Context, *SyncSubcommitteeIndexRequest) (*SyncSubcommitteeIndexResponse, error) GetSyncCommitteeContribution(context.Context, *SyncCommitteeContributionRequest) (*SyncCommitteeContribution, error) - SubmitSignedContributionAndProof(context.Context, *SignedContributionAndProof) (*empty.Empty, error) + SubmitSignedContributionAndProof(context.Context, *SignedContributionAndProof) (*emptypb.Empty, error) // Deprecated: Do not use. StreamBlocksAltair(*StreamBlocksRequest, BeaconNodeValidator_StreamBlocksAltairServer) error - SubmitValidatorRegistrations(context.Context, *SignedValidatorRegistrationsV1) (*empty.Empty, error) - AssignValidatorToSubnet(context.Context, *AssignValidatorToSubnetRequest) (*empty.Empty, error) + SubmitValidatorRegistrations(context.Context, *SignedValidatorRegistrationsV1) (*emptypb.Empty, error) + AssignValidatorToSubnet(context.Context, *AssignValidatorToSubnetRequest) (*emptypb.Empty, error) AggregatedSigAndAggregationBits(context.Context, *AggregatedSigAndAggregationBitsRequest) (*AggregatedSigAndAggregationBitsResponse, error) } @@ -4980,7 +4980,7 @@ func (*UnimplementedBeaconNodeValidatorServer) StreamDuties(*DutiesRequest, Beac func (*UnimplementedBeaconNodeValidatorServer) DomainData(context.Context, *DomainRequest) (*DomainResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DomainData not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) WaitForChainStart(*empty.Empty, BeaconNodeValidator_WaitForChainStartServer) error { +func (*UnimplementedBeaconNodeValidatorServer) WaitForChainStart(*emptypb.Empty, BeaconNodeValidator_WaitForChainStartServer) error { return status.Errorf(codes.Unimplemented, "method WaitForChainStart not implemented") } func (*UnimplementedBeaconNodeValidatorServer) WaitForActivation(*ValidatorActivationRequest, BeaconNodeValidator_WaitForActivationServer) error { @@ -5001,7 +5001,7 @@ func (*UnimplementedBeaconNodeValidatorServer) GetBeaconBlock(context.Context, * func (*UnimplementedBeaconNodeValidatorServer) ProposeBeaconBlock(context.Context, *GenericSignedBeaconBlock) (*ProposeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ProposeBeaconBlock not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) PrepareBeaconProposer(context.Context, *PrepareBeaconProposerRequest) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) PrepareBeaconProposer(context.Context, *PrepareBeaconProposerRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method PrepareBeaconProposer not implemented") } func (*UnimplementedBeaconNodeValidatorServer) GetFeeRecipientByPubKey(context.Context, *FeeRecipientByPubKeyRequest) (*FeeRecipientByPubKeyResponse, error) { @@ -5022,16 +5022,16 @@ func (*UnimplementedBeaconNodeValidatorServer) SubmitSignedAggregateSelectionPro func (*UnimplementedBeaconNodeValidatorServer) ProposeExit(context.Context, *SignedVoluntaryExit) (*ProposeExitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ProposeExit not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) SubscribeCommitteeSubnets(context.Context, *CommitteeSubnetsSubscribeRequest) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) SubscribeCommitteeSubnets(context.Context, *CommitteeSubnetsSubscribeRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubscribeCommitteeSubnets not implemented") } func (*UnimplementedBeaconNodeValidatorServer) CheckDoppelGanger(context.Context, *DoppelGangerRequest) (*DoppelGangerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CheckDoppelGanger not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) GetSyncMessageBlockRoot(context.Context, *empty.Empty) (*SyncMessageBlockRootResponse, error) { +func (*UnimplementedBeaconNodeValidatorServer) GetSyncMessageBlockRoot(context.Context, *emptypb.Empty) (*SyncMessageBlockRootResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSyncMessageBlockRoot not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) SubmitSyncMessage(context.Context, *SyncCommitteeMessage) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) SubmitSyncMessage(context.Context, *SyncCommitteeMessage) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitSyncMessage not implemented") } func (*UnimplementedBeaconNodeValidatorServer) GetSyncSubcommitteeIndex(context.Context, *SyncSubcommitteeIndexRequest) (*SyncSubcommitteeIndexResponse, error) { @@ -5040,16 +5040,16 @@ func (*UnimplementedBeaconNodeValidatorServer) GetSyncSubcommitteeIndex(context. func (*UnimplementedBeaconNodeValidatorServer) GetSyncCommitteeContribution(context.Context, *SyncCommitteeContributionRequest) (*SyncCommitteeContribution, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSyncCommitteeContribution not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) SubmitSignedContributionAndProof(context.Context, *SignedContributionAndProof) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) SubmitSignedContributionAndProof(context.Context, *SignedContributionAndProof) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitSignedContributionAndProof not implemented") } func (*UnimplementedBeaconNodeValidatorServer) StreamBlocksAltair(*StreamBlocksRequest, BeaconNodeValidator_StreamBlocksAltairServer) error { return status.Errorf(codes.Unimplemented, "method StreamBlocksAltair not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) SubmitValidatorRegistrations(context.Context, *SignedValidatorRegistrationsV1) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) SubmitValidatorRegistrations(context.Context, *SignedValidatorRegistrationsV1) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitValidatorRegistrations not implemented") } -func (*UnimplementedBeaconNodeValidatorServer) AssignValidatorToSubnet(context.Context, *AssignValidatorToSubnetRequest) (*empty.Empty, error) { +func (*UnimplementedBeaconNodeValidatorServer) AssignValidatorToSubnet(context.Context, *AssignValidatorToSubnetRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AssignValidatorToSubnet not implemented") } func (*UnimplementedBeaconNodeValidatorServer) AggregatedSigAndAggregationBits(context.Context, *AggregatedSigAndAggregationBitsRequest) (*AggregatedSigAndAggregationBitsResponse, error) { @@ -5118,7 +5118,7 @@ func _BeaconNodeValidator_DomainData_Handler(srv interface{}, ctx context.Contex } func _BeaconNodeValidator_WaitForChainStart_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(empty.Empty) + m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err } @@ -5412,7 +5412,7 @@ func _BeaconNodeValidator_CheckDoppelGanger_Handler(srv interface{}, ctx context } func _BeaconNodeValidator_GetSyncMessageBlockRoot_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(empty.Empty) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -5424,7 +5424,7 @@ func _BeaconNodeValidator_GetSyncMessageBlockRoot_Handler(srv interface{}, ctx c FullMethod: "/ethereum.eth.v1alpha1.BeaconNodeValidator/GetSyncMessageBlockRoot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BeaconNodeValidatorServer).GetSyncMessageBlockRoot(ctx, req.(*empty.Empty)) + return srv.(BeaconNodeValidatorServer).GetSyncMessageBlockRoot(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/proto/prysm/v1alpha1/withdrawals.pb.go b/proto/prysm/v1alpha1/withdrawals.pb.go index f2033d89cd9b..2ca1968570e9 100755 --- a/proto/prysm/v1alpha1/withdrawals.pb.go +++ b/proto/prysm/v1alpha1/withdrawals.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/prysm/v1alpha1/withdrawals.proto package eth diff --git a/proto/testing/test.pb.go b/proto/testing/test.pb.go index 2cc60744cad1..74d61e8d7ab3 100755 --- a/proto/testing/test.pb.go +++ b/proto/testing/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.15.8 +// protoc-gen-go v1.31.0 +// protoc v4.23.3 // source: proto/testing/test.proto package testing @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" ) const ( @@ -242,11 +242,11 @@ type Person struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` - Email string `protobuf:"bytes,3,opt,name=email,proto3" json:"email,omitempty"` - Phones []*Person_PhoneNumber `protobuf:"bytes,4,rep,name=phones,proto3" json:"phones,omitempty"` - LastUpdated *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` + Email string `protobuf:"bytes,3,opt,name=email,proto3" json:"email,omitempty"` + Phones []*Person_PhoneNumber `protobuf:"bytes,4,rep,name=phones,proto3" json:"phones,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *Person) Reset() { @@ -309,7 +309,7 @@ func (x *Person) GetPhones() []*Person_PhoneNumber { return nil } -func (x *Person) GetLastUpdated() *timestamp.Timestamp { +func (x *Person) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -583,7 +583,7 @@ var file_proto_testing_test_proto_goTypes = []interface{}{ (*AddressBook)(nil), // 5: testing.AddressBook (*TestSimpleMessage)(nil), // 6: testing.TestSimpleMessage (*Person_PhoneNumber)(nil), // 7: testing.Person.PhoneNumber - (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp (*descriptorpb.FieldOptions)(nil), // 9: google.protobuf.FieldOptions } var file_proto_testing_test_proto_depIdxs = []int32{ diff --git a/testing/endtoend/evaluators/BUILD.bazel b/testing/endtoend/evaluators/BUILD.bazel index b393c9214b98..c4cf6f98eded 100644 --- a/testing/endtoend/evaluators/BUILD.bazel +++ b/testing/endtoend/evaluators/BUILD.bazel @@ -55,10 +55,10 @@ go_library( "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_ethereum_go_ethereum//ethclient:go_default_library", "@com_github_ethereum_go_ethereum//rpc:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", "@org_golang_x_exp//rand:go_default_library", diff --git a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2.patch b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2.patch new file mode 100644 index 000000000000..e7b94f9794da --- /dev/null +++ b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2.patch @@ -0,0 +1,12 @@ +diff --git a/internal/descriptor/apiconfig/BUILD.bazel b/internal/descriptor/apiconfig/BUILD.bazel +index 80dc57a2..76d4374f 100644 +--- a/internal/descriptor/apiconfig/BUILD.bazel ++++ b/internal/descriptor/apiconfig/BUILD.bazel +@@ -11,6 +11,7 @@ proto_library( + ], + deps = [ + "@go_googleapis//google/api:annotations_proto", ++ "@go_googleapis//google/api:http_proto", + ], + ) + diff --git a/third_party/com_github_grpc_ecosystem_grpc_gateway_v2_fix_emptypb.patch b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2_fix_emptypb.patch new file mode 100644 index 000000000000..707ee5da4b7c --- /dev/null +++ b/third_party/com_github_grpc_ecosystem_grpc_gateway_v2_fix_emptypb.patch @@ -0,0 +1,22 @@ +diff --git a/protoc-gen-grpc-gateway/internal/gengateway/template.go b/protoc-gen-grpc-gateway/internal/gengateway/template.go +index 6d3476df..6392af9a 100644 +--- a/protoc-gen-grpc-gateway/internal/gengateway/template.go ++++ b/protoc-gen-grpc-gateway/internal/gengateway/template.go +@@ -243,8 +243,7 @@ It translates gRPC into RESTful JSON APIs. + package {{.GoPkg.Name}} + import ( + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" +- emptypb "github.com/golang/protobuf/ptypes/empty" +- "github.com/golang/protobuf/ptypes/empty" ++ "google.golang.org/protobuf/types/known/emptypb" + {{range $i := .Imports}}{{if $i | printf "%q" | ne "github.com/golang/protobuf/ptypes/empty"}}{{$i | printf "%s\n"}}{{end}}{{end}} + ) + +@@ -257,7 +256,6 @@ var _ = utilities.NewDoubleArray + var _ = metadata.Join + var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) + var _ = emptypb.Empty{} +-var _ = empty.Empty{} + `)) + + handlerTemplate = template.Must(template.New("handler").Parse(` diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 40393df77db0..0117fd19f4a7 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -69,6 +69,8 @@ go_library( "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", + "@com_github_golang_protobuf//ptypes/timestamp", "@com_github_grpc_ecosystem_go_grpc_middleware//:go_default_library", "@com_github_grpc_ecosystem_go_grpc_middleware//retry:go_default_library", "@com_github_grpc_ecosystem_go_grpc_middleware//tracing/opentracing:go_default_library", @@ -79,8 +81,6 @@ go_library( "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", "@io_opencensus_go//plugin/ocgrpc:go_default_library", "@io_opencensus_go//trace:go_default_library", "@org_golang_google_grpc//:go_default_library", @@ -162,6 +162,7 @@ go_test( "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_golang_mock//gomock:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", @@ -171,7 +172,6 @@ go_test( "@com_github_wealdtech_go_eth2_util//:go_default_library", "@in_gopkg_d4l3k_messagediff_v1//:go_default_library", "@io_bazel_rules_go//go/tools/bazel:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//metadata:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/validator/client/beacon-api/BUILD.bazel b/validator/client/beacon-api/BUILD.bazel index b3f6206b0fde..24c2d9083928 100644 --- a/validator/client/beacon-api/BUILD.bazel +++ b/validator/client/beacon-api/BUILD.bazel @@ -56,9 +56,9 @@ go_library( "//time/slots:go_default_library", "//validator/client/iface:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", ], @@ -128,8 +128,8 @@ go_test( "//validator/client/beacon-api/test-helpers:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_golang_mock//gomock:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", "@org_golang_google_protobuf//types/known/timestamppb:go_default_library", ], diff --git a/validator/client/grpc-api/BUILD.bazel b/validator/client/grpc-api/BUILD.bazel index 4fb2a258cd09..048ac821162e 100644 --- a/validator/client/grpc-api/BUILD.bazel +++ b/validator/client/grpc-api/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//consensus-types/primitives:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//validator/client/iface:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_pkg_errors//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", ], ) diff --git a/validator/client/iface/BUILD.bazel b/validator/client/iface/BUILD.bazel index 2fc6f51aca27..486feb163af1 100644 --- a/validator/client/iface/BUILD.bazel +++ b/validator/client/iface/BUILD.bazel @@ -18,6 +18,6 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//validator/keymanager:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", + "@com_github_golang_protobuf//ptypes/empty", ], ) diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index dec9383f6563..c4c2e14f2ccf 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -59,6 +59,7 @@ go_library( "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_fsnotify_fsnotify//:go_default_library", "@com_github_golang_jwt_jwt_v4//:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_grpc_ecosystem_go_grpc_middleware//:go_default_library", "@com_github_grpc_ecosystem_go_grpc_middleware//recovery:go_default_library", "@com_github_grpc_ecosystem_go_grpc_middleware//retry:go_default_library", @@ -69,7 +70,6 @@ go_library( "@com_github_tyler_smith_go_bip39//:go_default_library", "@com_github_tyler_smith_go_bip39//wordlists:go_default_library", "@com_github_wealdtech_go_eth2_wallet_encryptor_keystorev4//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@io_opencensus_go//plugin/ocgrpc:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", @@ -130,12 +130,12 @@ go_test( "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_golang_jwt_jwt_v4//:go_default_library", "@com_github_golang_mock//gomock:go_default_library", + "@com_github_golang_protobuf//ptypes/empty", "@com_github_google_uuid//:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_tyler_smith_go_bip39//:go_default_library", "@com_github_wealdtech_go_eth2_wallet_encryptor_keystorev4//:go_default_library", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//metadata:go_default_library",