From d4d75fbbd574199364de6039b52532a0f29de917 Mon Sep 17 00:00:00 2001 From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:50:33 +0200 Subject: [PATCH] add requests to grpc interfaces (#12156) Cherry pick #10394 --- erigon-lib/direct/sentry_client_mock.go | 16 +- erigon-lib/go.mod | 2 +- erigon-lib/go.sum | 4 +- .../gointerfaces/downloader/downloader.pb.go | 20 +- .../downloader/downloader_grpc.pb.go | 23 +- .../gointerfaces/execution/execution.pb.go | 733 +++++++++--------- .../execution/execution_grpc.pb.go | 59 +- .../gointerfaces/remote/ethbackend.pb.go | 62 +- .../gointerfaces/remote/ethbackend_grpc.pb.go | 61 +- erigon-lib/gointerfaces/remote/kv.pb.go | 48 +- erigon-lib/gointerfaces/remote/kv_grpc.pb.go | 50 +- .../gointerfaces/sentinel/sentinel.pb.go | 38 +- .../gointerfaces/sentinel/sentinel_grpc.pb.go | 48 +- erigon-lib/gointerfaces/sentry/sentry.pb.go | 54 +- .../gointerfaces/sentry/sentry_grpc.pb.go | 61 +- erigon-lib/gointerfaces/txpool/mining.pb.go | 38 +- .../gointerfaces/txpool/mining_grpc.pb.go | 47 +- erigon-lib/gointerfaces/txpool/txpool.pb.go | 38 +- .../gointerfaces/txpool/txpool_grpc.pb.go | 39 +- erigon-lib/gointerfaces/types/types.pb.go | 529 +++++++++---- tests/init.go | 20 + turbo/execution/eth1/eth1_utils/grpc.go | 8 + 22 files changed, 1181 insertions(+), 817 deletions(-) diff --git a/erigon-lib/direct/sentry_client_mock.go b/erigon-lib/direct/sentry_client_mock.go index 48074023d41..3cf18f11298 100644 --- a/erigon-lib/direct/sentry_client_mock.go +++ b/erigon-lib/direct/sentry_client_mock.go @@ -10,14 +10,14 @@ package direct import ( - "context" - "reflect" - - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "go.uber.org/mock/gomock" - "google.golang.org/grpc" - "google.golang.org/protobuf/types/known/emptypb" + context "context" + reflect "reflect" + + sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + gomock "go.uber.org/mock/gomock" + grpc "google.golang.org/grpc" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // MockSentryClient is a mock of SentryClient interface. diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 73c91ce6b58..bf8ae3d6df1 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -5,7 +5,7 @@ go 1.22.0 require ( github.com/erigontech/mdbx-go v0.27.24 github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb - github.com/ledgerwatch/interfaces v0.0.0-20240320062914-b57f05746087 + github.com/ledgerwatch/interfaces v0.0.0-20241001134155-79913c8a4f83 github.com/ledgerwatch/log/v3 v3.9.0 github.com/ledgerwatch/secp256k1 v1.0.0 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index b50c4a05786..62ab7fc4e4a 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -270,8 +270,8 @@ github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb h1:bsoVxjnQGxhOODRmkdrbkRTB9+sIduguoNMSZPRRoTI= github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= -github.com/ledgerwatch/interfaces v0.0.0-20240320062914-b57f05746087 h1:Y59HUAT/+02Qbm6g7MuY7i8E0kUihPe7+ftDnR8oQzQ= -github.com/ledgerwatch/interfaces v0.0.0-20240320062914-b57f05746087/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= +github.com/ledgerwatch/interfaces v0.0.0-20241001134155-79913c8a4f83 h1:z3KUgsQTBgsthuxZ0FKrx35b+UcgmgejulvNkENbUFU= +github.com/ledgerwatch/interfaces v0.0.0-20241001134155-79913c8a4f83/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk= github.com/ledgerwatch/log/v3 v3.9.0/go.mod h1:EiAY6upmI/6LkNhOVxb4eVsmsP11HZCnZ3PlJMjYiqE= github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= diff --git a/erigon-lib/gointerfaces/downloader/downloader.pb.go b/erigon-lib/gointerfaces/downloader/downloader.pb.go index dec9c5cc3e7..e241643f3db 100644 --- a/erigon-lib/gointerfaces/downloader/downloader.pb.go +++ b/erigon-lib/gointerfaces/downloader/downloader.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: downloader/downloader.proto package downloader @@ -509,7 +509,7 @@ func file_downloader_downloader_proto_rawDescGZIP() []byte { } var file_downloader_downloader_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_downloader_downloader_proto_goTypes = []interface{}{ +var file_downloader_downloader_proto_goTypes = []any{ (*AddItem)(nil), // 0: downloader.AddItem (*AddRequest)(nil), // 1: downloader.AddRequest (*DeleteRequest)(nil), // 2: downloader.DeleteRequest @@ -546,7 +546,7 @@ func file_downloader_downloader_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_downloader_downloader_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*AddItem); i { case 0: return &v.state @@ -558,7 +558,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*AddRequest); i { case 0: return &v.state @@ -570,7 +570,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*DeleteRequest); i { case 0: return &v.state @@ -582,7 +582,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*VerifyRequest); i { case 0: return &v.state @@ -594,7 +594,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*StatsRequest); i { case 0: return &v.state @@ -606,7 +606,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProhibitNewDownloadsRequest); i { case 0: return &v.state @@ -618,7 +618,7 @@ func file_downloader_downloader_proto_init() { return nil } } - file_downloader_downloader_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_downloader_downloader_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*StatsReply); i { case 0: return &v.state diff --git a/erigon-lib/gointerfaces/downloader/downloader_grpc.pb.go b/erigon-lib/gointerfaces/downloader/downloader_grpc.pb.go index 369c9b494c4..63f617f992d 100644 --- a/erigon-lib/gointerfaces/downloader/downloader_grpc.pb.go +++ b/erigon-lib/gointerfaces/downloader/downloader_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: downloader/downloader.proto package downloader @@ -16,8 +16,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Downloader_ProhibitNewDownloads_FullMethodName = "/downloader.Downloader/ProhibitNewDownloads" @@ -53,8 +53,9 @@ func NewDownloaderClient(cc grpc.ClientConnInterface) DownloaderClient { } func (c *downloaderClient) ProhibitNewDownloads(ctx context.Context, in *ProhibitNewDownloadsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Downloader_ProhibitNewDownloads_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Downloader_ProhibitNewDownloads_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -62,8 +63,9 @@ func (c *downloaderClient) ProhibitNewDownloads(ctx context.Context, in *Prohibi } func (c *downloaderClient) Add(ctx context.Context, in *AddRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Downloader_Add_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Downloader_Add_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -71,8 +73,9 @@ func (c *downloaderClient) Add(ctx context.Context, in *AddRequest, opts ...grpc } func (c *downloaderClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Downloader_Delete_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Downloader_Delete_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -80,8 +83,9 @@ func (c *downloaderClient) Delete(ctx context.Context, in *DeleteRequest, opts . } func (c *downloaderClient) Verify(ctx context.Context, in *VerifyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Downloader_Verify_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Downloader_Verify_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,8 +93,9 @@ func (c *downloaderClient) Verify(ctx context.Context, in *VerifyRequest, opts . } func (c *downloaderClient) Stats(ctx context.Context, in *StatsRequest, opts ...grpc.CallOption) (*StatsReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StatsReply) - err := c.cc.Invoke(ctx, Downloader_Stats_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Downloader_Stats_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } diff --git a/erigon-lib/gointerfaces/execution/execution.pb.go b/erigon-lib/gointerfaces/execution/execution.pb.go index 28dea395889..0cba23efab0 100644 --- a/erigon-lib/gointerfaces/execution/execution.pb.go +++ b/erigon-lib/gointerfaces/execution/execution.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: execution/execution.proto package execution @@ -281,9 +281,10 @@ type Header struct { BlobGasUsed *uint64 `protobuf:"varint,19,opt,name=blob_gas_used,json=blobGasUsed,proto3,oneof" json:"blob_gas_used,omitempty"` // added in Dencun (EIP-4844) ExcessBlobGas *uint64 `protobuf:"varint,20,opt,name=excess_blob_gas,json=excessBlobGas,proto3,oneof" json:"excess_blob_gas,omitempty"` // added in Dencun (EIP-4844) ParentBeaconBlockRoot *types.H256 `protobuf:"bytes,21,opt,name=parent_beacon_block_root,json=parentBeaconBlockRoot,proto3,oneof" json:"parent_beacon_block_root,omitempty"` // added in Dencun (EIP-4788) + RequestsRoot *types.H256 `protobuf:"bytes,22,opt,name=requests_root,json=requestsRoot,proto3,oneof" json:"requests_root,omitempty"` // added in Pectra (EIP-7685) // AuRa - AuraStep *uint64 `protobuf:"varint,22,opt,name=aura_step,json=auraStep,proto3,oneof" json:"aura_step,omitempty"` - AuraSeal []byte `protobuf:"bytes,23,opt,name=aura_seal,json=auraSeal,proto3,oneof" json:"aura_seal,omitempty"` + AuraStep *uint64 `protobuf:"varint,23,opt,name=aura_step,json=auraStep,proto3,oneof" json:"aura_step,omitempty"` + AuraSeal []byte `protobuf:"bytes,24,opt,name=aura_seal,json=auraSeal,proto3,oneof" json:"aura_seal,omitempty"` } func (x *Header) Reset() { @@ -465,6 +466,13 @@ func (x *Header) GetParentBeaconBlockRoot() *types.H256 { return nil } +func (x *Header) GetRequestsRoot() *types.H256 { + if x != nil { + return x.RequestsRoot + } + return nil +} + func (x *Header) GetAuraStep() uint64 { if x != nil && x.AuraStep != nil { return *x.AuraStep @@ -490,7 +498,8 @@ type BlockBody struct { // Raw transactions in byte format. Transactions [][]byte `protobuf:"bytes,3,rep,name=transactions,proto3" json:"transactions,omitempty"` Uncles []*Header `protobuf:"bytes,4,rep,name=uncles,proto3" json:"uncles,omitempty"` - Withdrawals []*types.Withdrawal `protobuf:"bytes,5,rep,name=withdrawals,proto3" json:"withdrawals,omitempty"` + Withdrawals []*types.Withdrawal `protobuf:"bytes,5,rep,name=withdrawals,proto3" json:"withdrawals,omitempty"` // added in Shapella (EIP-4895) + Requests [][]byte `protobuf:"bytes,6,rep,name=requests,proto3" json:"requests,omitempty"` // added in Pectra (EIP-7685) } func (x *BlockBody) Reset() { @@ -560,6 +569,13 @@ func (x *BlockBody) GetWithdrawals() []*types.Withdrawal { return nil } +func (x *BlockBody) GetRequests() [][]byte { + if x != nil { + return x.Requests + } + return nil +} + type Block struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1710,7 +1726,7 @@ var file_execution_execution_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x33, 0x0a, 0x13, 0x49, 0x73, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x22, 0xe4, 0x08, 0x0a, + 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x22, 0xad, 0x09, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, @@ -1768,259 +1784,265 @@ var file_execution_execution_proto_rawDesc = []byte{ 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x04, 0x52, 0x15, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, - 0x52, 0x6f, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x61, 0x75, 0x72, 0x61, 0x5f, - 0x73, 0x74, 0x65, 0x70, 0x18, 0x16, 0x20, 0x01, 0x28, 0x04, 0x48, 0x05, 0x52, 0x08, 0x61, 0x75, - 0x72, 0x61, 0x53, 0x74, 0x65, 0x70, 0x88, 0x01, 0x01, 0x12, 0x20, 0x0a, 0x09, 0x61, 0x75, 0x72, - 0x61, 0x5f, 0x73, 0x65, 0x61, 0x6c, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x06, 0x52, 0x08, - 0x61, 0x75, 0x72, 0x61, 0x53, 0x65, 0x61, 0x6c, 0x88, 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, - 0x62, 0x61, 0x73, 0x65, 0x5f, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x67, 0x61, 0x73, - 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, - 0x68, 0x61, 0x73, 0x68, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, - 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x65, 0x78, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x72, 0x61, - 0x5f, 0x73, 0x74, 0x65, 0x70, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x72, 0x61, 0x5f, 0x73, - 0x65, 0x61, 0x6c, 0x22, 0xde, 0x01, 0x0a, 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, - 0x79, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, - 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x21, 0x0a, - 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, - 0x12, 0x22, 0x0a, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x75, 0x6e, 0x63, 0x6c, 0x65, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x75, 0x6e, 0x63, 0x6c, 0x65, 0x73, 0x12, - 0x33, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x18, 0x05, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, - 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, - 0x77, 0x61, 0x6c, 0x73, 0x22, 0x5c, 0x0a, 0x05, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x29, 0x0a, - 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x52, 0x6f, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x0d, 0x72, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x73, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x05, 0x52, 0x0c, 0x72, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x20, + 0x0a, 0x09, 0x61, 0x75, 0x72, 0x61, 0x5f, 0x73, 0x74, 0x65, 0x70, 0x18, 0x17, 0x20, 0x01, 0x28, + 0x04, 0x48, 0x06, 0x52, 0x08, 0x61, 0x75, 0x72, 0x61, 0x53, 0x74, 0x65, 0x70, 0x88, 0x01, 0x01, + 0x12, 0x20, 0x0a, 0x09, 0x61, 0x75, 0x72, 0x61, 0x5f, 0x73, 0x65, 0x61, 0x6c, 0x18, 0x18, 0x20, + 0x01, 0x28, 0x0c, 0x48, 0x07, 0x52, 0x08, 0x61, 0x75, 0x72, 0x61, 0x53, 0x65, 0x61, 0x6c, 0x88, + 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x66, 0x65, 0x65, 0x5f, + 0x70, 0x65, 0x72, 0x5f, 0x67, 0x61, 0x73, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x77, 0x69, 0x74, 0x68, + 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x42, 0x10, 0x0a, 0x0e, 0x5f, + 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x42, 0x12, 0x0a, + 0x10, 0x5f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, + 0x73, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x65, 0x61, + 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x42, 0x10, + 0x0a, 0x0e, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x5f, 0x72, 0x6f, 0x6f, 0x74, + 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x72, 0x61, 0x5f, 0x73, 0x74, 0x65, 0x70, 0x42, 0x0c, + 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x72, 0x61, 0x5f, 0x73, 0x65, 0x61, 0x6c, 0x22, 0xfa, 0x01, 0x0a, + 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, + 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, + 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x29, 0x0a, + 0x06, 0x75, 0x6e, 0x63, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, - 0x64, 0x79, 0x22, 0x4e, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x22, 0x38, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x54, 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x02, 0x74, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x00, 0x52, 0x02, - 0x74, 0x64, 0x88, 0x01, 0x01, 0x42, 0x05, 0x0a, 0x03, 0x5f, 0x74, 0x64, 0x22, 0x49, 0x0a, 0x0f, - 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x2d, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, - 0x6f, 0x64, 0x79, 0x48, 0x00, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x88, 0x01, 0x01, 0x42, 0x07, - 0x0a, 0x05, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x56, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x48, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, - 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x0f, - 0x0a, 0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, - 0x8c, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, - 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, 0x62, - 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, - 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x01, - 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x88, 0x01, 0x01, 0x42, 0x0f, - 0x0a, 0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x42, - 0x0d, 0x0a, 0x0b, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x22, 0x3f, - 0x0a, 0x13, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x22, - 0x86, 0x02, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x33, - 0x0a, 0x0f, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, + 0x52, 0x06, 0x75, 0x6e, 0x63, 0x6c, 0x65, 0x73, 0x12, 0x33, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, + 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, + 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x12, 0x1a, 0x0a, + 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0c, 0x52, + 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x22, 0x5c, 0x0a, 0x05, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x12, 0x29, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x28, 0x0a, + 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x78, + 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, + 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x4e, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x06, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, + 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x54, 0x44, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x02, 0x74, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, + 0x36, 0x48, 0x00, 0x52, 0x02, 0x74, 0x64, 0x88, 0x01, 0x01, 0x42, 0x05, 0x0a, 0x03, 0x5f, 0x74, + 0x64, 0x22, 0x49, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, 0x79, 0x48, 0x00, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, + 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x56, 0x0a, 0x1b, + 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x4e, 0x75, 0x6d, + 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x0c, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x04, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, + 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x22, 0x8c, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, + 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, + 0x32, 0x35, 0x36, 0x48, 0x01, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, + 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, + 0x61, 0x73, 0x68, 0x22, 0x3f, 0x0a, 0x13, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x06, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x73, 0x22, 0x86, 0x02, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, + 0x69, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x0f, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x12, 0x42, 0x0a, 0x14, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x00, 0x52, + 0x12, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, + 0x61, 0x73, 0x68, 0x88, 0x01, 0x01, 0x12, 0x38, 0x0a, 0x0f, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x01, 0x52, 0x0d, + 0x73, 0x61, 0x66, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x88, 0x01, 0x01, + 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x62, + 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x73, 0x61, + 0x66, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x22, 0x45, 0x0a, + 0x0f, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x1a, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x72, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x4c, 0x0a, 0x11, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x48, 0x32, 0x35, 0x36, 0x52, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, - 0x61, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x42, 0x0a, - 0x14, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, - 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x00, 0x52, 0x12, 0x66, 0x69, 0x6e, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x88, 0x01, - 0x01, 0x12, 0x38, 0x0a, 0x0f, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x01, 0x52, 0x0d, 0x73, 0x61, 0x66, 0x65, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x88, 0x01, 0x01, 0x42, 0x17, 0x0a, 0x15, 0x5f, - 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x68, 0x61, 0x73, 0x68, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x62, 0x6c, - 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x22, 0x45, 0x0a, 0x0f, 0x49, 0x6e, 0x73, 0x65, - 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x32, 0x0a, 0x06, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x65, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x4c, 0x0a, 0x11, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, + 0x48, 0x32, 0x35, 0x36, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, + 0x65, 0x72, 0x22, 0xf2, 0x02, 0x0a, 0x14, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x76, 0x5f, + 0x72, 0x61, 0x6e, 0x64, 0x61, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x76, 0x52, + 0x61, 0x6e, 0x64, 0x61, 0x6f, 0x12, 0x43, 0x0a, 0x17, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, + 0x65, 0x64, 0x5f, 0x66, 0x65, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, + 0x31, 0x36, 0x30, 0x52, 0x15, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x46, 0x65, + 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x0b, 0x77, 0x69, + 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, + 0x61, 0x6c, 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x12, + 0x49, 0x0a, 0x18, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, + 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x00, + 0x52, 0x15, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, + 0x6f, 0x63, 0x6b, 0x52, 0x6f, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x41, 0x73, 0x73, 0x65, 0x6d, + 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x62, 0x75, 0x73, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, + 0x62, 0x75, 0x73, 0x79, 0x22, 0x2a, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, + 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, + 0x22, 0xc1, 0x01, 0x0a, 0x12, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, + 0x6f, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x44, 0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x10, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2c, 0x0a, + 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, - 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xf2, 0x02, - 0x0a, 0x14, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x48, 0x61, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x76, 0x5f, 0x72, 0x61, 0x6e, 0x64, 0x61, - 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x76, 0x52, 0x61, 0x6e, 0x64, 0x61, 0x6f, - 0x12, 0x43, 0x0a, 0x17, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x65, - 0x65, 0x5f, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, 0x15, - 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x46, 0x65, 0x65, 0x52, 0x65, 0x63, 0x69, - 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, - 0x77, 0x61, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x52, 0x0b, 0x77, - 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x12, 0x49, 0x0a, 0x18, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x48, 0x00, 0x52, 0x15, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6f, - 0x6f, 0x74, 0x88, 0x01, 0x01, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x5f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, - 0x6f, 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, - 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, - 0x75, 0x73, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x62, 0x75, 0x73, 0x79, 0x22, - 0x2a, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0xc1, 0x01, 0x0a, 0x12, - 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x44, 0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, - 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x10, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2c, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0a, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x5f, - 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, - 0x56, 0x31, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x22, - 0x70, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x75, 0x73, 0x79, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x04, 0x62, 0x75, 0x73, 0x79, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x64, 0x61, 0x74, - 0x61, 0x22, 0x46, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x61, - 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x06, 0x62, - 0x6f, 0x64, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x65, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x6f, 0x64, - 0x79, 0x52, 0x06, 0x62, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x18, 0x47, 0x65, 0x74, - 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, - 0x35, 0x36, 0x52, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x22, 0x45, 0x0a, 0x17, 0x47, 0x65, - 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x22, 0x25, 0x0a, 0x0d, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0x3b, 0x0a, 0x14, 0x46, 0x72, 0x6f, 0x7a, - 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x23, 0x0a, 0x0d, 0x66, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, - 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x66, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x22, 0x2f, 0x0a, 0x10, 0x48, 0x61, 0x73, 0x42, 0x6c, 0x6f, 0x63, - 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x68, 0x61, 0x73, - 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x68, 0x61, - 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x2a, 0x71, 0x0a, 0x0f, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x61, 0x64, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x6f, 0x6f, 0x46, 0x61, 0x72, 0x41, 0x77, - 0x61, 0x79, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x53, - 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x6b, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x10, 0x04, 0x12, - 0x08, 0x0a, 0x04, 0x42, 0x75, 0x73, 0x79, 0x10, 0x05, 0x32, 0x86, 0x0a, 0x0a, 0x09, 0x45, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x0c, 0x49, 0x6e, 0x73, 0x65, 0x72, - 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x1e, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x12, 0x4b, 0x0a, 0x0d, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x43, - 0x68, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, - 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x70, 0x74, - 0x12, 0x47, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, - 0x6f, 0x69, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x1a, 0x1c, 0x2e, 0x65, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, - 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x70, 0x74, 0x12, 0x52, 0x0a, 0x0d, 0x41, 0x73, 0x73, - 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x1f, 0x2e, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x65, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5e, 0x0a, - 0x11, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x12, 0x23, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x62, + 0x6c, 0x6f, 0x62, 0x73, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, + 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x56, 0x31, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, + 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x70, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, + 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x36, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1d, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, 0x65, + 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x75, 0x73, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x62, 0x75, 0x73, 0x79, 0x42, 0x07, 0x0a, + 0x05, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, + 0x69, 0x65, 0x73, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x2c, 0x0a, 0x06, 0x62, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x06, 0x62, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x22, 0x3f, + 0x0a, 0x18, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, + 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x61, + 0x73, 0x68, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x22, + 0x45, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, + 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0d, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0x3b, 0x0a, + 0x14, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x66, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x5f, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x66, 0x72, + 0x6f, 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x22, 0x2f, 0x0a, 0x10, 0x48, 0x61, + 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1b, + 0x0a, 0x09, 0x68, 0x61, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x08, 0x68, 0x61, 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x2a, 0x71, 0x0a, 0x0f, 0x45, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, + 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x42, + 0x61, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x6f, 0x6f, + 0x46, 0x61, 0x72, 0x41, 0x77, 0x61, 0x79, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x69, 0x73, + 0x73, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x03, 0x12, 0x15, 0x0a, + 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x46, 0x6f, 0x72, 0x6b, 0x63, 0x68, 0x6f, 0x69, + 0x63, 0x65, 0x10, 0x04, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x75, 0x73, 0x79, 0x10, 0x05, 0x32, 0x86, + 0x0a, 0x0a, 0x09, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x0c, + 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x1e, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x4b, 0x0a, 0x0d, 0x56, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x70, 0x74, 0x12, 0x47, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, + 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x65, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, + 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x6f, 0x72, + 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x70, 0x74, 0x12, 0x52, + 0x0a, 0x0d, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, + 0x1f, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, 0x65, + 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x20, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x73, 0x73, + 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x5e, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, + 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x23, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x64, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, - 0x0d, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x47, 0x65, 0x74, 0x54, 0x44, 0x12, 0x1c, 0x2e, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, - 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x65, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x44, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, + 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x65, + 0x6d, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x45, 0x0a, 0x0d, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1c, 0x2e, 0x65, 0x78, + 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x47, 0x65, 0x74, + 0x54, 0x44, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, - 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, - 0x0a, 0x07, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x08, 0x48, 0x61, 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, - 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, - 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x10, 0x47, 0x65, - 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, - 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, - 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, - 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5b, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, - 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x12, 0x23, 0x2e, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, - 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x21, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, - 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x3e, 0x0a, 0x0f, 0x49, 0x73, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, - 0x6c, 0x48, 0x61, 0x73, 0x68, 0x12, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, - 0x35, 0x36, 0x1a, 0x1e, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, - 0x73, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, - 0x61, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x1a, 0x26, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, - 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3e, - 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x12, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x39, - 0x0a, 0x05, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, - 0x18, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x61, 0x64, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x0c, 0x46, 0x72, 0x6f, - 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x1a, 0x1f, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x72, - 0x6f, 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x42, 0x17, 0x5a, 0x15, 0x2e, 0x2f, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x3b, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x1a, 0x18, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, + 0x54, 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x09, 0x47, 0x65, + 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x1c, + 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, + 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x79, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x08, 0x48, 0x61, 0x73, 0x42, + 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x1c, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, + 0x61, 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x59, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, + 0x6e, 0x67, 0x65, 0x12, 0x22, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x61, 0x74, + 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5b, 0x0a, 0x11, 0x47, 0x65, + 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x12, + 0x23, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x42, + 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x65, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3e, 0x0a, 0x0f, 0x49, 0x73, 0x43, 0x61, 0x6e, + 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x12, 0x0b, 0x2e, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x1a, 0x1e, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x73, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x0b, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x1a, 0x26, 0x2e, 0x65, 0x78, + 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x48, 0x61, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x3e, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, + 0x6f, 0x69, 0x63, 0x65, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, + 0x69, 0x63, 0x65, 0x12, 0x39, 0x0a, 0x05, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, + 0x0a, 0x0c, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1f, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x46, 0x72, 0x6f, 0x7a, 0x65, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x17, 0x5a, 0x15, 0x2e, 0x2f, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2037,7 +2059,7 @@ func file_execution_execution_proto_rawDescGZIP() []byte { var file_execution_execution_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_execution_execution_proto_msgTypes = make([]protoimpl.MessageInfo, 26) -var file_execution_execution_proto_goTypes = []interface{}{ +var file_execution_execution_proto_goTypes = []any{ (ExecutionStatus)(0), // 0: execution.ExecutionStatus (*ForkChoiceReceipt)(nil), // 1: execution.ForkChoiceReceipt (*ValidationReceipt)(nil), // 2: execution.ValidationReceipt @@ -2091,71 +2113,72 @@ var file_execution_execution_proto_depIdxs = []int32{ 27, // 14: execution.Header.base_fee_per_gas:type_name -> types.H256 27, // 15: execution.Header.withdrawal_hash:type_name -> types.H256 27, // 16: execution.Header.parent_beacon_block_root:type_name -> types.H256 - 27, // 17: execution.BlockBody.block_hash:type_name -> types.H256 - 4, // 18: execution.BlockBody.uncles:type_name -> execution.Header - 30, // 19: execution.BlockBody.withdrawals:type_name -> types.Withdrawal - 4, // 20: execution.Block.header:type_name -> execution.Header - 5, // 21: execution.Block.body:type_name -> execution.BlockBody - 4, // 22: execution.GetHeaderResponse.header:type_name -> execution.Header - 27, // 23: execution.GetTDResponse.td:type_name -> types.H256 - 5, // 24: execution.GetBodyResponse.body:type_name -> execution.BlockBody - 27, // 25: execution.GetSegmentRequest.block_hash:type_name -> types.H256 - 6, // 26: execution.InsertBlocksRequest.blocks:type_name -> execution.Block - 27, // 27: execution.ForkChoice.head_block_hash:type_name -> types.H256 - 27, // 28: execution.ForkChoice.finalized_block_hash:type_name -> types.H256 - 27, // 29: execution.ForkChoice.safe_block_hash:type_name -> types.H256 - 0, // 30: execution.InsertionResult.result:type_name -> execution.ExecutionStatus - 27, // 31: execution.ValidationRequest.hash:type_name -> types.H256 - 27, // 32: execution.AssembleBlockRequest.parent_hash:type_name -> types.H256 - 27, // 33: execution.AssembleBlockRequest.prev_randao:type_name -> types.H256 - 28, // 34: execution.AssembleBlockRequest.suggested_fee_recipient:type_name -> types.H160 - 30, // 35: execution.AssembleBlockRequest.withdrawals:type_name -> types.Withdrawal - 27, // 36: execution.AssembleBlockRequest.parent_beacon_block_root:type_name -> types.H256 - 31, // 37: execution.AssembledBlockData.execution_payload:type_name -> types.ExecutionPayload - 27, // 38: execution.AssembledBlockData.block_value:type_name -> types.H256 - 32, // 39: execution.AssembledBlockData.blobs_bundle:type_name -> types.BlobsBundleV1 - 19, // 40: execution.GetAssembledBlockResponse.data:type_name -> execution.AssembledBlockData - 5, // 41: execution.GetBodiesBatchResponse.bodies:type_name -> execution.BlockBody - 27, // 42: execution.GetBodiesByHashesRequest.hashes:type_name -> types.H256 - 12, // 43: execution.Execution.InsertBlocks:input_type -> execution.InsertBlocksRequest - 15, // 44: execution.Execution.ValidateChain:input_type -> execution.ValidationRequest - 13, // 45: execution.Execution.UpdateForkChoice:input_type -> execution.ForkChoice - 16, // 46: execution.Execution.AssembleBlock:input_type -> execution.AssembleBlockRequest - 18, // 47: execution.Execution.GetAssembledBlock:input_type -> execution.GetAssembledBlockRequest - 33, // 48: execution.Execution.CurrentHeader:input_type -> google.protobuf.Empty - 11, // 49: execution.Execution.GetTD:input_type -> execution.GetSegmentRequest - 11, // 50: execution.Execution.GetHeader:input_type -> execution.GetSegmentRequest - 11, // 51: execution.Execution.GetBody:input_type -> execution.GetSegmentRequest - 11, // 52: execution.Execution.HasBlock:input_type -> execution.GetSegmentRequest - 23, // 53: execution.Execution.GetBodiesByRange:input_type -> execution.GetBodiesByRangeRequest - 22, // 54: execution.Execution.GetBodiesByHashes:input_type -> execution.GetBodiesByHashesRequest - 27, // 55: execution.Execution.IsCanonicalHash:input_type -> types.H256 - 27, // 56: execution.Execution.GetHeaderHashNumber:input_type -> types.H256 - 33, // 57: execution.Execution.GetForkChoice:input_type -> google.protobuf.Empty - 33, // 58: execution.Execution.Ready:input_type -> google.protobuf.Empty - 33, // 59: execution.Execution.FrozenBlocks:input_type -> google.protobuf.Empty - 14, // 60: execution.Execution.InsertBlocks:output_type -> execution.InsertionResult - 2, // 61: execution.Execution.ValidateChain:output_type -> execution.ValidationReceipt - 1, // 62: execution.Execution.UpdateForkChoice:output_type -> execution.ForkChoiceReceipt - 17, // 63: execution.Execution.AssembleBlock:output_type -> execution.AssembleBlockResponse - 20, // 64: execution.Execution.GetAssembledBlock:output_type -> execution.GetAssembledBlockResponse - 7, // 65: execution.Execution.CurrentHeader:output_type -> execution.GetHeaderResponse - 8, // 66: execution.Execution.GetTD:output_type -> execution.GetTDResponse - 7, // 67: execution.Execution.GetHeader:output_type -> execution.GetHeaderResponse - 9, // 68: execution.Execution.GetBody:output_type -> execution.GetBodyResponse - 26, // 69: execution.Execution.HasBlock:output_type -> execution.HasBlockResponse - 21, // 70: execution.Execution.GetBodiesByRange:output_type -> execution.GetBodiesBatchResponse - 21, // 71: execution.Execution.GetBodiesByHashes:output_type -> execution.GetBodiesBatchResponse - 3, // 72: execution.Execution.IsCanonicalHash:output_type -> execution.IsCanonicalResponse - 10, // 73: execution.Execution.GetHeaderHashNumber:output_type -> execution.GetHeaderHashNumberResponse - 13, // 74: execution.Execution.GetForkChoice:output_type -> execution.ForkChoice - 24, // 75: execution.Execution.Ready:output_type -> execution.ReadyResponse - 25, // 76: execution.Execution.FrozenBlocks:output_type -> execution.FrozenBlocksResponse - 60, // [60:77] is the sub-list for method output_type - 43, // [43:60] is the sub-list for method input_type - 43, // [43:43] is the sub-list for extension type_name - 43, // [43:43] is the sub-list for extension extendee - 0, // [0:43] is the sub-list for field type_name + 27, // 17: execution.Header.requests_root:type_name -> types.H256 + 27, // 18: execution.BlockBody.block_hash:type_name -> types.H256 + 4, // 19: execution.BlockBody.uncles:type_name -> execution.Header + 30, // 20: execution.BlockBody.withdrawals:type_name -> types.Withdrawal + 4, // 21: execution.Block.header:type_name -> execution.Header + 5, // 22: execution.Block.body:type_name -> execution.BlockBody + 4, // 23: execution.GetHeaderResponse.header:type_name -> execution.Header + 27, // 24: execution.GetTDResponse.td:type_name -> types.H256 + 5, // 25: execution.GetBodyResponse.body:type_name -> execution.BlockBody + 27, // 26: execution.GetSegmentRequest.block_hash:type_name -> types.H256 + 6, // 27: execution.InsertBlocksRequest.blocks:type_name -> execution.Block + 27, // 28: execution.ForkChoice.head_block_hash:type_name -> types.H256 + 27, // 29: execution.ForkChoice.finalized_block_hash:type_name -> types.H256 + 27, // 30: execution.ForkChoice.safe_block_hash:type_name -> types.H256 + 0, // 31: execution.InsertionResult.result:type_name -> execution.ExecutionStatus + 27, // 32: execution.ValidationRequest.hash:type_name -> types.H256 + 27, // 33: execution.AssembleBlockRequest.parent_hash:type_name -> types.H256 + 27, // 34: execution.AssembleBlockRequest.prev_randao:type_name -> types.H256 + 28, // 35: execution.AssembleBlockRequest.suggested_fee_recipient:type_name -> types.H160 + 30, // 36: execution.AssembleBlockRequest.withdrawals:type_name -> types.Withdrawal + 27, // 37: execution.AssembleBlockRequest.parent_beacon_block_root:type_name -> types.H256 + 31, // 38: execution.AssembledBlockData.execution_payload:type_name -> types.ExecutionPayload + 27, // 39: execution.AssembledBlockData.block_value:type_name -> types.H256 + 32, // 40: execution.AssembledBlockData.blobs_bundle:type_name -> types.BlobsBundleV1 + 19, // 41: execution.GetAssembledBlockResponse.data:type_name -> execution.AssembledBlockData + 5, // 42: execution.GetBodiesBatchResponse.bodies:type_name -> execution.BlockBody + 27, // 43: execution.GetBodiesByHashesRequest.hashes:type_name -> types.H256 + 12, // 44: execution.Execution.InsertBlocks:input_type -> execution.InsertBlocksRequest + 15, // 45: execution.Execution.ValidateChain:input_type -> execution.ValidationRequest + 13, // 46: execution.Execution.UpdateForkChoice:input_type -> execution.ForkChoice + 16, // 47: execution.Execution.AssembleBlock:input_type -> execution.AssembleBlockRequest + 18, // 48: execution.Execution.GetAssembledBlock:input_type -> execution.GetAssembledBlockRequest + 33, // 49: execution.Execution.CurrentHeader:input_type -> google.protobuf.Empty + 11, // 50: execution.Execution.GetTD:input_type -> execution.GetSegmentRequest + 11, // 51: execution.Execution.GetHeader:input_type -> execution.GetSegmentRequest + 11, // 52: execution.Execution.GetBody:input_type -> execution.GetSegmentRequest + 11, // 53: execution.Execution.HasBlock:input_type -> execution.GetSegmentRequest + 23, // 54: execution.Execution.GetBodiesByRange:input_type -> execution.GetBodiesByRangeRequest + 22, // 55: execution.Execution.GetBodiesByHashes:input_type -> execution.GetBodiesByHashesRequest + 27, // 56: execution.Execution.IsCanonicalHash:input_type -> types.H256 + 27, // 57: execution.Execution.GetHeaderHashNumber:input_type -> types.H256 + 33, // 58: execution.Execution.GetForkChoice:input_type -> google.protobuf.Empty + 33, // 59: execution.Execution.Ready:input_type -> google.protobuf.Empty + 33, // 60: execution.Execution.FrozenBlocks:input_type -> google.protobuf.Empty + 14, // 61: execution.Execution.InsertBlocks:output_type -> execution.InsertionResult + 2, // 62: execution.Execution.ValidateChain:output_type -> execution.ValidationReceipt + 1, // 63: execution.Execution.UpdateForkChoice:output_type -> execution.ForkChoiceReceipt + 17, // 64: execution.Execution.AssembleBlock:output_type -> execution.AssembleBlockResponse + 20, // 65: execution.Execution.GetAssembledBlock:output_type -> execution.GetAssembledBlockResponse + 7, // 66: execution.Execution.CurrentHeader:output_type -> execution.GetHeaderResponse + 8, // 67: execution.Execution.GetTD:output_type -> execution.GetTDResponse + 7, // 68: execution.Execution.GetHeader:output_type -> execution.GetHeaderResponse + 9, // 69: execution.Execution.GetBody:output_type -> execution.GetBodyResponse + 26, // 70: execution.Execution.HasBlock:output_type -> execution.HasBlockResponse + 21, // 71: execution.Execution.GetBodiesByRange:output_type -> execution.GetBodiesBatchResponse + 21, // 72: execution.Execution.GetBodiesByHashes:output_type -> execution.GetBodiesBatchResponse + 3, // 73: execution.Execution.IsCanonicalHash:output_type -> execution.IsCanonicalResponse + 10, // 74: execution.Execution.GetHeaderHashNumber:output_type -> execution.GetHeaderHashNumberResponse + 13, // 75: execution.Execution.GetForkChoice:output_type -> execution.ForkChoice + 24, // 76: execution.Execution.Ready:output_type -> execution.ReadyResponse + 25, // 77: execution.Execution.FrozenBlocks:output_type -> execution.FrozenBlocksResponse + 61, // [61:78] is the sub-list for method output_type + 44, // [44:61] is the sub-list for method input_type + 44, // [44:44] is the sub-list for extension type_name + 44, // [44:44] is the sub-list for extension extendee + 0, // [0:44] is the sub-list for field type_name } func init() { file_execution_execution_proto_init() } @@ -2164,7 +2187,7 @@ func file_execution_execution_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_execution_execution_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ForkChoiceReceipt); i { case 0: return &v.state @@ -2176,7 +2199,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ValidationReceipt); i { case 0: return &v.state @@ -2188,7 +2211,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*IsCanonicalResponse); i { case 0: return &v.state @@ -2200,7 +2223,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Header); i { case 0: return &v.state @@ -2212,7 +2235,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*BlockBody); i { case 0: return &v.state @@ -2224,7 +2247,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*Block); i { case 0: return &v.state @@ -2236,7 +2259,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*GetHeaderResponse); i { case 0: return &v.state @@ -2248,7 +2271,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*GetTDResponse); i { case 0: return &v.state @@ -2260,7 +2283,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*GetBodyResponse); i { case 0: return &v.state @@ -2272,7 +2295,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*GetHeaderHashNumberResponse); i { case 0: return &v.state @@ -2284,7 +2307,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*GetSegmentRequest); i { case 0: return &v.state @@ -2296,7 +2319,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*InsertBlocksRequest); i { case 0: return &v.state @@ -2308,7 +2331,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*ForkChoice); i { case 0: return &v.state @@ -2320,7 +2343,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*InsertionResult); i { case 0: return &v.state @@ -2332,7 +2355,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*ValidationRequest); i { case 0: return &v.state @@ -2344,7 +2367,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*AssembleBlockRequest); i { case 0: return &v.state @@ -2356,7 +2379,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*AssembleBlockResponse); i { case 0: return &v.state @@ -2368,7 +2391,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*GetAssembledBlockRequest); i { case 0: return &v.state @@ -2380,7 +2403,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*AssembledBlockData); i { case 0: return &v.state @@ -2392,7 +2415,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*GetAssembledBlockResponse); i { case 0: return &v.state @@ -2404,7 +2427,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*GetBodiesBatchResponse); i { case 0: return &v.state @@ -2416,7 +2439,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*GetBodiesByHashesRequest); i { case 0: return &v.state @@ -2428,7 +2451,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*GetBodiesByRangeRequest); i { case 0: return &v.state @@ -2440,7 +2463,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*ReadyResponse); i { case 0: return &v.state @@ -2452,7 +2475,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*FrozenBlocksResponse); i { case 0: return &v.state @@ -2464,7 +2487,7 @@ func file_execution_execution_proto_init() { return nil } } - file_execution_execution_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_execution_execution_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*HasBlockResponse); i { case 0: return &v.state @@ -2477,15 +2500,15 @@ func file_execution_execution_proto_init() { } } } - file_execution_execution_proto_msgTypes[3].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[6].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[7].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[8].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[9].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[10].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[12].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[15].OneofWrappers = []interface{}{} - file_execution_execution_proto_msgTypes[19].OneofWrappers = []interface{}{} + file_execution_execution_proto_msgTypes[3].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[6].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[7].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[8].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[9].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[10].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[12].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[15].OneofWrappers = []any{} + file_execution_execution_proto_msgTypes[19].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/erigon-lib/gointerfaces/execution/execution_grpc.pb.go b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go index ad2dd2fa94c..d00f3ba9491 100644 --- a/erigon-lib/gointerfaces/execution/execution_grpc.pb.go +++ b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: execution/execution.proto package execution @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Execution_InsertBlocks_FullMethodName = "/execution.Execution/InsertBlocks" @@ -82,8 +82,9 @@ func NewExecutionClient(cc grpc.ClientConnInterface) ExecutionClient { } func (c *executionClient) InsertBlocks(ctx context.Context, in *InsertBlocksRequest, opts ...grpc.CallOption) (*InsertionResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(InsertionResult) - err := c.cc.Invoke(ctx, Execution_InsertBlocks_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_InsertBlocks_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -91,8 +92,9 @@ func (c *executionClient) InsertBlocks(ctx context.Context, in *InsertBlocksRequ } func (c *executionClient) ValidateChain(ctx context.Context, in *ValidationRequest, opts ...grpc.CallOption) (*ValidationReceipt, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ValidationReceipt) - err := c.cc.Invoke(ctx, Execution_ValidateChain_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_ValidateChain_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -100,8 +102,9 @@ func (c *executionClient) ValidateChain(ctx context.Context, in *ValidationReque } func (c *executionClient) UpdateForkChoice(ctx context.Context, in *ForkChoice, opts ...grpc.CallOption) (*ForkChoiceReceipt, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ForkChoiceReceipt) - err := c.cc.Invoke(ctx, Execution_UpdateForkChoice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_UpdateForkChoice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -109,8 +112,9 @@ func (c *executionClient) UpdateForkChoice(ctx context.Context, in *ForkChoice, } func (c *executionClient) AssembleBlock(ctx context.Context, in *AssembleBlockRequest, opts ...grpc.CallOption) (*AssembleBlockResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AssembleBlockResponse) - err := c.cc.Invoke(ctx, Execution_AssembleBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_AssembleBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -118,8 +122,9 @@ func (c *executionClient) AssembleBlock(ctx context.Context, in *AssembleBlockRe } func (c *executionClient) GetAssembledBlock(ctx context.Context, in *GetAssembledBlockRequest, opts ...grpc.CallOption) (*GetAssembledBlockResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetAssembledBlockResponse) - err := c.cc.Invoke(ctx, Execution_GetAssembledBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetAssembledBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -127,8 +132,9 @@ func (c *executionClient) GetAssembledBlock(ctx context.Context, in *GetAssemble } func (c *executionClient) CurrentHeader(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetHeaderResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetHeaderResponse) - err := c.cc.Invoke(ctx, Execution_CurrentHeader_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_CurrentHeader_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -136,8 +142,9 @@ func (c *executionClient) CurrentHeader(ctx context.Context, in *emptypb.Empty, } func (c *executionClient) GetTD(ctx context.Context, in *GetSegmentRequest, opts ...grpc.CallOption) (*GetTDResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetTDResponse) - err := c.cc.Invoke(ctx, Execution_GetTD_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetTD_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -145,8 +152,9 @@ func (c *executionClient) GetTD(ctx context.Context, in *GetSegmentRequest, opts } func (c *executionClient) GetHeader(ctx context.Context, in *GetSegmentRequest, opts ...grpc.CallOption) (*GetHeaderResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetHeaderResponse) - err := c.cc.Invoke(ctx, Execution_GetHeader_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetHeader_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -154,8 +162,9 @@ func (c *executionClient) GetHeader(ctx context.Context, in *GetSegmentRequest, } func (c *executionClient) GetBody(ctx context.Context, in *GetSegmentRequest, opts ...grpc.CallOption) (*GetBodyResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetBodyResponse) - err := c.cc.Invoke(ctx, Execution_GetBody_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetBody_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -163,8 +172,9 @@ func (c *executionClient) GetBody(ctx context.Context, in *GetSegmentRequest, op } func (c *executionClient) HasBlock(ctx context.Context, in *GetSegmentRequest, opts ...grpc.CallOption) (*HasBlockResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HasBlockResponse) - err := c.cc.Invoke(ctx, Execution_HasBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_HasBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -172,8 +182,9 @@ func (c *executionClient) HasBlock(ctx context.Context, in *GetSegmentRequest, o } func (c *executionClient) GetBodiesByRange(ctx context.Context, in *GetBodiesByRangeRequest, opts ...grpc.CallOption) (*GetBodiesBatchResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetBodiesBatchResponse) - err := c.cc.Invoke(ctx, Execution_GetBodiesByRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetBodiesByRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -181,8 +192,9 @@ func (c *executionClient) GetBodiesByRange(ctx context.Context, in *GetBodiesByR } func (c *executionClient) GetBodiesByHashes(ctx context.Context, in *GetBodiesByHashesRequest, opts ...grpc.CallOption) (*GetBodiesBatchResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetBodiesBatchResponse) - err := c.cc.Invoke(ctx, Execution_GetBodiesByHashes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetBodiesByHashes_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -190,8 +202,9 @@ func (c *executionClient) GetBodiesByHashes(ctx context.Context, in *GetBodiesBy } func (c *executionClient) IsCanonicalHash(ctx context.Context, in *types.H256, opts ...grpc.CallOption) (*IsCanonicalResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(IsCanonicalResponse) - err := c.cc.Invoke(ctx, Execution_IsCanonicalHash_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_IsCanonicalHash_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -199,8 +212,9 @@ func (c *executionClient) IsCanonicalHash(ctx context.Context, in *types.H256, o } func (c *executionClient) GetHeaderHashNumber(ctx context.Context, in *types.H256, opts ...grpc.CallOption) (*GetHeaderHashNumberResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetHeaderHashNumberResponse) - err := c.cc.Invoke(ctx, Execution_GetHeaderHashNumber_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetHeaderHashNumber_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -208,8 +222,9 @@ func (c *executionClient) GetHeaderHashNumber(ctx context.Context, in *types.H25 } func (c *executionClient) GetForkChoice(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ForkChoice, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ForkChoice) - err := c.cc.Invoke(ctx, Execution_GetForkChoice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_GetForkChoice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -217,8 +232,9 @@ func (c *executionClient) GetForkChoice(ctx context.Context, in *emptypb.Empty, } func (c *executionClient) Ready(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ReadyResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ReadyResponse) - err := c.cc.Invoke(ctx, Execution_Ready_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_Ready_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -226,8 +242,9 @@ func (c *executionClient) Ready(ctx context.Context, in *emptypb.Empty, opts ... } func (c *executionClient) FrozenBlocks(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*FrozenBlocksResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(FrozenBlocksResponse) - err := c.cc.Invoke(ctx, Execution_FrozenBlocks_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Execution_FrozenBlocks_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } diff --git a/erigon-lib/gointerfaces/remote/ethbackend.pb.go b/erigon-lib/gointerfaces/remote/ethbackend.pb.go index 118a3f7637d..c00c5d00c3b 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: remote/ethbackend.proto package remote @@ -1695,7 +1695,7 @@ func file_remote_ethbackend_proto_rawDescGZIP() []byte { var file_remote_ethbackend_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_remote_ethbackend_proto_msgTypes = make([]protoimpl.MessageInfo, 28) -var file_remote_ethbackend_proto_goTypes = []interface{}{ +var file_remote_ethbackend_proto_goTypes = []any{ (Event)(0), // 0: remote.Event (*EtherbaseRequest)(nil), // 1: remote.EtherbaseRequest (*EtherbaseReply)(nil), // 2: remote.EtherbaseReply @@ -1791,7 +1791,7 @@ func file_remote_ethbackend_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_remote_ethbackend_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*EtherbaseRequest); i { case 0: return &v.state @@ -1803,7 +1803,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*EtherbaseReply); i { case 0: return &v.state @@ -1815,7 +1815,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*NetVersionRequest); i { case 0: return &v.state @@ -1827,7 +1827,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*NetVersionReply); i { case 0: return &v.state @@ -1839,7 +1839,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*NetPeerCountRequest); i { case 0: return &v.state @@ -1851,7 +1851,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*NetPeerCountReply); i { case 0: return &v.state @@ -1863,7 +1863,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProtocolVersionRequest); i { case 0: return &v.state @@ -1875,7 +1875,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProtocolVersionReply); i { case 0: return &v.state @@ -1887,7 +1887,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ClientVersionRequest); i { case 0: return &v.state @@ -1899,7 +1899,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ClientVersionReply); i { case 0: return &v.state @@ -1911,7 +1911,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*SubscribeRequest); i { case 0: return &v.state @@ -1923,7 +1923,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*SubscribeReply); i { case 0: return &v.state @@ -1935,7 +1935,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*LogsFilterRequest); i { case 0: return &v.state @@ -1947,7 +1947,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*SubscribeLogsReply); i { case 0: return &v.state @@ -1959,7 +1959,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*BlockRequest); i { case 0: return &v.state @@ -1971,7 +1971,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*BlockReply); i { case 0: return &v.state @@ -1983,7 +1983,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*TxnLookupRequest); i { case 0: return &v.state @@ -1995,7 +1995,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*TxnLookupReply); i { case 0: return &v.state @@ -2007,7 +2007,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*NodesInfoRequest); i { case 0: return &v.state @@ -2019,7 +2019,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*AddPeerRequest); i { case 0: return &v.state @@ -2031,7 +2031,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*NodesInfoReply); i { case 0: return &v.state @@ -2043,7 +2043,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*PeersReply); i { case 0: return &v.state @@ -2055,7 +2055,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*AddPeerReply); i { case 0: return &v.state @@ -2067,7 +2067,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*PendingBlockReply); i { case 0: return &v.state @@ -2079,7 +2079,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*EngineGetPayloadBodiesByHashV1Request); i { case 0: return &v.state @@ -2091,7 +2091,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*EngineGetPayloadBodiesByRangeV1Request); i { case 0: return &v.state @@ -2103,7 +2103,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[26].Exporter = func(v any, i int) any { switch v := v.(*BorEventRequest); i { case 0: return &v.state @@ -2115,7 +2115,7 @@ func file_remote_ethbackend_proto_init() { return nil } } - file_remote_ethbackend_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_remote_ethbackend_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*BorEventReply); i { case 0: return &v.state diff --git a/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go index 4a410a32b86..be36356ac72 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: remote/ethbackend.proto package remote @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( ETHBACKEND_Etherbase_FullMethodName = "/remote.ETHBACKEND/Etherbase" @@ -80,8 +80,9 @@ func NewETHBACKENDClient(cc grpc.ClientConnInterface) ETHBACKENDClient { } func (c *eTHBACKENDClient) Etherbase(ctx context.Context, in *EtherbaseRequest, opts ...grpc.CallOption) (*EtherbaseReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EtherbaseReply) - err := c.cc.Invoke(ctx, ETHBACKEND_Etherbase_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_Etherbase_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,8 +90,9 @@ func (c *eTHBACKENDClient) Etherbase(ctx context.Context, in *EtherbaseRequest, } func (c *eTHBACKENDClient) NetVersion(ctx context.Context, in *NetVersionRequest, opts ...grpc.CallOption) (*NetVersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NetVersionReply) - err := c.cc.Invoke(ctx, ETHBACKEND_NetVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_NetVersion_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -98,8 +100,9 @@ func (c *eTHBACKENDClient) NetVersion(ctx context.Context, in *NetVersionRequest } func (c *eTHBACKENDClient) NetPeerCount(ctx context.Context, in *NetPeerCountRequest, opts ...grpc.CallOption) (*NetPeerCountReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NetPeerCountReply) - err := c.cc.Invoke(ctx, ETHBACKEND_NetPeerCount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_NetPeerCount_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -107,8 +110,9 @@ func (c *eTHBACKENDClient) NetPeerCount(ctx context.Context, in *NetPeerCountReq } func (c *eTHBACKENDClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(types.VersionReply) - err := c.cc.Invoke(ctx, ETHBACKEND_Version_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_Version_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -116,8 +120,9 @@ func (c *eTHBACKENDClient) Version(ctx context.Context, in *emptypb.Empty, opts } func (c *eTHBACKENDClient) ProtocolVersion(ctx context.Context, in *ProtocolVersionRequest, opts ...grpc.CallOption) (*ProtocolVersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ProtocolVersionReply) - err := c.cc.Invoke(ctx, ETHBACKEND_ProtocolVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_ProtocolVersion_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -125,8 +130,9 @@ func (c *eTHBACKENDClient) ProtocolVersion(ctx context.Context, in *ProtocolVers } func (c *eTHBACKENDClient) ClientVersion(ctx context.Context, in *ClientVersionRequest, opts ...grpc.CallOption) (*ClientVersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ClientVersionReply) - err := c.cc.Invoke(ctx, ETHBACKEND_ClientVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_ClientVersion_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -134,11 +140,12 @@ func (c *eTHBACKENDClient) ClientVersion(ctx context.Context, in *ClientVersionR } func (c *eTHBACKENDClient) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (ETHBACKEND_SubscribeClient, error) { - stream, err := c.cc.NewStream(ctx, ÐBACKEND_ServiceDesc.Streams[0], ETHBACKEND_Subscribe_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, ÐBACKEND_ServiceDesc.Streams[0], ETHBACKEND_Subscribe_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &eTHBACKENDSubscribeClient{stream} + x := &eTHBACKENDSubscribeClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -166,11 +173,12 @@ func (x *eTHBACKENDSubscribeClient) Recv() (*SubscribeReply, error) { } func (c *eTHBACKENDClient) SubscribeLogs(ctx context.Context, opts ...grpc.CallOption) (ETHBACKEND_SubscribeLogsClient, error) { - stream, err := c.cc.NewStream(ctx, ÐBACKEND_ServiceDesc.Streams[1], ETHBACKEND_SubscribeLogs_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, ÐBACKEND_ServiceDesc.Streams[1], ETHBACKEND_SubscribeLogs_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &eTHBACKENDSubscribeLogsClient{stream} + x := &eTHBACKENDSubscribeLogsClient{ClientStream: stream} return x, nil } @@ -197,8 +205,9 @@ func (x *eTHBACKENDSubscribeLogsClient) Recv() (*SubscribeLogsReply, error) { } func (c *eTHBACKENDClient) Block(ctx context.Context, in *BlockRequest, opts ...grpc.CallOption) (*BlockReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BlockReply) - err := c.cc.Invoke(ctx, ETHBACKEND_Block_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_Block_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -206,8 +215,9 @@ func (c *eTHBACKENDClient) Block(ctx context.Context, in *BlockRequest, opts ... } func (c *eTHBACKENDClient) TxnLookup(ctx context.Context, in *TxnLookupRequest, opts ...grpc.CallOption) (*TxnLookupReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TxnLookupReply) - err := c.cc.Invoke(ctx, ETHBACKEND_TxnLookup_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_TxnLookup_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -215,8 +225,9 @@ func (c *eTHBACKENDClient) TxnLookup(ctx context.Context, in *TxnLookupRequest, } func (c *eTHBACKENDClient) NodeInfo(ctx context.Context, in *NodesInfoRequest, opts ...grpc.CallOption) (*NodesInfoReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NodesInfoReply) - err := c.cc.Invoke(ctx, ETHBACKEND_NodeInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_NodeInfo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -224,8 +235,9 @@ func (c *eTHBACKENDClient) NodeInfo(ctx context.Context, in *NodesInfoRequest, o } func (c *eTHBACKENDClient) Peers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PeersReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeersReply) - err := c.cc.Invoke(ctx, ETHBACKEND_Peers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_Peers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -233,8 +245,9 @@ func (c *eTHBACKENDClient) Peers(ctx context.Context, in *emptypb.Empty, opts .. } func (c *eTHBACKENDClient) AddPeer(ctx context.Context, in *AddPeerRequest, opts ...grpc.CallOption) (*AddPeerReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AddPeerReply) - err := c.cc.Invoke(ctx, ETHBACKEND_AddPeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_AddPeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -242,8 +255,9 @@ func (c *eTHBACKENDClient) AddPeer(ctx context.Context, in *AddPeerRequest, opts } func (c *eTHBACKENDClient) PendingBlock(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PendingBlockReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PendingBlockReply) - err := c.cc.Invoke(ctx, ETHBACKEND_PendingBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_PendingBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -251,8 +265,9 @@ func (c *eTHBACKENDClient) PendingBlock(ctx context.Context, in *emptypb.Empty, } func (c *eTHBACKENDClient) BorEvent(ctx context.Context, in *BorEventRequest, opts ...grpc.CallOption) (*BorEventReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BorEventReply) - err := c.cc.Invoke(ctx, ETHBACKEND_BorEvent_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ETHBACKEND_BorEvent_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -468,7 +483,7 @@ func _ETHBACKEND_Subscribe_Handler(srv interface{}, stream grpc.ServerStream) er if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ETHBACKENDServer).Subscribe(m, &eTHBACKENDSubscribeServer{stream}) + return srv.(ETHBACKENDServer).Subscribe(m, &eTHBACKENDSubscribeServer{ServerStream: stream}) } type ETHBACKEND_SubscribeServer interface { @@ -485,7 +500,7 @@ func (x *eTHBACKENDSubscribeServer) Send(m *SubscribeReply) error { } func _ETHBACKEND_SubscribeLogs_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(ETHBACKENDServer).SubscribeLogs(&eTHBACKENDSubscribeLogsServer{stream}) + return srv.(ETHBACKENDServer).SubscribeLogs(&eTHBACKENDSubscribeLogsServer{ServerStream: stream}) } type ETHBACKEND_SubscribeLogsServer interface { diff --git a/erigon-lib/gointerfaces/remote/kv.pb.go b/erigon-lib/gointerfaces/remote/kv.pb.go index a7f659b68a7..822f4d19d3e 100644 --- a/erigon-lib/gointerfaces/remote/kv.pb.go +++ b/erigon-lib/gointerfaces/remote/kv.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: remote/kv.proto package remote @@ -2044,7 +2044,7 @@ func file_remote_kv_proto_rawDescGZIP() []byte { var file_remote_kv_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_remote_kv_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_remote_kv_proto_goTypes = []interface{}{ +var file_remote_kv_proto_goTypes = []any{ (Op)(0), // 0: remote.Op (Action)(0), // 1: remote.Action (Direction)(0), // 2: remote.Direction @@ -2117,7 +2117,7 @@ func file_remote_kv_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_remote_kv_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Cursor); i { case 0: return &v.state @@ -2129,7 +2129,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Pair); i { case 0: return &v.state @@ -2141,7 +2141,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*StorageChange); i { case 0: return &v.state @@ -2153,7 +2153,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*AccountChange); i { case 0: return &v.state @@ -2165,7 +2165,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*StateChangeBatch); i { case 0: return &v.state @@ -2177,7 +2177,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*StateChange); i { case 0: return &v.state @@ -2189,7 +2189,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*StateChangeRequest); i { case 0: return &v.state @@ -2201,7 +2201,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*SnapshotsRequest); i { case 0: return &v.state @@ -2213,7 +2213,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*SnapshotsReply); i { case 0: return &v.state @@ -2225,7 +2225,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*RangeReq); i { case 0: return &v.state @@ -2237,7 +2237,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*DomainGetReq); i { case 0: return &v.state @@ -2249,7 +2249,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*DomainGetReply); i { case 0: return &v.state @@ -2261,7 +2261,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*HistoryGetReq); i { case 0: return &v.state @@ -2273,7 +2273,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*HistoryGetReply); i { case 0: return &v.state @@ -2285,7 +2285,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*IndexRangeReq); i { case 0: return &v.state @@ -2297,7 +2297,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*IndexRangeReply); i { case 0: return &v.state @@ -2309,7 +2309,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*HistoryRangeReq); i { case 0: return &v.state @@ -2321,7 +2321,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*DomainRangeReq); i { case 0: return &v.state @@ -2333,7 +2333,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*Pairs); i { case 0: return &v.state @@ -2345,7 +2345,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*ParisPagination); i { case 0: return &v.state @@ -2357,7 +2357,7 @@ func file_remote_kv_proto_init() { return nil } } - file_remote_kv_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_remote_kv_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*IndexPagination); i { case 0: return &v.state diff --git a/erigon-lib/gointerfaces/remote/kv_grpc.pb.go b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go index d0305cb0fb4..56977fd552f 100644 --- a/erigon-lib/gointerfaces/remote/kv_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: remote/kv.proto package remote @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( KV_Version_FullMethodName = "/remote.KV/Version" @@ -36,6 +36,8 @@ const ( // KVClient is the client API for KV service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// Provides methods to access key-value data type KVClient interface { // Version returns the service version number Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) @@ -70,8 +72,9 @@ func NewKVClient(cc grpc.ClientConnInterface) KVClient { } func (c *kVClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(types.VersionReply) - err := c.cc.Invoke(ctx, KV_Version_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_Version_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -79,11 +82,12 @@ func (c *kVClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc. } func (c *kVClient) Tx(ctx context.Context, opts ...grpc.CallOption) (KV_TxClient, error) { - stream, err := c.cc.NewStream(ctx, &KV_ServiceDesc.Streams[0], KV_Tx_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &KV_ServiceDesc.Streams[0], KV_Tx_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &kVTxClient{stream} + x := &kVTxClient{ClientStream: stream} return x, nil } @@ -110,11 +114,12 @@ func (x *kVTxClient) Recv() (*Pair, error) { } func (c *kVClient) StateChanges(ctx context.Context, in *StateChangeRequest, opts ...grpc.CallOption) (KV_StateChangesClient, error) { - stream, err := c.cc.NewStream(ctx, &KV_ServiceDesc.Streams[1], KV_StateChanges_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &KV_ServiceDesc.Streams[1], KV_StateChanges_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &kVStateChangesClient{stream} + x := &kVStateChangesClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -142,8 +147,9 @@ func (x *kVStateChangesClient) Recv() (*StateChangeBatch, error) { } func (c *kVClient) Snapshots(ctx context.Context, in *SnapshotsRequest, opts ...grpc.CallOption) (*SnapshotsReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SnapshotsReply) - err := c.cc.Invoke(ctx, KV_Snapshots_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_Snapshots_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -151,8 +157,9 @@ func (c *kVClient) Snapshots(ctx context.Context, in *SnapshotsRequest, opts ... } func (c *kVClient) Range(ctx context.Context, in *RangeReq, opts ...grpc.CallOption) (*Pairs, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Pairs) - err := c.cc.Invoke(ctx, KV_Range_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_Range_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -160,8 +167,9 @@ func (c *kVClient) Range(ctx context.Context, in *RangeReq, opts ...grpc.CallOpt } func (c *kVClient) DomainGet(ctx context.Context, in *DomainGetReq, opts ...grpc.CallOption) (*DomainGetReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DomainGetReply) - err := c.cc.Invoke(ctx, KV_DomainGet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_DomainGet_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -169,8 +177,9 @@ func (c *kVClient) DomainGet(ctx context.Context, in *DomainGetReq, opts ...grpc } func (c *kVClient) HistoryGet(ctx context.Context, in *HistoryGetReq, opts ...grpc.CallOption) (*HistoryGetReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HistoryGetReply) - err := c.cc.Invoke(ctx, KV_HistoryGet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_HistoryGet_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -178,8 +187,9 @@ func (c *kVClient) HistoryGet(ctx context.Context, in *HistoryGetReq, opts ...gr } func (c *kVClient) IndexRange(ctx context.Context, in *IndexRangeReq, opts ...grpc.CallOption) (*IndexRangeReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(IndexRangeReply) - err := c.cc.Invoke(ctx, KV_IndexRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_IndexRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -187,8 +197,9 @@ func (c *kVClient) IndexRange(ctx context.Context, in *IndexRangeReq, opts ...gr } func (c *kVClient) HistoryRange(ctx context.Context, in *HistoryRangeReq, opts ...grpc.CallOption) (*Pairs, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Pairs) - err := c.cc.Invoke(ctx, KV_HistoryRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_HistoryRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -196,8 +207,9 @@ func (c *kVClient) HistoryRange(ctx context.Context, in *HistoryRangeReq, opts . } func (c *kVClient) DomainRange(ctx context.Context, in *DomainRangeReq, opts ...grpc.CallOption) (*Pairs, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Pairs) - err := c.cc.Invoke(ctx, KV_DomainRange_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, KV_DomainRange_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -207,6 +219,8 @@ func (c *kVClient) DomainRange(ctx context.Context, in *DomainRangeReq, opts ... // KVServer is the server API for KV service. // All implementations must embed UnimplementedKVServer // for forward compatibility +// +// Provides methods to access key-value data type KVServer interface { // Version returns the service version number Version(context.Context, *emptypb.Empty) (*types.VersionReply, error) @@ -299,7 +313,7 @@ func _KV_Version_Handler(srv interface{}, ctx context.Context, dec func(interfac } func _KV_Tx_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(KVServer).Tx(&kVTxServer{stream}) + return srv.(KVServer).Tx(&kVTxServer{ServerStream: stream}) } type KV_TxServer interface { @@ -329,7 +343,7 @@ func _KV_StateChanges_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(KVServer).StateChanges(m, &kVStateChangesServer{stream}) + return srv.(KVServer).StateChanges(m, &kVStateChangesServer{ServerStream: stream}) } type KV_StateChangesServer interface { diff --git a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go index 3feb6ff3531..1ba10c903b8 100644 --- a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go +++ b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: p2psentinel/sentinel.proto package sentinel @@ -1001,7 +1001,7 @@ func file_p2psentinel_sentinel_proto_rawDescGZIP() []byte { } var file_p2psentinel_sentinel_proto_msgTypes = make([]protoimpl.MessageInfo, 13) -var file_p2psentinel_sentinel_proto_goTypes = []interface{}{ +var file_p2psentinel_sentinel_proto_goTypes = []any{ (*EmptyMessage)(nil), // 0: sentinel.EmptyMessage (*SubscriptionData)(nil), // 1: sentinel.SubscriptionData (*Peer)(nil), // 2: sentinel.Peer @@ -1061,7 +1061,7 @@ func file_p2psentinel_sentinel_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_p2psentinel_sentinel_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*EmptyMessage); i { case 0: return &v.state @@ -1073,7 +1073,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*SubscriptionData); i { case 0: return &v.state @@ -1085,7 +1085,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Peer); i { case 0: return &v.state @@ -1097,7 +1097,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*PeersInfoRequest); i { case 0: return &v.state @@ -1109,7 +1109,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*PeersInfoResponse); i { case 0: return &v.state @@ -1121,7 +1121,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*GossipData); i { case 0: return &v.state @@ -1133,7 +1133,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*Status); i { case 0: return &v.state @@ -1145,7 +1145,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*PeerCount); i { case 0: return &v.state @@ -1157,7 +1157,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*RequestData); i { case 0: return &v.state @@ -1169,7 +1169,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*ResponseData); i { case 0: return &v.state @@ -1181,7 +1181,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*Metadata); i { case 0: return &v.state @@ -1193,7 +1193,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*IdentityResponse); i { case 0: return &v.state @@ -1205,7 +1205,7 @@ func file_p2psentinel_sentinel_proto_init() { return nil } } - file_p2psentinel_sentinel_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_p2psentinel_sentinel_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*RequestSubscribeExpiry); i { case 0: return &v.state @@ -1218,9 +1218,9 @@ func file_p2psentinel_sentinel_proto_init() { } } } - file_p2psentinel_sentinel_proto_msgTypes[1].OneofWrappers = []interface{}{} - file_p2psentinel_sentinel_proto_msgTypes[3].OneofWrappers = []interface{}{} - file_p2psentinel_sentinel_proto_msgTypes[5].OneofWrappers = []interface{}{} + file_p2psentinel_sentinel_proto_msgTypes[1].OneofWrappers = []any{} + file_p2psentinel_sentinel_proto_msgTypes[3].OneofWrappers = []any{} + file_p2psentinel_sentinel_proto_msgTypes[5].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/erigon-lib/gointerfaces/sentinel/sentinel_grpc.pb.go b/erigon-lib/gointerfaces/sentinel/sentinel_grpc.pb.go index f0092b9b6ac..a4af0560ca5 100644 --- a/erigon-lib/gointerfaces/sentinel/sentinel_grpc.pb.go +++ b/erigon-lib/gointerfaces/sentinel/sentinel_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: p2psentinel/sentinel.proto package sentinel @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Sentinel_SetSubscribeExpiry_FullMethodName = "/sentinel.Sentinel/SetSubscribeExpiry" @@ -60,8 +60,9 @@ func NewSentinelClient(cc grpc.ClientConnInterface) SentinelClient { } func (c *sentinelClient) SetSubscribeExpiry(ctx context.Context, in *RequestSubscribeExpiry, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_SetSubscribeExpiry_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_SetSubscribeExpiry_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -69,11 +70,12 @@ func (c *sentinelClient) SetSubscribeExpiry(ctx context.Context, in *RequestSubs } func (c *sentinelClient) SubscribeGossip(ctx context.Context, in *SubscriptionData, opts ...grpc.CallOption) (Sentinel_SubscribeGossipClient, error) { - stream, err := c.cc.NewStream(ctx, &Sentinel_ServiceDesc.Streams[0], Sentinel_SubscribeGossip_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Sentinel_ServiceDesc.Streams[0], Sentinel_SubscribeGossip_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &sentinelSubscribeGossipClient{stream} + x := &sentinelSubscribeGossipClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -101,8 +103,9 @@ func (x *sentinelSubscribeGossipClient) Recv() (*GossipData, error) { } func (c *sentinelClient) SendRequest(ctx context.Context, in *RequestData, opts ...grpc.CallOption) (*ResponseData, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ResponseData) - err := c.cc.Invoke(ctx, Sentinel_SendRequest_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_SendRequest_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -110,8 +113,9 @@ func (c *sentinelClient) SendRequest(ctx context.Context, in *RequestData, opts } func (c *sentinelClient) SetStatus(ctx context.Context, in *Status, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_SetStatus_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_SetStatus_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -119,8 +123,9 @@ func (c *sentinelClient) SetStatus(ctx context.Context, in *Status, opts ...grpc } func (c *sentinelClient) GetPeers(ctx context.Context, in *EmptyMessage, opts ...grpc.CallOption) (*PeerCount, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeerCount) - err := c.cc.Invoke(ctx, Sentinel_GetPeers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_GetPeers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -128,8 +133,9 @@ func (c *sentinelClient) GetPeers(ctx context.Context, in *EmptyMessage, opts .. } func (c *sentinelClient) BanPeer(ctx context.Context, in *Peer, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_BanPeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_BanPeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -137,8 +143,9 @@ func (c *sentinelClient) BanPeer(ctx context.Context, in *Peer, opts ...grpc.Cal } func (c *sentinelClient) UnbanPeer(ctx context.Context, in *Peer, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_UnbanPeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_UnbanPeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -146,8 +153,9 @@ func (c *sentinelClient) UnbanPeer(ctx context.Context, in *Peer, opts ...grpc.C } func (c *sentinelClient) PenalizePeer(ctx context.Context, in *Peer, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_PenalizePeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_PenalizePeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -155,8 +163,9 @@ func (c *sentinelClient) PenalizePeer(ctx context.Context, in *Peer, opts ...grp } func (c *sentinelClient) RewardPeer(ctx context.Context, in *Peer, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_RewardPeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_RewardPeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -164,8 +173,9 @@ func (c *sentinelClient) RewardPeer(ctx context.Context, in *Peer, opts ...grpc. } func (c *sentinelClient) PublishGossip(ctx context.Context, in *GossipData, opts ...grpc.CallOption) (*EmptyMessage, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EmptyMessage) - err := c.cc.Invoke(ctx, Sentinel_PublishGossip_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_PublishGossip_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -173,8 +183,9 @@ func (c *sentinelClient) PublishGossip(ctx context.Context, in *GossipData, opts } func (c *sentinelClient) Identity(ctx context.Context, in *EmptyMessage, opts ...grpc.CallOption) (*IdentityResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(IdentityResponse) - err := c.cc.Invoke(ctx, Sentinel_Identity_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_Identity_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -182,8 +193,9 @@ func (c *sentinelClient) Identity(ctx context.Context, in *EmptyMessage, opts .. } func (c *sentinelClient) PeersInfo(ctx context.Context, in *PeersInfoRequest, opts ...grpc.CallOption) (*PeersInfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeersInfoResponse) - err := c.cc.Invoke(ctx, Sentinel_PeersInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentinel_PeersInfo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -285,7 +297,7 @@ func _Sentinel_SubscribeGossip_Handler(srv interface{}, stream grpc.ServerStream if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SentinelServer).SubscribeGossip(m, &sentinelSubscribeGossipServer{stream}) + return srv.(SentinelServer).SubscribeGossip(m, &sentinelSubscribeGossipServer{ServerStream: stream}) } type Sentinel_SubscribeGossipServer interface { diff --git a/erigon-lib/gointerfaces/sentry/sentry.pb.go b/erigon-lib/gointerfaces/sentry/sentry.pb.go index 87710f44292..0f2ab5d8714 100644 --- a/erigon-lib/gointerfaces/sentry/sentry.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: p2psentry/sentry.proto package sentry @@ -1775,7 +1775,7 @@ func file_p2psentry_sentry_proto_rawDescGZIP() []byte { var file_p2psentry_sentry_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_p2psentry_sentry_proto_msgTypes = make([]protoimpl.MessageInfo, 23) -var file_p2psentry_sentry_proto_goTypes = []interface{}{ +var file_p2psentry_sentry_proto_goTypes = []any{ (MessageId)(0), // 0: sentry.MessageId (PenaltyKind)(0), // 1: sentry.PenaltyKind (Protocol)(0), // 2: sentry.Protocol @@ -1877,7 +1877,7 @@ func file_p2psentry_sentry_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_p2psentry_sentry_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OutboundMessageData); i { case 0: return &v.state @@ -1889,7 +1889,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*SendMessageByMinBlockRequest); i { case 0: return &v.state @@ -1901,7 +1901,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*SendMessageByIdRequest); i { case 0: return &v.state @@ -1913,7 +1913,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*SendMessageToRandomPeersRequest); i { case 0: return &v.state @@ -1925,7 +1925,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*SentPeers); i { case 0: return &v.state @@ -1937,7 +1937,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*PenalizePeerRequest); i { case 0: return &v.state @@ -1949,7 +1949,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*PeerMinBlockRequest); i { case 0: return &v.state @@ -1961,7 +1961,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*AddPeerRequest); i { case 0: return &v.state @@ -1973,7 +1973,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*InboundMessage); i { case 0: return &v.state @@ -1985,7 +1985,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*Forks); i { case 0: return &v.state @@ -1997,7 +1997,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*StatusData); i { case 0: return &v.state @@ -2009,7 +2009,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*SetStatusReply); i { case 0: return &v.state @@ -2021,7 +2021,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*HandShakeReply); i { case 0: return &v.state @@ -2033,7 +2033,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*MessagesRequest); i { case 0: return &v.state @@ -2045,7 +2045,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*PeersReply); i { case 0: return &v.state @@ -2057,7 +2057,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*PeerCountRequest); i { case 0: return &v.state @@ -2069,7 +2069,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*PeerCountPerProtocol); i { case 0: return &v.state @@ -2081,7 +2081,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*PeerCountReply); i { case 0: return &v.state @@ -2093,7 +2093,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*PeerByIdRequest); i { case 0: return &v.state @@ -2105,7 +2105,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*PeerByIdReply); i { case 0: return &v.state @@ -2117,7 +2117,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*PeerEventsRequest); i { case 0: return &v.state @@ -2129,7 +2129,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*PeerEvent); i { case 0: return &v.state @@ -2141,7 +2141,7 @@ func file_p2psentry_sentry_proto_init() { return nil } } - file_p2psentry_sentry_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_p2psentry_sentry_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*AddPeerReply); i { case 0: return &v.state @@ -2154,7 +2154,7 @@ func file_p2psentry_sentry_proto_init() { } } } - file_p2psentry_sentry_proto_msgTypes[19].OneofWrappers = []interface{}{} + file_p2psentry_sentry_proto_msgTypes[19].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go index 1a9d1959b5c..30931a2f590 100644 --- a/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: p2psentry/sentry.proto package sentry @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Sentry_SetStatus_FullMethodName = "/sentry.Sentry/SetStatus" @@ -76,8 +76,9 @@ func NewSentryClient(cc grpc.ClientConnInterface) SentryClient { } func (c *sentryClient) SetStatus(ctx context.Context, in *StatusData, opts ...grpc.CallOption) (*SetStatusReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SetStatusReply) - err := c.cc.Invoke(ctx, Sentry_SetStatus_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_SetStatus_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -85,8 +86,9 @@ func (c *sentryClient) SetStatus(ctx context.Context, in *StatusData, opts ...gr } func (c *sentryClient) PenalizePeer(ctx context.Context, in *PenalizePeerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Sentry_PenalizePeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_PenalizePeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -94,8 +96,9 @@ func (c *sentryClient) PenalizePeer(ctx context.Context, in *PenalizePeerRequest } func (c *sentryClient) PeerMinBlock(ctx context.Context, in *PeerMinBlockRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Sentry_PeerMinBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_PeerMinBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -103,8 +106,9 @@ func (c *sentryClient) PeerMinBlock(ctx context.Context, in *PeerMinBlockRequest } func (c *sentryClient) HandShake(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*HandShakeReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HandShakeReply) - err := c.cc.Invoke(ctx, Sentry_HandShake_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_HandShake_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -112,8 +116,9 @@ func (c *sentryClient) HandShake(ctx context.Context, in *emptypb.Empty, opts .. } func (c *sentryClient) SendMessageByMinBlock(ctx context.Context, in *SendMessageByMinBlockRequest, opts ...grpc.CallOption) (*SentPeers, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SentPeers) - err := c.cc.Invoke(ctx, Sentry_SendMessageByMinBlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_SendMessageByMinBlock_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -121,8 +126,9 @@ func (c *sentryClient) SendMessageByMinBlock(ctx context.Context, in *SendMessag } func (c *sentryClient) SendMessageById(ctx context.Context, in *SendMessageByIdRequest, opts ...grpc.CallOption) (*SentPeers, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SentPeers) - err := c.cc.Invoke(ctx, Sentry_SendMessageById_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_SendMessageById_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -130,8 +136,9 @@ func (c *sentryClient) SendMessageById(ctx context.Context, in *SendMessageByIdR } func (c *sentryClient) SendMessageToRandomPeers(ctx context.Context, in *SendMessageToRandomPeersRequest, opts ...grpc.CallOption) (*SentPeers, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SentPeers) - err := c.cc.Invoke(ctx, Sentry_SendMessageToRandomPeers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_SendMessageToRandomPeers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -139,8 +146,9 @@ func (c *sentryClient) SendMessageToRandomPeers(ctx context.Context, in *SendMes } func (c *sentryClient) SendMessageToAll(ctx context.Context, in *OutboundMessageData, opts ...grpc.CallOption) (*SentPeers, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SentPeers) - err := c.cc.Invoke(ctx, Sentry_SendMessageToAll_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_SendMessageToAll_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -148,11 +156,12 @@ func (c *sentryClient) SendMessageToAll(ctx context.Context, in *OutboundMessage } func (c *sentryClient) Messages(ctx context.Context, in *MessagesRequest, opts ...grpc.CallOption) (Sentry_MessagesClient, error) { - stream, err := c.cc.NewStream(ctx, &Sentry_ServiceDesc.Streams[0], Sentry_Messages_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Sentry_ServiceDesc.Streams[0], Sentry_Messages_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &sentryMessagesClient{stream} + x := &sentryMessagesClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -180,8 +189,9 @@ func (x *sentryMessagesClient) Recv() (*InboundMessage, error) { } func (c *sentryClient) Peers(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PeersReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeersReply) - err := c.cc.Invoke(ctx, Sentry_Peers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_Peers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -189,8 +199,9 @@ func (c *sentryClient) Peers(ctx context.Context, in *emptypb.Empty, opts ...grp } func (c *sentryClient) PeerCount(ctx context.Context, in *PeerCountRequest, opts ...grpc.CallOption) (*PeerCountReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeerCountReply) - err := c.cc.Invoke(ctx, Sentry_PeerCount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_PeerCount_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -198,8 +209,9 @@ func (c *sentryClient) PeerCount(ctx context.Context, in *PeerCountRequest, opts } func (c *sentryClient) PeerById(ctx context.Context, in *PeerByIdRequest, opts ...grpc.CallOption) (*PeerByIdReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PeerByIdReply) - err := c.cc.Invoke(ctx, Sentry_PeerById_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_PeerById_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -207,11 +219,12 @@ func (c *sentryClient) PeerById(ctx context.Context, in *PeerByIdRequest, opts . } func (c *sentryClient) PeerEvents(ctx context.Context, in *PeerEventsRequest, opts ...grpc.CallOption) (Sentry_PeerEventsClient, error) { - stream, err := c.cc.NewStream(ctx, &Sentry_ServiceDesc.Streams[1], Sentry_PeerEvents_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Sentry_ServiceDesc.Streams[1], Sentry_PeerEvents_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &sentryPeerEventsClient{stream} + x := &sentryPeerEventsClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -239,8 +252,9 @@ func (x *sentryPeerEventsClient) Recv() (*PeerEvent, error) { } func (c *sentryClient) AddPeer(ctx context.Context, in *AddPeerRequest, opts ...grpc.CallOption) (*AddPeerReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AddPeerReply) - err := c.cc.Invoke(ctx, Sentry_AddPeer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_AddPeer_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -248,8 +262,9 @@ func (c *sentryClient) AddPeer(ctx context.Context, in *AddPeerRequest, opts ... } func (c *sentryClient) NodeInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.NodeInfoReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(types.NodeInfoReply) - err := c.cc.Invoke(ctx, Sentry_NodeInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Sentry_NodeInfo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -497,7 +512,7 @@ func _Sentry_Messages_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SentryServer).Messages(m, &sentryMessagesServer{stream}) + return srv.(SentryServer).Messages(m, &sentryMessagesServer{ServerStream: stream}) } type Sentry_MessagesServer interface { @@ -572,7 +587,7 @@ func _Sentry_PeerEvents_Handler(srv interface{}, stream grpc.ServerStream) error if err := stream.RecvMsg(m); err != nil { return err } - return srv.(SentryServer).PeerEvents(m, &sentryPeerEventsServer{stream}) + return srv.(SentryServer).PeerEvents(m, &sentryPeerEventsServer{ServerStream: stream}) } type Sentry_PeerEventsServer interface { diff --git a/erigon-lib/gointerfaces/txpool/mining.pb.go b/erigon-lib/gointerfaces/txpool/mining.pb.go index 20b3e0bd7e6..284a768d4a2 100644 --- a/erigon-lib/gointerfaces/txpool/mining.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: txpool/mining.proto package txpool @@ -887,7 +887,7 @@ func file_txpool_mining_proto_rawDescGZIP() []byte { } var file_txpool_mining_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_txpool_mining_proto_goTypes = []interface{}{ +var file_txpool_mining_proto_goTypes = []any{ (*OnPendingBlockRequest)(nil), // 0: txpool.OnPendingBlockRequest (*OnPendingBlockReply)(nil), // 1: txpool.OnPendingBlockReply (*OnMinedBlockRequest)(nil), // 2: txpool.OnMinedBlockRequest @@ -939,7 +939,7 @@ func file_txpool_mining_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_txpool_mining_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OnPendingBlockRequest); i { case 0: return &v.state @@ -951,7 +951,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OnPendingBlockReply); i { case 0: return &v.state @@ -963,7 +963,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*OnMinedBlockRequest); i { case 0: return &v.state @@ -975,7 +975,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*OnMinedBlockReply); i { case 0: return &v.state @@ -987,7 +987,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*OnPendingLogsRequest); i { case 0: return &v.state @@ -999,7 +999,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*OnPendingLogsReply); i { case 0: return &v.state @@ -1011,7 +1011,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*GetWorkRequest); i { case 0: return &v.state @@ -1023,7 +1023,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*GetWorkReply); i { case 0: return &v.state @@ -1035,7 +1035,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*SubmitWorkRequest); i { case 0: return &v.state @@ -1047,7 +1047,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*SubmitWorkReply); i { case 0: return &v.state @@ -1059,7 +1059,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*SubmitHashRateRequest); i { case 0: return &v.state @@ -1071,7 +1071,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*SubmitHashRateReply); i { case 0: return &v.state @@ -1083,7 +1083,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*HashRateRequest); i { case 0: return &v.state @@ -1095,7 +1095,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*HashRateReply); i { case 0: return &v.state @@ -1107,7 +1107,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*MiningRequest); i { case 0: return &v.state @@ -1119,7 +1119,7 @@ func file_txpool_mining_proto_init() { return nil } } - file_txpool_mining_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_txpool_mining_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*MiningReply); i { case 0: return &v.state diff --git a/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go index c8855bfb6e3..75e47a608b1 100644 --- a/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: txpool/mining.proto package txpool @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Mining_Version_FullMethodName = "/txpool.Mining/Version" @@ -79,8 +79,9 @@ func NewMiningClient(cc grpc.ClientConnInterface) MiningClient { } func (c *miningClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(types.VersionReply) - err := c.cc.Invoke(ctx, Mining_Version_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_Version_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -88,11 +89,12 @@ func (c *miningClient) Version(ctx context.Context, in *emptypb.Empty, opts ...g } func (c *miningClient) OnPendingBlock(ctx context.Context, in *OnPendingBlockRequest, opts ...grpc.CallOption) (Mining_OnPendingBlockClient, error) { - stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[0], Mining_OnPendingBlock_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[0], Mining_OnPendingBlock_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &miningOnPendingBlockClient{stream} + x := &miningOnPendingBlockClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -120,11 +122,12 @@ func (x *miningOnPendingBlockClient) Recv() (*OnPendingBlockReply, error) { } func (c *miningClient) OnMinedBlock(ctx context.Context, in *OnMinedBlockRequest, opts ...grpc.CallOption) (Mining_OnMinedBlockClient, error) { - stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[1], Mining_OnMinedBlock_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[1], Mining_OnMinedBlock_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &miningOnMinedBlockClient{stream} + x := &miningOnMinedBlockClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -152,11 +155,12 @@ func (x *miningOnMinedBlockClient) Recv() (*OnMinedBlockReply, error) { } func (c *miningClient) OnPendingLogs(ctx context.Context, in *OnPendingLogsRequest, opts ...grpc.CallOption) (Mining_OnPendingLogsClient, error) { - stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[2], Mining_OnPendingLogs_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Mining_ServiceDesc.Streams[2], Mining_OnPendingLogs_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &miningOnPendingLogsClient{stream} + x := &miningOnPendingLogsClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -184,8 +188,9 @@ func (x *miningOnPendingLogsClient) Recv() (*OnPendingLogsReply, error) { } func (c *miningClient) GetWork(ctx context.Context, in *GetWorkRequest, opts ...grpc.CallOption) (*GetWorkReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetWorkReply) - err := c.cc.Invoke(ctx, Mining_GetWork_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_GetWork_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -193,8 +198,9 @@ func (c *miningClient) GetWork(ctx context.Context, in *GetWorkRequest, opts ... } func (c *miningClient) SubmitWork(ctx context.Context, in *SubmitWorkRequest, opts ...grpc.CallOption) (*SubmitWorkReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SubmitWorkReply) - err := c.cc.Invoke(ctx, Mining_SubmitWork_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_SubmitWork_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -202,8 +208,9 @@ func (c *miningClient) SubmitWork(ctx context.Context, in *SubmitWorkRequest, op } func (c *miningClient) SubmitHashRate(ctx context.Context, in *SubmitHashRateRequest, opts ...grpc.CallOption) (*SubmitHashRateReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SubmitHashRateReply) - err := c.cc.Invoke(ctx, Mining_SubmitHashRate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_SubmitHashRate_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -211,8 +218,9 @@ func (c *miningClient) SubmitHashRate(ctx context.Context, in *SubmitHashRateReq } func (c *miningClient) HashRate(ctx context.Context, in *HashRateRequest, opts ...grpc.CallOption) (*HashRateReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(HashRateReply) - err := c.cc.Invoke(ctx, Mining_HashRate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_HashRate_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -220,8 +228,9 @@ func (c *miningClient) HashRate(ctx context.Context, in *HashRateRequest, opts . } func (c *miningClient) Mining(ctx context.Context, in *MiningRequest, opts ...grpc.CallOption) (*MiningReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MiningReply) - err := c.cc.Invoke(ctx, Mining_Mining_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Mining_Mining_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -334,7 +343,7 @@ func _Mining_OnPendingBlock_Handler(srv interface{}, stream grpc.ServerStream) e if err := stream.RecvMsg(m); err != nil { return err } - return srv.(MiningServer).OnPendingBlock(m, &miningOnPendingBlockServer{stream}) + return srv.(MiningServer).OnPendingBlock(m, &miningOnPendingBlockServer{ServerStream: stream}) } type Mining_OnPendingBlockServer interface { @@ -355,7 +364,7 @@ func _Mining_OnMinedBlock_Handler(srv interface{}, stream grpc.ServerStream) err if err := stream.RecvMsg(m); err != nil { return err } - return srv.(MiningServer).OnMinedBlock(m, &miningOnMinedBlockServer{stream}) + return srv.(MiningServer).OnMinedBlock(m, &miningOnMinedBlockServer{ServerStream: stream}) } type Mining_OnMinedBlockServer interface { @@ -376,7 +385,7 @@ func _Mining_OnPendingLogs_Handler(srv interface{}, stream grpc.ServerStream) er if err := stream.RecvMsg(m); err != nil { return err } - return srv.(MiningServer).OnPendingLogs(m, &miningOnPendingLogsServer{stream}) + return srv.(MiningServer).OnPendingLogs(m, &miningOnPendingLogsServer{ServerStream: stream}) } type Mining_OnPendingLogsServer interface { diff --git a/erigon-lib/gointerfaces/txpool/txpool.pb.go b/erigon-lib/gointerfaces/txpool/txpool.pb.go index 52b9b02def1..c5f08051e25 100644 --- a/erigon-lib/gointerfaces/txpool/txpool.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: txpool/txpool.proto package txpool @@ -1043,7 +1043,7 @@ func file_txpool_txpool_proto_rawDescGZIP() []byte { var file_txpool_txpool_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_txpool_txpool_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_txpool_txpool_proto_goTypes = []interface{}{ +var file_txpool_txpool_proto_goTypes = []any{ (ImportResult)(0), // 0: txpool.ImportResult (AllReply_TxnType)(0), // 1: txpool.AllReply.TxnType (*TxHashes)(nil), // 2: txpool.TxHashes @@ -1108,7 +1108,7 @@ func file_txpool_txpool_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_txpool_txpool_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*TxHashes); i { case 0: return &v.state @@ -1120,7 +1120,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*AddRequest); i { case 0: return &v.state @@ -1132,7 +1132,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*AddReply); i { case 0: return &v.state @@ -1144,7 +1144,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*TransactionsRequest); i { case 0: return &v.state @@ -1156,7 +1156,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*TransactionsReply); i { case 0: return &v.state @@ -1168,7 +1168,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*OnAddRequest); i { case 0: return &v.state @@ -1180,7 +1180,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*OnAddReply); i { case 0: return &v.state @@ -1192,7 +1192,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*AllRequest); i { case 0: return &v.state @@ -1204,7 +1204,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*AllReply); i { case 0: return &v.state @@ -1216,7 +1216,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*PendingReply); i { case 0: return &v.state @@ -1228,7 +1228,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*StatusRequest); i { case 0: return &v.state @@ -1240,7 +1240,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*StatusReply); i { case 0: return &v.state @@ -1252,7 +1252,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*NonceRequest); i { case 0: return &v.state @@ -1264,7 +1264,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*NonceReply); i { case 0: return &v.state @@ -1276,7 +1276,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*AllReply_Tx); i { case 0: return &v.state @@ -1288,7 +1288,7 @@ func file_txpool_txpool_proto_init() { return nil } } - file_txpool_txpool_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_txpool_txpool_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*PendingReply_Tx); i { case 0: return &v.state diff --git a/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go index d8c6da0d0a6..5abdd5cb588 100644 --- a/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.2 +// - protoc-gen-go-grpc v1.4.0 +// - protoc v5.27.1 // source: txpool/txpool.proto package txpool @@ -17,8 +17,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Txpool_Version_FullMethodName = "/txpool.Txpool/Version" @@ -66,8 +66,9 @@ func NewTxpoolClient(cc grpc.ClientConnInterface) TxpoolClient { } func (c *txpoolClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(types.VersionReply) - err := c.cc.Invoke(ctx, Txpool_Version_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Version_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -75,8 +76,9 @@ func (c *txpoolClient) Version(ctx context.Context, in *emptypb.Empty, opts ...g } func (c *txpoolClient) FindUnknown(ctx context.Context, in *TxHashes, opts ...grpc.CallOption) (*TxHashes, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TxHashes) - err := c.cc.Invoke(ctx, Txpool_FindUnknown_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_FindUnknown_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -84,8 +86,9 @@ func (c *txpoolClient) FindUnknown(ctx context.Context, in *TxHashes, opts ...gr } func (c *txpoolClient) Add(ctx context.Context, in *AddRequest, opts ...grpc.CallOption) (*AddReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AddReply) - err := c.cc.Invoke(ctx, Txpool_Add_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Add_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -93,8 +96,9 @@ func (c *txpoolClient) Add(ctx context.Context, in *AddRequest, opts ...grpc.Cal } func (c *txpoolClient) Transactions(ctx context.Context, in *TransactionsRequest, opts ...grpc.CallOption) (*TransactionsReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(TransactionsReply) - err := c.cc.Invoke(ctx, Txpool_Transactions_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Transactions_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -102,8 +106,9 @@ func (c *txpoolClient) Transactions(ctx context.Context, in *TransactionsRequest } func (c *txpoolClient) All(ctx context.Context, in *AllRequest, opts ...grpc.CallOption) (*AllReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(AllReply) - err := c.cc.Invoke(ctx, Txpool_All_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_All_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -111,8 +116,9 @@ func (c *txpoolClient) All(ctx context.Context, in *AllRequest, opts ...grpc.Cal } func (c *txpoolClient) Pending(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PendingReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PendingReply) - err := c.cc.Invoke(ctx, Txpool_Pending_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Pending_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -120,11 +126,12 @@ func (c *txpoolClient) Pending(ctx context.Context, in *emptypb.Empty, opts ...g } func (c *txpoolClient) OnAdd(ctx context.Context, in *OnAddRequest, opts ...grpc.CallOption) (Txpool_OnAddClient, error) { - stream, err := c.cc.NewStream(ctx, &Txpool_ServiceDesc.Streams[0], Txpool_OnAdd_FullMethodName, opts...) + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Txpool_ServiceDesc.Streams[0], Txpool_OnAdd_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &txpoolOnAddClient{stream} + x := &txpoolOnAddClient{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -152,8 +159,9 @@ func (x *txpoolOnAddClient) Recv() (*OnAddReply, error) { } func (c *txpoolClient) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(StatusReply) - err := c.cc.Invoke(ctx, Txpool_Status_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Status_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -161,8 +169,9 @@ func (c *txpoolClient) Status(ctx context.Context, in *StatusRequest, opts ...gr } func (c *txpoolClient) Nonce(ctx context.Context, in *NonceRequest, opts ...grpc.CallOption) (*NonceReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NonceReply) - err := c.cc.Invoke(ctx, Txpool_Nonce_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Txpool_Nonce_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -352,7 +361,7 @@ func _Txpool_OnAdd_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(TxpoolServer).OnAdd(m, &txpoolOnAddServer{stream}) + return srv.(TxpoolServer).OnAdd(m, &txpoolOnAddServer{ServerStream: stream}) } type Txpool_OnAddServer interface { diff --git a/erigon-lib/gointerfaces/types/types.pb.go b/erigon-lib/gointerfaces/types/types.pb.go index adae72de7ec..009532b545b 100644 --- a/erigon-lib/gointerfaces/types/types.pb.go +++ b/erigon-lib/gointerfaces/types/types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.24.2 +// protoc-gen-go v1.34.2 +// protoc v5.27.1 // source: types/types.proto package types @@ -423,24 +423,26 @@ type ExecutionPayload struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` // v1 - no withdrawals, v2 - with withdrawals, v3 - with blob gas - ParentHash *H256 `protobuf:"bytes,2,opt,name=parent_hash,json=parentHash,proto3" json:"parent_hash,omitempty"` - Coinbase *H160 `protobuf:"bytes,3,opt,name=coinbase,proto3" json:"coinbase,omitempty"` - StateRoot *H256 `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty"` - ReceiptRoot *H256 `protobuf:"bytes,5,opt,name=receipt_root,json=receiptRoot,proto3" json:"receipt_root,omitempty"` - LogsBloom *H2048 `protobuf:"bytes,6,opt,name=logs_bloom,json=logsBloom,proto3" json:"logs_bloom,omitempty"` - PrevRandao *H256 `protobuf:"bytes,7,opt,name=prev_randao,json=prevRandao,proto3" json:"prev_randao,omitempty"` - BlockNumber uint64 `protobuf:"varint,8,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"` - GasLimit uint64 `protobuf:"varint,9,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` - GasUsed uint64 `protobuf:"varint,10,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` - Timestamp uint64 `protobuf:"varint,11,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - ExtraData []byte `protobuf:"bytes,12,opt,name=extra_data,json=extraData,proto3" json:"extra_data,omitempty"` - BaseFeePerGas *H256 `protobuf:"bytes,13,opt,name=base_fee_per_gas,json=baseFeePerGas,proto3" json:"base_fee_per_gas,omitempty"` - BlockHash *H256 `protobuf:"bytes,14,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"` - Transactions [][]byte `protobuf:"bytes,15,rep,name=transactions,proto3" json:"transactions,omitempty"` - Withdrawals []*Withdrawal `protobuf:"bytes,16,rep,name=withdrawals,proto3" json:"withdrawals,omitempty"` - BlobGasUsed *uint64 `protobuf:"varint,17,opt,name=blob_gas_used,json=blobGasUsed,proto3,oneof" json:"blob_gas_used,omitempty"` - ExcessBlobGas *uint64 `protobuf:"varint,18,opt,name=excess_blob_gas,json=excessBlobGas,proto3,oneof" json:"excess_blob_gas,omitempty"` + Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` // v1 - no withdrawals, v2 - with withdrawals, v3 - with blob gas + ParentHash *H256 `protobuf:"bytes,2,opt,name=parent_hash,json=parentHash,proto3" json:"parent_hash,omitempty"` + Coinbase *H160 `protobuf:"bytes,3,opt,name=coinbase,proto3" json:"coinbase,omitempty"` + StateRoot *H256 `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty"` + ReceiptRoot *H256 `protobuf:"bytes,5,opt,name=receipt_root,json=receiptRoot,proto3" json:"receipt_root,omitempty"` + LogsBloom *H2048 `protobuf:"bytes,6,opt,name=logs_bloom,json=logsBloom,proto3" json:"logs_bloom,omitempty"` + PrevRandao *H256 `protobuf:"bytes,7,opt,name=prev_randao,json=prevRandao,proto3" json:"prev_randao,omitempty"` + BlockNumber uint64 `protobuf:"varint,8,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"` + GasLimit uint64 `protobuf:"varint,9,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` + GasUsed uint64 `protobuf:"varint,10,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` + Timestamp uint64 `protobuf:"varint,11,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + ExtraData []byte `protobuf:"bytes,12,opt,name=extra_data,json=extraData,proto3" json:"extra_data,omitempty"` + BaseFeePerGas *H256 `protobuf:"bytes,13,opt,name=base_fee_per_gas,json=baseFeePerGas,proto3" json:"base_fee_per_gas,omitempty"` + BlockHash *H256 `protobuf:"bytes,14,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"` + Transactions [][]byte `protobuf:"bytes,15,rep,name=transactions,proto3" json:"transactions,omitempty"` + Withdrawals []*Withdrawal `protobuf:"bytes,16,rep,name=withdrawals,proto3" json:"withdrawals,omitempty"` + BlobGasUsed *uint64 `protobuf:"varint,17,opt,name=blob_gas_used,json=blobGasUsed,proto3,oneof" json:"blob_gas_used,omitempty"` + ExcessBlobGas *uint64 `protobuf:"varint,18,opt,name=excess_blob_gas,json=excessBlobGas,proto3,oneof" json:"excess_blob_gas,omitempty"` + DepositRequests []*DepositRequest `protobuf:"bytes,19,rep,name=deposit_requests,json=depositRequests,proto3" json:"deposit_requests,omitempty"` + WithdrawalRequests []*WithdrawalRequest `protobuf:"bytes,20,rep,name=withdrawal_requests,json=withdrawalRequests,proto3" json:"withdrawal_requests,omitempty"` } func (x *ExecutionPayload) Reset() { @@ -601,6 +603,162 @@ func (x *ExecutionPayload) GetExcessBlobGas() uint64 { return 0 } +func (x *ExecutionPayload) GetDepositRequests() []*DepositRequest { + if x != nil { + return x.DepositRequests + } + return nil +} + +func (x *ExecutionPayload) GetWithdrawalRequests() []*WithdrawalRequest { + if x != nil { + return x.WithdrawalRequests + } + return nil +} + +type DepositRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"` + WithdrawalCredentials *H256 `protobuf:"bytes,2,opt,name=withdrawal_credentials,json=withdrawalCredentials,proto3" json:"withdrawal_credentials,omitempty"` + Amount uint64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + Index uint64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` +} + +func (x *DepositRequest) Reset() { + *x = DepositRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_types_types_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DepositRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DepositRequest) ProtoMessage() {} + +func (x *DepositRequest) ProtoReflect() protoreflect.Message { + mi := &file_types_types_proto_msgTypes[8] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DepositRequest.ProtoReflect.Descriptor instead. +func (*DepositRequest) Descriptor() ([]byte, []int) { + return file_types_types_proto_rawDescGZIP(), []int{8} +} + +func (x *DepositRequest) GetPubkey() []byte { + if x != nil { + return x.Pubkey + } + return nil +} + +func (x *DepositRequest) GetWithdrawalCredentials() *H256 { + if x != nil { + return x.WithdrawalCredentials + } + return nil +} + +func (x *DepositRequest) GetAmount() uint64 { + if x != nil { + return x.Amount + } + return 0 +} + +func (x *DepositRequest) GetSignature() []byte { + if x != nil { + return x.Signature + } + return nil +} + +func (x *DepositRequest) GetIndex() uint64 { + if x != nil { + return x.Index + } + return 0 +} + +type WithdrawalRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SourceAddress *H160 `protobuf:"bytes,1,opt,name=source_address,json=sourceAddress,proto3" json:"source_address,omitempty"` + ValidatorPubkey []byte `protobuf:"bytes,2,opt,name=validator_pubkey,json=validatorPubkey,proto3" json:"validator_pubkey,omitempty"` + Amount uint64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` +} + +func (x *WithdrawalRequest) Reset() { + *x = WithdrawalRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_types_types_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WithdrawalRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WithdrawalRequest) ProtoMessage() {} + +func (x *WithdrawalRequest) ProtoReflect() protoreflect.Message { + mi := &file_types_types_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WithdrawalRequest.ProtoReflect.Descriptor instead. +func (*WithdrawalRequest) Descriptor() ([]byte, []int) { + return file_types_types_proto_rawDescGZIP(), []int{9} +} + +func (x *WithdrawalRequest) GetSourceAddress() *H160 { + if x != nil { + return x.SourceAddress + } + return nil +} + +func (x *WithdrawalRequest) GetValidatorPubkey() []byte { + if x != nil { + return x.ValidatorPubkey + } + return nil +} + +func (x *WithdrawalRequest) GetAmount() uint64 { + if x != nil { + return x.Amount + } + return 0 +} + type Withdrawal struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -615,7 +773,7 @@ type Withdrawal struct { func (x *Withdrawal) Reset() { *x = Withdrawal{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[8] + mi := &file_types_types_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -628,7 +786,7 @@ func (x *Withdrawal) String() string { func (*Withdrawal) ProtoMessage() {} func (x *Withdrawal) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[8] + mi := &file_types_types_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -641,7 +799,7 @@ func (x *Withdrawal) ProtoReflect() protoreflect.Message { // Deprecated: Use Withdrawal.ProtoReflect.Descriptor instead. func (*Withdrawal) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{8} + return file_types_types_proto_rawDescGZIP(), []int{10} } func (x *Withdrawal) GetIndex() uint64 { @@ -687,7 +845,7 @@ type BlobsBundleV1 struct { func (x *BlobsBundleV1) Reset() { *x = BlobsBundleV1{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[9] + mi := &file_types_types_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -700,7 +858,7 @@ func (x *BlobsBundleV1) String() string { func (*BlobsBundleV1) ProtoMessage() {} func (x *BlobsBundleV1) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[9] + mi := &file_types_types_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -713,7 +871,7 @@ func (x *BlobsBundleV1) ProtoReflect() protoreflect.Message { // Deprecated: Use BlobsBundleV1.ProtoReflect.Descriptor instead. func (*BlobsBundleV1) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{9} + return file_types_types_proto_rawDescGZIP(), []int{11} } func (x *BlobsBundleV1) GetCommitments() [][]byte { @@ -749,7 +907,7 @@ type NodeInfoPorts struct { func (x *NodeInfoPorts) Reset() { *x = NodeInfoPorts{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[10] + mi := &file_types_types_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -762,7 +920,7 @@ func (x *NodeInfoPorts) String() string { func (*NodeInfoPorts) ProtoMessage() {} func (x *NodeInfoPorts) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[10] + mi := &file_types_types_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -775,7 +933,7 @@ func (x *NodeInfoPorts) ProtoReflect() protoreflect.Message { // Deprecated: Use NodeInfoPorts.ProtoReflect.Descriptor instead. func (*NodeInfoPorts) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{10} + return file_types_types_proto_rawDescGZIP(), []int{12} } func (x *NodeInfoPorts) GetDiscovery() uint32 { @@ -809,7 +967,7 @@ type NodeInfoReply struct { func (x *NodeInfoReply) Reset() { *x = NodeInfoReply{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[11] + mi := &file_types_types_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -822,7 +980,7 @@ func (x *NodeInfoReply) String() string { func (*NodeInfoReply) ProtoMessage() {} func (x *NodeInfoReply) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[11] + mi := &file_types_types_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -835,7 +993,7 @@ func (x *NodeInfoReply) ProtoReflect() protoreflect.Message { // Deprecated: Use NodeInfoReply.ProtoReflect.Descriptor instead. func (*NodeInfoReply) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{11} + return file_types_types_proto_rawDescGZIP(), []int{13} } func (x *NodeInfoReply) GetId() string { @@ -907,7 +1065,7 @@ type PeerInfo struct { func (x *PeerInfo) Reset() { *x = PeerInfo{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[12] + mi := &file_types_types_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -920,7 +1078,7 @@ func (x *PeerInfo) String() string { func (*PeerInfo) ProtoMessage() {} func (x *PeerInfo) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[12] + mi := &file_types_types_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -933,7 +1091,7 @@ func (x *PeerInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use PeerInfo.ProtoReflect.Descriptor instead. func (*PeerInfo) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{12} + return file_types_types_proto_rawDescGZIP(), []int{14} } func (x *PeerInfo) GetId() string { @@ -1018,7 +1176,7 @@ type ExecutionPayloadBodyV1 struct { func (x *ExecutionPayloadBodyV1) Reset() { *x = ExecutionPayloadBodyV1{} if protoimpl.UnsafeEnabled { - mi := &file_types_types_proto_msgTypes[13] + mi := &file_types_types_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1031,7 +1189,7 @@ func (x *ExecutionPayloadBodyV1) String() string { func (*ExecutionPayloadBodyV1) ProtoMessage() {} func (x *ExecutionPayloadBodyV1) ProtoReflect() protoreflect.Message { - mi := &file_types_types_proto_msgTypes[13] + mi := &file_types_types_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1044,7 +1202,7 @@ func (x *ExecutionPayloadBodyV1) ProtoReflect() protoreflect.Message { // Deprecated: Use ExecutionPayloadBodyV1.ProtoReflect.Descriptor instead. func (*ExecutionPayloadBodyV1) Descriptor() ([]byte, []int) { - return file_types_types_proto_rawDescGZIP(), []int{13} + return file_types_types_proto_rawDescGZIP(), []int{15} } func (x *ExecutionPayloadBodyV1) GetTransactions() [][]byte { @@ -1132,7 +1290,7 @@ var file_types_types_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x22, 0x89, 0x06, 0x0a, 0x10, 0x45, 0x78, 0x65, 0x63, + 0x52, 0x05, 0x70, 0x61, 0x74, 0x63, 0x68, 0x22, 0x96, 0x07, 0x0a, 0x10, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, @@ -1178,86 +1336,115 @@ var file_types_types_proto_rawDesc = []byte{ 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x04, 0x48, 0x01, 0x52, 0x0d, 0x65, 0x78, 0x63, - 0x65, 0x73, 0x73, 0x42, 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a, - 0x0e, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x42, - 0x12, 0x0a, 0x10, 0x5f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, - 0x67, 0x61, 0x73, 0x22, 0x8a, 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, - 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, - 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, - 0x78, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x22, 0x5f, 0x0a, 0x0d, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x56, - 0x31, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0c, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, - 0x6f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, - 0x73, 0x22, 0x49, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x50, 0x6f, 0x72, - 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, - 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x08, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x22, 0xca, 0x01, 0x0a, - 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x72, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x72, 0x12, 0x2a, 0x0a, 0x05, 0x70, 0x6f, - 0x72, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x52, - 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, - 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6c, - 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x22, 0xb2, 0x02, 0x0a, 0x08, 0x50, 0x65, - 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, - 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, - 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, - 0x6e, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x04, 0x63, 0x61, 0x70, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x12, 0x28, - 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, - 0x64, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x52, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, - 0x5f, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x49, 0x73, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, - 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x69, 0x73, 0x5f, 0x74, 0x72, 0x75, 0x73, - 0x74, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x49, - 0x73, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, - 0x5f, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x6e, 0x49, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x22, 0x71, - 0x0a, 0x16, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, - 0x61, 0x64, 0x42, 0x6f, 0x64, 0x79, 0x56, 0x31, 0x12, 0x22, 0x0a, 0x0c, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0c, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x33, 0x0a, 0x0b, - 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, - 0x61, 0x77, 0x61, 0x6c, 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, - 0x73, 0x3a, 0x52, 0x0a, 0x15, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6d, 0x61, 0x6a, - 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, - 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd1, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x61, 0x6a, 0x6f, 0x72, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x52, 0x0a, 0x15, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x5f, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd2, 0x86, 0x03, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x69, 0x6e, - 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x52, 0x0a, 0x15, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x18, 0xd3, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x50, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x5a, - 0x0d, 0x2e, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x73, 0x42, 0x6c, 0x6f, 0x62, 0x47, 0x61, 0x73, 0x88, 0x01, 0x01, 0x12, 0x40, 0x0a, + 0x10, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x73, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, + 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0f, + 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, + 0x49, 0x0a, 0x13, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x12, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, + 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x62, + 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x42, 0x12, 0x0a, 0x10, + 0x5f, 0x65, 0x78, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x67, 0x61, 0x73, + 0x22, 0xb8, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x12, 0x42, 0x0a, 0x16, 0x77, + 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, + 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x15, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, + 0x61, 0x77, 0x61, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x12, + 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x8a, 0x01, 0x0a, 0x11, + 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x32, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, + 0x6f, 0x72, 0x5f, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x75, 0x62, 0x6b, 0x65, 0x79, + 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8a, 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, + 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, + 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, + 0x48, 0x31, 0x36, 0x30, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5f, 0x0a, 0x0d, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, + 0x6e, 0x64, 0x6c, 0x65, 0x56, 0x31, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0b, 0x63, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x62, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, + 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x22, 0x49, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, + 0x66, 0x6f, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x76, 0x65, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x64, 0x69, 0x73, 0x63, + 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, + 0x72, 0x22, 0xca, 0x01, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, + 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x65, 0x6e, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x72, 0x12, + 0x2a, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x50, + 0x6f, 0x72, 0x74, 0x73, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x6c, + 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, + 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x22, 0xb2, + 0x02, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x72, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x65, 0x6e, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x70, 0x73, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x63, 0x61, 0x70, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x63, + 0x6f, 0x6e, 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x41, + 0x64, 0x64, 0x72, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x72, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, + 0x6f, 0x6e, 0x6e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x12, 0x26, 0x0a, + 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x49, 0x73, 0x49, 0x6e, + 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x69, 0x73, + 0x5f, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, + 0x63, 0x6f, 0x6e, 0x6e, 0x49, 0x73, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x12, 0x24, 0x0a, + 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x5f, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x6e, 0x49, 0x73, 0x53, 0x74, 0x61, + 0x74, 0x69, 0x63, 0x22, 0x71, 0x0a, 0x16, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x6f, 0x64, 0x79, 0x56, 0x31, 0x12, 0x22, 0x0a, + 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0c, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x12, 0x33, 0x0a, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x57, + 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x52, 0x0b, 0x77, 0x69, 0x74, 0x68, 0x64, + 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x3a, 0x52, 0x0a, 0x15, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x5f, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, + 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd1, 0x86, + 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x61, + 0x6a, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x52, 0x0a, 0x15, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x18, 0xd2, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x4d, 0x69, 0x6e, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x52, + 0x0a, 0x15, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x63, 0x68, 0x5f, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd3, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x63, 0x68, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1272,8 +1459,8 @@ func file_types_types_proto_rawDescGZIP() []byte { return file_types_types_proto_rawDescData } -var file_types_types_proto_msgTypes = make([]protoimpl.MessageInfo, 14) -var file_types_types_proto_goTypes = []interface{}{ +var file_types_types_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_types_types_proto_goTypes = []any{ (*H128)(nil), // 0: types.H128 (*H160)(nil), // 1: types.H160 (*H256)(nil), // 2: types.H256 @@ -1282,13 +1469,15 @@ var file_types_types_proto_goTypes = []interface{}{ (*H2048)(nil), // 5: types.H2048 (*VersionReply)(nil), // 6: types.VersionReply (*ExecutionPayload)(nil), // 7: types.ExecutionPayload - (*Withdrawal)(nil), // 8: types.Withdrawal - (*BlobsBundleV1)(nil), // 9: types.BlobsBundleV1 - (*NodeInfoPorts)(nil), // 10: types.NodeInfoPorts - (*NodeInfoReply)(nil), // 11: types.NodeInfoReply - (*PeerInfo)(nil), // 12: types.PeerInfo - (*ExecutionPayloadBodyV1)(nil), // 13: types.ExecutionPayloadBodyV1 - (*descriptorpb.FileOptions)(nil), // 14: google.protobuf.FileOptions + (*DepositRequest)(nil), // 8: types.DepositRequest + (*WithdrawalRequest)(nil), // 9: types.WithdrawalRequest + (*Withdrawal)(nil), // 10: types.Withdrawal + (*BlobsBundleV1)(nil), // 11: types.BlobsBundleV1 + (*NodeInfoPorts)(nil), // 12: types.NodeInfoPorts + (*NodeInfoReply)(nil), // 13: types.NodeInfoReply + (*PeerInfo)(nil), // 14: types.PeerInfo + (*ExecutionPayloadBodyV1)(nil), // 15: types.ExecutionPayloadBodyV1 + (*descriptorpb.FileOptions)(nil), // 16: google.protobuf.FileOptions } var file_types_types_proto_depIdxs = []int32{ 0, // 0: types.H160.hi:type_name -> types.H128 @@ -1308,18 +1497,22 @@ var file_types_types_proto_depIdxs = []int32{ 2, // 14: types.ExecutionPayload.prev_randao:type_name -> types.H256 2, // 15: types.ExecutionPayload.base_fee_per_gas:type_name -> types.H256 2, // 16: types.ExecutionPayload.block_hash:type_name -> types.H256 - 8, // 17: types.ExecutionPayload.withdrawals:type_name -> types.Withdrawal - 1, // 18: types.Withdrawal.address:type_name -> types.H160 - 10, // 19: types.NodeInfoReply.ports:type_name -> types.NodeInfoPorts - 8, // 20: types.ExecutionPayloadBodyV1.withdrawals:type_name -> types.Withdrawal - 14, // 21: types.service_major_version:extendee -> google.protobuf.FileOptions - 14, // 22: types.service_minor_version:extendee -> google.protobuf.FileOptions - 14, // 23: types.service_patch_version:extendee -> google.protobuf.FileOptions - 24, // [24:24] is the sub-list for method output_type - 24, // [24:24] is the sub-list for method input_type - 24, // [24:24] is the sub-list for extension type_name - 21, // [21:24] is the sub-list for extension extendee - 0, // [0:21] is the sub-list for field type_name + 10, // 17: types.ExecutionPayload.withdrawals:type_name -> types.Withdrawal + 8, // 18: types.ExecutionPayload.deposit_requests:type_name -> types.DepositRequest + 9, // 19: types.ExecutionPayload.withdrawal_requests:type_name -> types.WithdrawalRequest + 2, // 20: types.DepositRequest.withdrawal_credentials:type_name -> types.H256 + 1, // 21: types.WithdrawalRequest.source_address:type_name -> types.H160 + 1, // 22: types.Withdrawal.address:type_name -> types.H160 + 12, // 23: types.NodeInfoReply.ports:type_name -> types.NodeInfoPorts + 10, // 24: types.ExecutionPayloadBodyV1.withdrawals:type_name -> types.Withdrawal + 16, // 25: types.service_major_version:extendee -> google.protobuf.FileOptions + 16, // 26: types.service_minor_version:extendee -> google.protobuf.FileOptions + 16, // 27: types.service_patch_version:extendee -> google.protobuf.FileOptions + 28, // [28:28] is the sub-list for method output_type + 28, // [28:28] is the sub-list for method input_type + 28, // [28:28] is the sub-list for extension type_name + 25, // [25:28] is the sub-list for extension extendee + 0, // [0:25] is the sub-list for field type_name } func init() { file_types_types_proto_init() } @@ -1328,7 +1521,7 @@ func file_types_types_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_types_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*H128); i { case 0: return &v.state @@ -1340,7 +1533,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*H160); i { case 0: return &v.state @@ -1352,7 +1545,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*H256); i { case 0: return &v.state @@ -1364,7 +1557,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*H512); i { case 0: return &v.state @@ -1376,7 +1569,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*H1024); i { case 0: return &v.state @@ -1388,7 +1581,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*H2048); i { case 0: return &v.state @@ -1400,7 +1593,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*VersionReply); i { case 0: return &v.state @@ -1412,7 +1605,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ExecutionPayload); i { case 0: return &v.state @@ -1424,7 +1617,31 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[8].Exporter = func(v any, i int) any { + switch v := v.(*DepositRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_types_types_proto_msgTypes[9].Exporter = func(v any, i int) any { + switch v := v.(*WithdrawalRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_types_types_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*Withdrawal); i { case 0: return &v.state @@ -1436,7 +1653,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*BlobsBundleV1); i { case 0: return &v.state @@ -1448,7 +1665,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*NodeInfoPorts); i { case 0: return &v.state @@ -1460,7 +1677,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*NodeInfoReply); i { case 0: return &v.state @@ -1472,7 +1689,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*PeerInfo); i { case 0: return &v.state @@ -1484,7 +1701,7 @@ func file_types_types_proto_init() { return nil } } - file_types_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_types_types_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*ExecutionPayloadBodyV1); i { case 0: return &v.state @@ -1497,14 +1714,14 @@ func file_types_types_proto_init() { } } } - file_types_types_proto_msgTypes[7].OneofWrappers = []interface{}{} + file_types_types_proto_msgTypes[7].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_types_types_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 16, NumExtensions: 3, NumServices: 0, }, diff --git a/tests/init.go b/tests/init.go index 660c9ffe5d8..aec54ff34d0 100644 --- a/tests/init.go +++ b/tests/init.go @@ -345,6 +345,26 @@ var Forks = map[string]*chain.Config{ ShanghaiTime: big.NewInt(0), CancunTime: big.NewInt(15_000), }, + "Prague": { + ChainID: big.NewInt(1), + HomesteadBlock: big.NewInt(0), + TangerineWhistleBlock: big.NewInt(0), + SpuriousDragonBlock: big.NewInt(0), + ByzantiumBlock: big.NewInt(0), + ConstantinopleBlock: big.NewInt(0), + PetersburgBlock: big.NewInt(0), + IstanbulBlock: big.NewInt(0), + MuirGlacierBlock: big.NewInt(0), + BerlinBlock: big.NewInt(0), + LondonBlock: big.NewInt(0), + ArrowGlacierBlock: big.NewInt(0), + GrayGlacierBlock: big.NewInt(0), + TerminalTotalDifficulty: big.NewInt(0), + TerminalTotalDifficultyPassed: true, + ShanghaiTime: big.NewInt(0), + CancunTime: big.NewInt(0), + PragueTime: big.NewInt(0), + }, } // Returns the set of defined fork names diff --git a/turbo/execution/eth1/eth1_utils/grpc.go b/turbo/execution/eth1/eth1_utils/grpc.go index 73852888327..6c8dda7c782 100644 --- a/turbo/execution/eth1/eth1_utils/grpc.go +++ b/turbo/execution/eth1/eth1_utils/grpc.go @@ -57,6 +57,10 @@ func HeaderToHeaderRPC(header *types.Header) *execution.Header { h.ParentBeaconBlockRoot = gointerfaces.ConvertHashToH256(*header.ParentBeaconBlockRoot) } + if header.RequestsRoot != nil { + h.RequestsRoot = gointerfaces.ConvertHashToH256(*header.RequestsRoot) + } + if len(header.AuRaSeal) > 0 { h.AuraSeal = header.AuRaSeal h.AuraStep = &header.AuRaStep @@ -131,6 +135,10 @@ func HeaderRpcToHeader(header *execution.Header) (*types.Header, error) { h.ParentBeaconBlockRoot = new(libcommon.Hash) *h.ParentBeaconBlockRoot = gointerfaces.ConvertH256ToHash(header.ParentBeaconBlockRoot) } + if header.RequestsRoot != nil { + h.RequestsRoot = new(libcommon.Hash) + *h.RequestsRoot = gointerfaces.ConvertH256ToHash(header.RequestsRoot) + } blockHash := gointerfaces.ConvertH256ToHash(header.BlockHash) if blockHash != h.Hash() { return nil, fmt.Errorf("block %d, %x has invalid hash. expected: %x", header.BlockNumber, h.Hash(), blockHash)