diff --git a/abci/client/client.go b/abci/client/client.go index 6de1037d9..6a26e3e3d 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -46,6 +46,8 @@ type Client interface { Commit(context.Context) (*types.ResponseCommit, error) InitChain(context.Context, types.RequestInitChain) (*types.ResponseInitChain, error) PrepareProposal(context.Context, types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) + ExtendVote(context.Context, types.RequestExtendVote) (*types.ResponseExtendVote, error) + VerifyVoteExtension(context.Context, types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) BeginBlock(context.Context, types.RequestBeginBlock) (*types.ResponseBeginBlock, error) EndBlock(context.Context, types.RequestEndBlock) (*types.ResponseEndBlock, error) ListSnapshots(context.Context, types.RequestListSnapshots) (*types.ResponseListSnapshots, error) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 795799cb6..2eb9f7363 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -376,3 +376,19 @@ func (cli *grpcClient) PrepareProposal( req := types.ToRequestPrepareProposal(params) return cli.client.PrepareProposal(ctx, req.GetPrepareProposal(), grpc.WaitForReady(true)) } + +func (cli *grpcClient) ExtendVote( + ctx context.Context, + params types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + req := types.ToRequestExtendVote(params) + return cli.client.ExtendVote(ctx, req.GetExtendVote(), grpc.WaitForReady(true)) +} + +func (cli *grpcClient) VerifyVoteExtension( + ctx context.Context, + params types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + + req := types.ToRequestVerifyVoteExtension(params) + return cli.client.VerifyVoteExtension(ctx, req.GetVerifyVoteExtension(), grpc.WaitForReady(true)) +} diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 749d8c78a..23934138d 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -233,6 +233,28 @@ func (app *localClient) PrepareProposal( return &res, nil } +func (app *localClient) ExtendVote( + ctx context.Context, + req types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.ExtendVote(req) + return &res, nil +} + +func (app *localClient) VerifyVoteExtension( + ctx context.Context, + req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.VerifyVoteExtension(req) + return &res, nil +} + //------------------------------------------------------- func (app *localClient) callback(req *types.Request, res *types.Response) *ReqRes { diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 9fd6ea9ee..108103ef7 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -238,6 +238,29 @@ func (_m *Client) Error() error { return r0 } +// ExtendVote provides a mock function with given fields: _a0, _a1 +func (_m *Client) ExtendVote(_a0 context.Context, _a1 types.RequestExtendVote) (*types.ResponseExtendVote, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseExtendVote + if rf, ok := ret.Get(0).(func(context.Context, types.RequestExtendVote) *types.ResponseExtendVote); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseExtendVote) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestExtendVote) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Flush provides a mock function with given fields: _a0 func (_m *Client) Flush(_a0 context.Context) error { ret := _m.Called(_a0) @@ -483,6 +506,29 @@ func (_m *Client) String() string { return r0 } +// VerifyVoteExtension provides a mock function with given fields: _a0, _a1 +func (_m *Client) VerifyVoteExtension(_a0 context.Context, _a1 types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseVerifyVoteExtension + if rf, ok := ret.Get(0).(func(context.Context, types.RequestVerifyVoteExtension) *types.ResponseVerifyVoteExtension); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseVerifyVoteExtension) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestVerifyVoteExtension) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Wait provides a mock function with given fields: func (_m *Client) Wait() { _m.Called() diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 4e568164f..808c69586 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -415,6 +415,28 @@ func (cli *socketClient) PrepareProposal( return reqres.Response.GetPrepareProposal(), nil } +func (cli *socketClient) ExtendVote( + ctx context.Context, + req types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + reqres, err := cli.queueRequestAndFlush(ctx, types.ToRequestExtendVote(req)) + if err != nil { + return nil, err + } + return reqres.Response.GetExtendVote(), nil +} + +func (cli *socketClient) VerifyVoteExtension( + ctx context.Context, + req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + + reqres, err := cli.queueRequestAndFlush(ctx, types.ToRequestVerifyVoteExtension(req)) + if err != nil { + return nil, err + } + return reqres.Response.GetVerifyVoteExtension(), nil +} + //---------------------------------------- // queueRequest enqueues req onto the queue. If the queue is full, it ether @@ -526,6 +548,12 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_Query) case *types.Request_InitChain: _, ok = res.Value.(*types.Response_InitChain) + case *types.Request_PrepareProposal: + _, ok = res.Value.(*types.Response_PrepareProposal) + case *types.Request_ExtendVote: + _, ok = res.Value.(*types.Response_ExtendVote) + case *types.Request_VerifyVoteExtension: + _, ok = res.Value.(*types.Response_VerifyVoteExtension) case *types.Request_BeginBlock: _, ok = res.Value.(*types.Response_BeginBlock) case *types.Request_EndBlock: @@ -538,8 +566,6 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_ListSnapshots) case *types.Request_OfferSnapshot: _, ok = res.Value.(*types.Response_OfferSnapshot) - case *types.Request_PrepareProposal: - _, ok = res.Value.(*types.Response_PrepareProposal) } return ok } diff --git a/abci/example/kvstore/README.md b/abci/example/kvstore/README.md index edc2c47a5..a768342f8 100644 --- a/abci/example/kvstore/README.md +++ b/abci/example/kvstore/README.md @@ -4,7 +4,7 @@ There are two app's here: the KVStoreApplication and the PersistentKVStoreApplic ## KVStoreApplication -The KVStoreApplication is a simple merkle key-value store. +The KVStoreApplication is a simple merkle key-value store. Transactions of the form `key=value` are stored as key-value pairs in the tree. Transactions without an `=` sign set the value to the key. The app has no replay protection (other than what the mempool provides). @@ -12,7 +12,7 @@ The app has no replay protection (other than what the mempool provides). ## PersistentKVStoreApplication The PersistentKVStoreApplication wraps the KVStoreApplication -and provides two additional features: +and provides three additional features: 1) persistence of state across app restarts (using Tendermint's ABCI-Handshake mechanism) 2) validator set changes @@ -27,4 +27,4 @@ Validator set changes are effected using the following transaction format: where `pubkeyN` is a base64-encoded 32-byte ed25519 key and `powerN` is a new voting power for the validator with `pubkeyN` (possibly a new one). To remove a validator from the validator set, set power to `0`. -There is no sybil protection against new validators joining. +There is no sybil protection against new validators joining. diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index c615f9d58..7bf158327 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -166,6 +166,16 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} } +func (app *PersistentKVStoreApplication) ExtendVote( + req types.RequestExtendVote) types.ResponseExtendVote { + return types.ResponseExtendVote{} +} + +func (app *PersistentKVStoreApplication) VerifyVoteExtension( + req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { + return types.ResponseVerifyVoteExtension{} +} + func (app *PersistentKVStoreApplication) PrepareProposal( req types.RequestPrepareProposal) types.ResponsePrepareProposal { if len(req.BlockData) >= 1 { diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 6f2222b1c..3ccab7ad4 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -249,6 +249,12 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types case *types.Request_ApplySnapshotChunk: res := s.app.ApplySnapshotChunk(*r.ApplySnapshotChunk) responses <- types.ToResponseApplySnapshotChunk(res) + case *types.Request_ExtendVote: + res := s.app.ExtendVote(*r.ExtendVote) + responses <- types.ToResponseExtendVote(res) + case *types.Request_VerifyVoteExtension: + res := s.app.VerifyVoteExtension(*r.VerifyVoteExtension) + responses <- types.ToResponseVerifyVoteExtension(res) default: responses <- types.ToResponseException("Unknown request") } diff --git a/abci/types/application.go b/abci/types/application.go index 4a74c7852..ca1b47b83 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -23,6 +23,8 @@ type Application interface { DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set Commit() ResponseCommit // Commit the state and return the application Merkle root hash + ExtendVote(RequestExtendVote) ResponseExtendVote // Create application specific vote extension + VerifyVoteExtension(RequestVerifyVoteExtension) ResponseVerifyVoteExtension // Verify application's vote extension data // State Sync Connection ListSnapshots(RequestListSnapshots) ResponseListSnapshots // List available snapshots @@ -59,6 +61,14 @@ func (BaseApplication) Commit() ResponseCommit { return ResponseCommit{} } +func (BaseApplication) ExtendVote(req RequestExtendVote) ResponseExtendVote { + return ResponseExtendVote{} +} + +func (BaseApplication) VerifyVoteExtension(req RequestVerifyVoteExtension) ResponseVerifyVoteExtension { + return ResponseVerifyVoteExtension{} +} + func (BaseApplication) Query(req RequestQuery) ResponseQuery { return ResponseQuery{Code: CodeTypeOK} } @@ -178,6 +188,18 @@ func (app *GRPCApplication) ApplySnapshotChunk( return &res, nil } +func (app *GRPCApplication) ExtendVote( + ctx context.Context, req *RequestExtendVote) (*ResponseExtendVote, error) { + res := app.app.ExtendVote(*req) + return &res, nil +} + +func (app *GRPCApplication) VerifyVoteExtension( + ctx context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) { + res := app.app.VerifyVoteExtension(*req) + return &res, nil +} + func (app *GRPCApplication) PrepareProposal( ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { res := app.app.PrepareProposal(*req) diff --git a/abci/types/messages.go b/abci/types/messages.go index 8c17baeb3..f82632982 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -110,6 +110,18 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request { } } +func ToRequestExtendVote(req RequestExtendVote) *Request { + return &Request{ + Value: &Request_ExtendVote{&req}, + } +} + +func ToRequestVerifyVoteExtension(req RequestVerifyVoteExtension) *Request { + return &Request{ + Value: &Request_VerifyVoteExtension{&req}, + } +} + func ToRequestPrepareProposal(req RequestPrepareProposal) *Request { return &Request{ Value: &Request_PrepareProposal{&req}, @@ -207,6 +219,18 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response { } } +func ToResponseExtendVote(res ResponseExtendVote) *Response { + return &Response{ + Value: &Response_ExtendVote{&res}, + } +} + +func ToResponseVerifyVoteExtension(res ResponseVerifyVoteExtension) *Response { + return &Response{ + Value: &Response_VerifyVoteExtension{&res}, + } +} + func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response { return &Response{ Value: &Response_PrepareProposal{&res}, diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index a6fbc199f..37c274462 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -120,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29, 0} + return fileDescriptor_252557cfdd89a31a, []int{31, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,38 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31, 0} + return fileDescriptor_252557cfdd89a31a, []int{33, 0} +} + +type ResponseVerifyVoteExtension_Result int32 + +const ( + ResponseVerifyVoteExtension_UNKNOWN ResponseVerifyVoteExtension_Result = 0 + ResponseVerifyVoteExtension_ACCEPT ResponseVerifyVoteExtension_Result = 1 + ResponseVerifyVoteExtension_SLASH ResponseVerifyVoteExtension_Result = 2 + ResponseVerifyVoteExtension_REJECT ResponseVerifyVoteExtension_Result = 3 +) + +var ResponseVerifyVoteExtension_Result_name = map[int32]string{ + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "SLASH", + 3: "REJECT", +} + +var ResponseVerifyVoteExtension_Result_value = map[string]int32{ + "UNKNOWN": 0, + "ACCEPT": 1, + "SLASH": 2, + "REJECT": 3, +} + +func (x ResponseVerifyVoteExtension_Result) String() string { + return proto.EnumName(ResponseVerifyVoteExtension_Result_name, int32(x)) +} + +func (ResponseVerifyVoteExtension_Result) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36, 0} } type Request struct { @@ -177,6 +208,8 @@ type Request struct { // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk // *Request_PrepareProposal + // *Request_ExtendVote + // *Request_VerifyVoteExtension Value isRequest_Value `protobuf_oneof:"value"` } @@ -264,22 +297,30 @@ type Request_ApplySnapshotChunk struct { type Request_PrepareProposal struct { PrepareProposal *RequestPrepareProposal `protobuf:"bytes,15,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` } - -func (*Request_Echo) isRequest_Value() {} -func (*Request_Flush) isRequest_Value() {} -func (*Request_Info) isRequest_Value() {} -func (*Request_InitChain) isRequest_Value() {} -func (*Request_Query) isRequest_Value() {} -func (*Request_BeginBlock) isRequest_Value() {} -func (*Request_CheckTx) isRequest_Value() {} -func (*Request_DeliverTx) isRequest_Value() {} -func (*Request_EndBlock) isRequest_Value() {} -func (*Request_Commit) isRequest_Value() {} -func (*Request_ListSnapshots) isRequest_Value() {} -func (*Request_OfferSnapshot) isRequest_Value() {} -func (*Request_LoadSnapshotChunk) isRequest_Value() {} -func (*Request_ApplySnapshotChunk) isRequest_Value() {} -func (*Request_PrepareProposal) isRequest_Value() {} +type Request_ExtendVote struct { + ExtendVote *RequestExtendVote `protobuf:"bytes,16,opt,name=extend_vote,json=extendVote,proto3,oneof" json:"extend_vote,omitempty"` +} +type Request_VerifyVoteExtension struct { + VerifyVoteExtension *RequestVerifyVoteExtension `protobuf:"bytes,17,opt,name=verify_vote_extension,json=verifyVoteExtension,proto3,oneof" json:"verify_vote_extension,omitempty"` +} + +func (*Request_Echo) isRequest_Value() {} +func (*Request_Flush) isRequest_Value() {} +func (*Request_Info) isRequest_Value() {} +func (*Request_InitChain) isRequest_Value() {} +func (*Request_Query) isRequest_Value() {} +func (*Request_BeginBlock) isRequest_Value() {} +func (*Request_CheckTx) isRequest_Value() {} +func (*Request_DeliverTx) isRequest_Value() {} +func (*Request_EndBlock) isRequest_Value() {} +func (*Request_Commit) isRequest_Value() {} +func (*Request_ListSnapshots) isRequest_Value() {} +func (*Request_OfferSnapshot) isRequest_Value() {} +func (*Request_LoadSnapshotChunk) isRequest_Value() {} +func (*Request_ApplySnapshotChunk) isRequest_Value() {} +func (*Request_PrepareProposal) isRequest_Value() {} +func (*Request_ExtendVote) isRequest_Value() {} +func (*Request_VerifyVoteExtension) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -393,6 +434,20 @@ func (m *Request) GetPrepareProposal() *RequestPrepareProposal { return nil } +func (m *Request) GetExtendVote() *RequestExtendVote { + if x, ok := m.GetValue().(*Request_ExtendVote); ok { + return x.ExtendVote + } + return nil +} + +func (m *Request) GetVerifyVoteExtension() *RequestVerifyVoteExtension { + if x, ok := m.GetValue().(*Request_VerifyVoteExtension); ok { + return x.VerifyVoteExtension + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -411,6 +466,8 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), (*Request_PrepareProposal)(nil), + (*Request_ExtendVote)(nil), + (*Request_VerifyVoteExtension)(nil), } } @@ -1226,6 +1283,96 @@ func (m *RequestPrepareProposal) GetBlockDataSize() int64 { return 0 } +// Extends a vote with application-side injection +type RequestExtendVote struct { + Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` +} + +func (m *RequestExtendVote) Reset() { *m = RequestExtendVote{} } +func (m *RequestExtendVote) String() string { return proto.CompactTextString(m) } +func (*RequestExtendVote) ProtoMessage() {} +func (*RequestExtendVote) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{16} +} +func (m *RequestExtendVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestExtendVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestExtendVote.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RequestExtendVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestExtendVote.Merge(m, src) +} +func (m *RequestExtendVote) XXX_Size() int { + return m.Size() +} +func (m *RequestExtendVote) XXX_DiscardUnknown() { + xxx_messageInfo_RequestExtendVote.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestExtendVote proto.InternalMessageInfo + +func (m *RequestExtendVote) GetVote() *types1.Vote { + if m != nil { + return m.Vote + } + return nil +} + +// Verify the vote extension +type RequestVerifyVoteExtension struct { + Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` +} + +func (m *RequestVerifyVoteExtension) Reset() { *m = RequestVerifyVoteExtension{} } +func (m *RequestVerifyVoteExtension) String() string { return proto.CompactTextString(m) } +func (*RequestVerifyVoteExtension) ProtoMessage() {} +func (*RequestVerifyVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{17} +} +func (m *RequestVerifyVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestVerifyVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestVerifyVoteExtension.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RequestVerifyVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestVerifyVoteExtension.Merge(m, src) +} +func (m *RequestVerifyVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *RequestVerifyVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_RequestVerifyVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestVerifyVoteExtension proto.InternalMessageInfo + +func (m *RequestVerifyVoteExtension) GetVote() *types1.Vote { + if m != nil { + return m.Vote + } + return nil +} + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -1244,6 +1391,8 @@ type Response struct { // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk // *Response_PrepareProposal + // *Response_ExtendVote + // *Response_VerifyVoteExtension Value isResponse_Value `protobuf_oneof:"value"` } @@ -1251,7 +1400,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1334,23 +1483,31 @@ type Response_ApplySnapshotChunk struct { type Response_PrepareProposal struct { PrepareProposal *ResponsePrepareProposal `protobuf:"bytes,16,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` } - -func (*Response_Exception) isResponse_Value() {} -func (*Response_Echo) isResponse_Value() {} -func (*Response_Flush) isResponse_Value() {} -func (*Response_Info) isResponse_Value() {} -func (*Response_InitChain) isResponse_Value() {} -func (*Response_Query) isResponse_Value() {} -func (*Response_BeginBlock) isResponse_Value() {} -func (*Response_CheckTx) isResponse_Value() {} -func (*Response_DeliverTx) isResponse_Value() {} -func (*Response_EndBlock) isResponse_Value() {} -func (*Response_Commit) isResponse_Value() {} -func (*Response_ListSnapshots) isResponse_Value() {} -func (*Response_OfferSnapshot) isResponse_Value() {} -func (*Response_LoadSnapshotChunk) isResponse_Value() {} -func (*Response_ApplySnapshotChunk) isResponse_Value() {} -func (*Response_PrepareProposal) isResponse_Value() {} +type Response_ExtendVote struct { + ExtendVote *ResponseExtendVote `protobuf:"bytes,17,opt,name=extend_vote,json=extendVote,proto3,oneof" json:"extend_vote,omitempty"` +} +type Response_VerifyVoteExtension struct { + VerifyVoteExtension *ResponseVerifyVoteExtension `protobuf:"bytes,18,opt,name=verify_vote_extension,json=verifyVoteExtension,proto3,oneof" json:"verify_vote_extension,omitempty"` +} + +func (*Response_Exception) isResponse_Value() {} +func (*Response_Echo) isResponse_Value() {} +func (*Response_Flush) isResponse_Value() {} +func (*Response_Info) isResponse_Value() {} +func (*Response_InitChain) isResponse_Value() {} +func (*Response_Query) isResponse_Value() {} +func (*Response_BeginBlock) isResponse_Value() {} +func (*Response_CheckTx) isResponse_Value() {} +func (*Response_DeliverTx) isResponse_Value() {} +func (*Response_EndBlock) isResponse_Value() {} +func (*Response_Commit) isResponse_Value() {} +func (*Response_ListSnapshots) isResponse_Value() {} +func (*Response_OfferSnapshot) isResponse_Value() {} +func (*Response_LoadSnapshotChunk) isResponse_Value() {} +func (*Response_ApplySnapshotChunk) isResponse_Value() {} +func (*Response_PrepareProposal) isResponse_Value() {} +func (*Response_ExtendVote) isResponse_Value() {} +func (*Response_VerifyVoteExtension) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1471,6 +1628,20 @@ func (m *Response) GetPrepareProposal() *ResponsePrepareProposal { return nil } +func (m *Response) GetExtendVote() *ResponseExtendVote { + if x, ok := m.GetValue().(*Response_ExtendVote); ok { + return x.ExtendVote + } + return nil +} + +func (m *Response) GetVerifyVoteExtension() *ResponseVerifyVoteExtension { + if x, ok := m.GetValue().(*Response_VerifyVoteExtension); ok { + return x.VerifyVoteExtension + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1490,6 +1661,8 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), (*Response_PrepareProposal)(nil), + (*Response_ExtendVote)(nil), + (*Response_VerifyVoteExtension)(nil), } } @@ -1502,7 +1675,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1546,7 +1719,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1589,7 +1762,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1631,7 +1804,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1705,7 +1878,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1772,7 +1945,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1872,7 +2045,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{23} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1928,7 +2101,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{24} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2049,7 +2222,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{25} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2144,7 +2317,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2204,7 +2377,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2255,7 +2428,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{28} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2299,7 +2472,7 @@ func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2343,7 +2516,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2389,7 +2562,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2447,7 +2620,7 @@ func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } func (*ResponsePrepareProposal) ProtoMessage() {} func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2483,6 +2656,94 @@ func (m *ResponsePrepareProposal) GetBlockData() [][]byte { return nil } +type ResponseExtendVote struct { + VoteExtension *types1.VoteExtension `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` +} + +func (m *ResponseExtendVote) Reset() { *m = ResponseExtendVote{} } +func (m *ResponseExtendVote) String() string { return proto.CompactTextString(m) } +func (*ResponseExtendVote) ProtoMessage() {} +func (*ResponseExtendVote) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{35} +} +func (m *ResponseExtendVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseExtendVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseExtendVote.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ResponseExtendVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseExtendVote.Merge(m, src) +} +func (m *ResponseExtendVote) XXX_Size() int { + return m.Size() +} +func (m *ResponseExtendVote) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseExtendVote.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseExtendVote proto.InternalMessageInfo + +func (m *ResponseExtendVote) GetVoteExtension() *types1.VoteExtension { + if m != nil { + return m.VoteExtension + } + return nil +} + +type ResponseVerifyVoteExtension struct { + Result ResponseVerifyVoteExtension_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseVerifyVoteExtension_Result" json:"result,omitempty"` +} + +func (m *ResponseVerifyVoteExtension) Reset() { *m = ResponseVerifyVoteExtension{} } +func (m *ResponseVerifyVoteExtension) String() string { return proto.CompactTextString(m) } +func (*ResponseVerifyVoteExtension) ProtoMessage() {} +func (*ResponseVerifyVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36} +} +func (m *ResponseVerifyVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseVerifyVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseVerifyVoteExtension.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ResponseVerifyVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseVerifyVoteExtension.Merge(m, src) +} +func (m *ResponseVerifyVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *ResponseVerifyVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseVerifyVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseVerifyVoteExtension proto.InternalMessageInfo + +func (m *ResponseVerifyVoteExtension) GetResult() ResponseVerifyVoteExtension_Result { + if m != nil { + return m.Result + } + return ResponseVerifyVoteExtension_UNKNOWN +} + type LastCommitInfo struct { Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` @@ -2492,7 +2753,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2547,7 +2808,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{34} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2601,7 +2862,7 @@ func (m *EventAttribute) Reset() { *m = EventAttribute{} } func (m *EventAttribute) String() string { return proto.CompactTextString(m) } func (*EventAttribute) ProtoMessage() {} func (*EventAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2665,7 +2926,7 @@ func (m *TxResult) Reset() { *m = TxResult{} } func (m *TxResult) String() string { return proto.CompactTextString(m) } func (*TxResult) ProtoMessage() {} func (*TxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2733,7 +2994,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{37} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2786,7 +3047,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{38} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2839,7 +3100,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{39} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2900,7 +3161,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{40} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2976,7 +3237,7 @@ func (m *Snapshot) Reset() { *m = Snapshot{} } func (m *Snapshot) String() string { return proto.CompactTextString(m) } func (*Snapshot) ProtoMessage() {} func (*Snapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{41} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3045,6 +3306,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseVerifyVoteExtension_Result", ResponseVerifyVoteExtension_Result_name, ResponseVerifyVoteExtension_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3061,6 +3323,8 @@ func init() { proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") proto.RegisterType((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") + proto.RegisterType((*RequestExtendVote)(nil), "tendermint.abci.RequestExtendVote") + proto.RegisterType((*RequestVerifyVoteExtension)(nil), "tendermint.abci.RequestVerifyVoteExtension") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") @@ -3078,6 +3342,8 @@ func init() { proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") + proto.RegisterType((*ResponseExtendVote)(nil), "tendermint.abci.ResponseExtendVote") + proto.RegisterType((*ResponseVerifyVoteExtension)(nil), "tendermint.abci.ResponseVerifyVoteExtension") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") @@ -3092,178 +3358,190 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2735 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7, - 0xf1, 0xc7, 0x1b, 0xd8, 0xc6, 0x93, 0x23, 0x9a, 0x86, 0x61, 0x89, 0x94, 0xd7, 0x65, 0x5b, 0x96, - 0x6d, 0xf2, 0x6f, 0xaa, 0xa4, 0xbf, 0x5c, 0xce, 0xc3, 0x04, 0x04, 0x05, 0xb4, 0x18, 0x92, 0x19, - 0x42, 0x72, 0x39, 0x89, 0xb5, 0x5e, 0x60, 0x87, 0xc0, 0x5a, 0xc0, 0xee, 0x7a, 0x77, 0x41, 0x91, - 0x3a, 0xa6, 0x92, 0x8b, 0x2a, 0x07, 0x5d, 0x52, 0x95, 0x8b, 0x4f, 0xf9, 0x12, 0x39, 0xe5, 0x94, - 0x83, 0x0f, 0x39, 0xf8, 0x98, 0x43, 0xca, 0x49, 0x49, 0xb7, 0x7c, 0x01, 0x9f, 0x52, 0x95, 0x9a, - 0xc7, 0xbe, 0x00, 0x2c, 0x01, 0xc6, 0xb9, 0xe5, 0x36, 0xd3, 0xdb, 0xdd, 0x98, 0xe9, 0x99, 0xf9, - 0xf5, 0x6f, 0x7a, 0x00, 0xaf, 0xba, 0xc4, 0xd0, 0x88, 0x3d, 0xd6, 0x0d, 0x77, 0x4b, 0xed, 0xf5, - 0xf5, 0x2d, 0xf7, 0xcc, 0x22, 0xce, 0xa6, 0x65, 0x9b, 0xae, 0x89, 0xaa, 0xc1, 0xc7, 0x4d, 0xfa, - 0xb1, 0x71, 0x25, 0xa4, 0xdd, 0xb7, 0xcf, 0x2c, 0xd7, 0xdc, 0xb2, 0x6c, 0xd3, 0x3c, 0xe6, 0xfa, - 0x8d, 0xcb, 0xa1, 0xcf, 0xcc, 0x4f, 0xd8, 0x5b, 0xe4, 0xab, 0x30, 0x7e, 0x44, 0xce, 0xbc, 0xaf, - 0x57, 0x66, 0x6c, 0x2d, 0xd5, 0x56, 0xc7, 0xde, 0xe7, 0x8d, 0x81, 0x69, 0x0e, 0x46, 0x64, 0x8b, - 0xf5, 0x7a, 0x93, 0xe3, 0x2d, 0x57, 0x1f, 0x13, 0xc7, 0x55, 0xc7, 0x96, 0x50, 0x58, 0x1d, 0x98, - 0x03, 0x93, 0x35, 0xb7, 0x68, 0x8b, 0x4b, 0xe5, 0x3f, 0x14, 0x20, 0x8f, 0xc9, 0x97, 0x13, 0xe2, - 0xb8, 0x68, 0x1b, 0x32, 0xa4, 0x3f, 0x34, 0xeb, 0xc9, 0xab, 0xc9, 0x6b, 0xc5, 0xed, 0xcb, 0x9b, - 0x53, 0x93, 0xdb, 0x14, 0x7a, 0xed, 0xfe, 0xd0, 0xec, 0x24, 0x30, 0xd3, 0x45, 0x37, 0x21, 0x7b, - 0x3c, 0x9a, 0x38, 0xc3, 0x7a, 0x8a, 0x19, 0x5d, 0x89, 0x33, 0xba, 0x4b, 0x95, 0x3a, 0x09, 0xcc, - 0xb5, 0xe9, 0x4f, 0xe9, 0xc6, 0xb1, 0x59, 0x4f, 0x9f, 0xff, 0x53, 0xbb, 0xc6, 0x31, 0xfb, 0x29, - 0xaa, 0x8b, 0x9a, 0x00, 0xba, 0xa1, 0xbb, 0x4a, 0x7f, 0xa8, 0xea, 0x46, 0x3d, 0xc3, 0x2c, 0x5f, - 0x8b, 0xb7, 0xd4, 0xdd, 0x16, 0x55, 0xec, 0x24, 0xb0, 0xa4, 0x7b, 0x1d, 0x3a, 0xdc, 0x2f, 0x27, - 0xc4, 0x3e, 0xab, 0x67, 0xcf, 0x1f, 0xee, 0xcf, 0xa8, 0x12, 0x1d, 0x2e, 0xd3, 0x46, 0x6d, 0x28, - 0xf6, 0xc8, 0x40, 0x37, 0x94, 0xde, 0xc8, 0xec, 0x3f, 0xaa, 0xe7, 0x98, 0xb1, 0x1c, 0x67, 0xdc, - 0xa4, 0xaa, 0x4d, 0xaa, 0xd9, 0x49, 0x60, 0xe8, 0xf9, 0x3d, 0xf4, 0x03, 0x28, 0xf4, 0x87, 0xa4, - 0xff, 0x48, 0x71, 0x4f, 0xeb, 0x79, 0xe6, 0x63, 0x23, 0xce, 0x47, 0x8b, 0xea, 0x75, 0x4f, 0x3b, - 0x09, 0x9c, 0xef, 0xf3, 0x26, 0x9d, 0xbf, 0x46, 0x46, 0xfa, 0x09, 0xb1, 0xa9, 0x7d, 0xe1, 0xfc, - 0xf9, 0xdf, 0xe1, 0x9a, 0xcc, 0x83, 0xa4, 0x79, 0x1d, 0xf4, 0x63, 0x90, 0x88, 0xa1, 0x89, 0x69, - 0x48, 0xcc, 0xc5, 0xd5, 0xd8, 0x75, 0x36, 0x34, 0x6f, 0x12, 0x05, 0x22, 0xda, 0xe8, 0x36, 0xe4, - 0xfa, 0xe6, 0x78, 0xac, 0xbb, 0x75, 0x60, 0xd6, 0xeb, 0xb1, 0x13, 0x60, 0x5a, 0x9d, 0x04, 0x16, - 0xfa, 0x68, 0x1f, 0x2a, 0x23, 0xdd, 0x71, 0x15, 0xc7, 0x50, 0x2d, 0x67, 0x68, 0xba, 0x4e, 0xbd, - 0xc8, 0x3c, 0xbc, 0x11, 0xe7, 0x61, 0x4f, 0x77, 0xdc, 0x23, 0x4f, 0xb9, 0x93, 0xc0, 0xe5, 0x51, - 0x58, 0x40, 0xfd, 0x99, 0xc7, 0xc7, 0xc4, 0xf6, 0x1d, 0xd6, 0x4b, 0xe7, 0xfb, 0x3b, 0xa0, 0xda, - 0x9e, 0x3d, 0xf5, 0x67, 0x86, 0x05, 0xe8, 0x17, 0x70, 0x69, 0x64, 0xaa, 0x9a, 0xef, 0x4e, 0xe9, - 0x0f, 0x27, 0xc6, 0xa3, 0x7a, 0x99, 0x39, 0x7d, 0x3b, 0x76, 0x90, 0xa6, 0xaa, 0x79, 0x2e, 0x5a, - 0xd4, 0xa0, 0x93, 0xc0, 0x2b, 0xa3, 0x69, 0x21, 0x7a, 0x08, 0xab, 0xaa, 0x65, 0x8d, 0xce, 0xa6, - 0xbd, 0x57, 0x98, 0xf7, 0xeb, 0x71, 0xde, 0x77, 0xa8, 0xcd, 0xb4, 0x7b, 0xa4, 0xce, 0x48, 0x51, - 0x17, 0x6a, 0x96, 0x4d, 0x2c, 0xd5, 0x26, 0x8a, 0x65, 0x9b, 0x96, 0xe9, 0xa8, 0xa3, 0x7a, 0x95, - 0xf9, 0x7e, 0x2b, 0xce, 0xf7, 0x21, 0xd7, 0x3f, 0x14, 0xea, 0x9d, 0x04, 0xae, 0x5a, 0x51, 0x51, - 0x33, 0x0f, 0xd9, 0x13, 0x75, 0x34, 0x21, 0xf2, 0x5b, 0x50, 0x0c, 0x1d, 0x7e, 0x54, 0x87, 0xfc, - 0x98, 0x38, 0x8e, 0x3a, 0x20, 0x0c, 0x2b, 0x24, 0xec, 0x75, 0xe5, 0x0a, 0x94, 0xc2, 0x07, 0x5e, - 0x7e, 0x96, 0xf4, 0x2d, 0xe9, 0x59, 0xa6, 0x96, 0x27, 0xc4, 0x76, 0x74, 0xd3, 0xf0, 0x2c, 0x45, - 0x17, 0xbd, 0x0e, 0x65, 0xb6, 0x2b, 0x15, 0xef, 0x3b, 0x05, 0x94, 0x0c, 0x2e, 0x31, 0xe1, 0x03, - 0xa1, 0xb4, 0x01, 0x45, 0x6b, 0xdb, 0xf2, 0x55, 0xd2, 0x4c, 0x05, 0xac, 0x6d, 0xcb, 0x53, 0x78, - 0x0d, 0x4a, 0x74, 0x8e, 0xbe, 0x46, 0x86, 0xfd, 0x48, 0x91, 0xca, 0x84, 0x8a, 0xfc, 0x97, 0x14, - 0xd4, 0xa6, 0x41, 0x02, 0xdd, 0x86, 0x0c, 0xc5, 0x4b, 0x01, 0x7d, 0x8d, 0x4d, 0x0e, 0xa6, 0x9b, - 0x1e, 0x98, 0x6e, 0x76, 0x3d, 0x30, 0x6d, 0x16, 0xbe, 0xfe, 0x76, 0x23, 0xf1, 0xec, 0xef, 0x1b, - 0x49, 0xcc, 0x2c, 0xd0, 0x2b, 0xf4, 0x4c, 0xab, 0xba, 0xa1, 0xe8, 0x1a, 0x1b, 0xb2, 0x44, 0x0f, - 0xac, 0xaa, 0x1b, 0xbb, 0x1a, 0xda, 0x83, 0x5a, 0xdf, 0x34, 0x1c, 0x62, 0x38, 0x13, 0x47, 0xe1, - 0x60, 0x2d, 0x00, 0x2f, 0x72, 0x6c, 0x79, 0x0a, 0x68, 0x79, 0x9a, 0x87, 0x4c, 0x11, 0x57, 0xfb, - 0x51, 0x01, 0xba, 0x0b, 0x70, 0xa2, 0x8e, 0x74, 0x4d, 0x75, 0x4d, 0xdb, 0xa9, 0x67, 0xae, 0xa6, - 0xe7, 0x9e, 0xdd, 0x07, 0x9e, 0xca, 0x7d, 0x4b, 0x53, 0x5d, 0xd2, 0xcc, 0xd0, 0xe1, 0xe2, 0x90, - 0x25, 0x7a, 0x13, 0xaa, 0xaa, 0x65, 0x29, 0x8e, 0xab, 0xba, 0x44, 0xe9, 0x9d, 0xb9, 0xc4, 0x61, - 0x60, 0x58, 0xc2, 0x65, 0xd5, 0xb2, 0x8e, 0xa8, 0xb4, 0x49, 0x85, 0xe8, 0x0d, 0xa8, 0x50, 0xdc, - 0xd4, 0xd5, 0x91, 0x32, 0x24, 0xfa, 0x60, 0xe8, 0x32, 0xd8, 0x4b, 0xe3, 0xb2, 0x90, 0x76, 0x98, - 0x50, 0xd6, 0xfc, 0x15, 0x67, 0x98, 0x89, 0x10, 0x64, 0x34, 0xd5, 0x55, 0x59, 0x24, 0x4b, 0x98, - 0xb5, 0xa9, 0xcc, 0x52, 0xdd, 0xa1, 0x88, 0x0f, 0x6b, 0xa3, 0x35, 0xc8, 0x09, 0xb7, 0x69, 0xe6, - 0x56, 0xf4, 0xd0, 0x2a, 0x64, 0x2d, 0xdb, 0x3c, 0x21, 0x6c, 0xe9, 0x0a, 0x98, 0x77, 0xe4, 0x5f, - 0xa7, 0x60, 0x65, 0x06, 0x5d, 0xa9, 0xdf, 0xa1, 0xea, 0x0c, 0xbd, 0xdf, 0xa2, 0x6d, 0x74, 0x8b, - 0xfa, 0x55, 0x35, 0x62, 0x8b, 0x8c, 0x54, 0x9f, 0x0d, 0x75, 0x87, 0x7d, 0x17, 0xa1, 0x11, 0xda, - 0xe8, 0x00, 0x6a, 0x23, 0xd5, 0x71, 0x15, 0x8e, 0x56, 0x4a, 0x28, 0x3b, 0xcd, 0x62, 0xf4, 0x9e, - 0xea, 0xe1, 0x1b, 0xdd, 0xd4, 0xc2, 0x51, 0x65, 0x14, 0x91, 0x22, 0x0c, 0xab, 0xbd, 0xb3, 0x27, - 0xaa, 0xe1, 0xea, 0x06, 0x51, 0x66, 0x56, 0xee, 0x95, 0x19, 0xa7, 0xed, 0x13, 0x5d, 0x23, 0x46, - 0xdf, 0x5b, 0xb2, 0x4b, 0xbe, 0xb1, 0xbf, 0xa4, 0x8e, 0x8c, 0xa1, 0x12, 0xcd, 0x0f, 0xa8, 0x02, - 0x29, 0xf7, 0x54, 0x04, 0x20, 0xe5, 0x9e, 0xa2, 0xff, 0x83, 0x0c, 0x9d, 0x24, 0x9b, 0x7c, 0x65, - 0x4e, 0x62, 0x15, 0x76, 0xdd, 0x33, 0x8b, 0x60, 0xa6, 0x29, 0xcb, 0xfe, 0x71, 0xf0, 0x73, 0xc6, - 0xb4, 0x57, 0xf9, 0x6d, 0xa8, 0x4e, 0x25, 0x85, 0xd0, 0xfa, 0x25, 0xc3, 0xeb, 0x27, 0x57, 0xa1, - 0x1c, 0xc9, 0x00, 0xf2, 0x1a, 0xac, 0xce, 0x03, 0x74, 0x79, 0xe8, 0xcb, 0x23, 0xc0, 0x8c, 0x6e, - 0x42, 0xc1, 0x47, 0x74, 0x7e, 0x1c, 0x67, 0x63, 0xe5, 0x29, 0x63, 0x5f, 0x95, 0x9e, 0x43, 0xba, - 0xad, 0xd9, 0x7e, 0x48, 0xb1, 0x81, 0xe7, 0x55, 0xcb, 0xea, 0xa8, 0xce, 0x50, 0xfe, 0x1c, 0xea, - 0x71, 0x68, 0x3d, 0x35, 0x8d, 0x8c, 0xbf, 0x0d, 0xd7, 0x20, 0x77, 0x6c, 0xda, 0x63, 0xd5, 0x65, - 0xce, 0xca, 0x58, 0xf4, 0xe8, 0xf6, 0xe4, 0xc8, 0x9d, 0x66, 0x62, 0xde, 0x91, 0x15, 0x78, 0x25, - 0x16, 0xb1, 0xa9, 0x89, 0x6e, 0x68, 0x84, 0xc7, 0xb3, 0x8c, 0x79, 0x27, 0x70, 0xc4, 0x07, 0xcb, - 0x3b, 0xf4, 0x67, 0x1d, 0x36, 0x57, 0xe6, 0x5f, 0xc2, 0xa2, 0x27, 0x2b, 0xb0, 0x36, 0x1f, 0xb6, - 0xd1, 0x15, 0x00, 0x8e, 0x9b, 0xe2, 0xd4, 0xa5, 0xaf, 0x95, 0xb0, 0xc4, 0x24, 0x77, 0xe8, 0xd1, - 0x7b, 0x13, 0xaa, 0xc1, 0x67, 0xc5, 0xd1, 0x9f, 0xf0, 0xad, 0x91, 0xc6, 0x65, 0x5f, 0xe7, 0x48, - 0x7f, 0x42, 0xe4, 0xef, 0x0a, 0x50, 0xc0, 0xc4, 0xb1, 0x28, 0xe8, 0xa0, 0x26, 0x48, 0xe4, 0xb4, - 0x4f, 0x2c, 0xd7, 0xc3, 0xe9, 0xf9, 0x64, 0x87, 0x6b, 0xb7, 0x3d, 0x4d, 0xca, 0x34, 0x7c, 0x33, - 0x74, 0x43, 0x90, 0xc9, 0x78, 0x5e, 0x28, 0xcc, 0xc3, 0x6c, 0xf2, 0x96, 0xc7, 0x26, 0xd3, 0xb1, - 0xe4, 0x82, 0x5b, 0x4d, 0xd1, 0xc9, 0x1b, 0x82, 0x4e, 0x66, 0x16, 0xfc, 0x58, 0x84, 0x4f, 0xb6, - 0x22, 0x7c, 0x32, 0xbb, 0x60, 0x9a, 0x31, 0x84, 0xf2, 0x96, 0x47, 0x28, 0x73, 0x0b, 0x46, 0x3c, - 0xc5, 0x28, 0xef, 0x46, 0x19, 0x25, 0x67, 0x83, 0xaf, 0xc7, 0x5a, 0xc7, 0x52, 0xca, 0x1f, 0x86, - 0x28, 0x65, 0x21, 0x96, 0xcf, 0x71, 0x27, 0x73, 0x38, 0x65, 0x2b, 0xc2, 0x29, 0xa5, 0x05, 0x31, - 0x88, 0x21, 0x95, 0x1f, 0x85, 0x49, 0x25, 0xc4, 0xf2, 0x52, 0xb1, 0xde, 0xf3, 0x58, 0xe5, 0x07, - 0x3e, 0xab, 0x2c, 0xc6, 0xd2, 0x62, 0x31, 0x87, 0x69, 0x5a, 0x79, 0x30, 0x43, 0x2b, 0x39, 0x0d, - 0x7c, 0x33, 0xd6, 0xc5, 0x02, 0x5e, 0x79, 0x30, 0xc3, 0x2b, 0xcb, 0x0b, 0x1c, 0x2e, 0x20, 0x96, - 0xbf, 0x9c, 0x4f, 0x2c, 0xe3, 0xa9, 0x9f, 0x18, 0xe6, 0x72, 0xcc, 0x52, 0x89, 0x61, 0x96, 0x9c, - 0xfd, 0xbd, 0x13, 0xeb, 0x7e, 0x69, 0x6a, 0x79, 0x7f, 0x0e, 0xb5, 0xac, 0x31, 0xe7, 0xd7, 0x62, - 0x9d, 0x5f, 0x84, 0x5b, 0xbe, 0x4d, 0x33, 0xfb, 0x14, 0x94, 0x50, 0x74, 0x24, 0xb6, 0x6d, 0xda, - 0x82, 0x25, 0xf2, 0x8e, 0x7c, 0x8d, 0x72, 0x8d, 0x00, 0x36, 0xce, 0xe1, 0xa1, 0x2c, 0x0b, 0x85, - 0xa0, 0x42, 0xfe, 0x63, 0x32, 0xb0, 0x65, 0xe9, 0x39, 0xcc, 0x53, 0x24, 0xc1, 0x53, 0x42, 0xec, - 0x34, 0x15, 0x65, 0xa7, 0x1b, 0x50, 0xa4, 0xd9, 0x65, 0x8a, 0x78, 0xaa, 0x96, 0x4f, 0x3c, 0xaf, - 0xc3, 0x0a, 0xa3, 0x0f, 0x1c, 0x6c, 0x45, 0x4a, 0xc9, 0x30, 0xa4, 0xad, 0xd2, 0x0f, 0x7c, 0xcf, - 0xf3, 0xdc, 0xf2, 0x1e, 0x5c, 0x0a, 0xe9, 0xfa, 0x59, 0x8b, 0xb3, 0xb0, 0x9a, 0xaf, 0xbd, 0x23, - 0xd2, 0xd7, 0x9f, 0x93, 0x41, 0x84, 0x02, 0xc6, 0x3a, 0x8f, 0x5c, 0x26, 0xff, 0x4b, 0xe4, 0x32, - 0xf5, 0x1f, 0x93, 0xcb, 0x70, 0x16, 0x4e, 0x47, 0xb3, 0xf0, 0x77, 0xc9, 0x60, 0x4d, 0x7c, 0xaa, - 0xd8, 0x37, 0x35, 0x22, 0xf2, 0x22, 0x6b, 0xa3, 0x1a, 0xa4, 0x47, 0xe6, 0x40, 0x64, 0x3f, 0xda, - 0xa4, 0x5a, 0x3e, 0xb6, 0x4b, 0x02, 0xba, 0xfd, 0x94, 0x9a, 0x65, 0x11, 0x16, 0x29, 0xb5, 0x06, - 0xe9, 0x47, 0x84, 0x23, 0x71, 0x09, 0xd3, 0x26, 0xd5, 0x63, 0x9b, 0x8c, 0xe1, 0x6b, 0x09, 0xf3, - 0x0e, 0xba, 0x0d, 0x12, 0x2b, 0xca, 0x28, 0xa6, 0xe5, 0x08, 0xd0, 0x7c, 0x35, 0x3c, 0x57, 0x5e, - 0x7b, 0xd9, 0x3c, 0xa4, 0x3a, 0x07, 0x96, 0x83, 0x0b, 0x96, 0x68, 0x85, 0xd8, 0x82, 0x14, 0x21, - 0xad, 0x97, 0x41, 0xa2, 0xa3, 0x77, 0x2c, 0xb5, 0x4f, 0x18, 0x02, 0x4a, 0x38, 0x10, 0xc8, 0x0f, - 0x01, 0xcd, 0xe2, 0x38, 0xea, 0x40, 0x8e, 0x9c, 0x10, 0xc3, 0x75, 0x58, 0xd2, 0x2e, 0x6e, 0xaf, - 0xcd, 0x61, 0x84, 0xc4, 0x70, 0x9b, 0x75, 0x1a, 0xe4, 0x7f, 0x7e, 0xbb, 0x51, 0xe3, 0xda, 0xef, - 0x9a, 0x63, 0xdd, 0x25, 0x63, 0xcb, 0x3d, 0xc3, 0xc2, 0x5e, 0xfe, 0x5b, 0x8a, 0xd2, 0xb3, 0x08, - 0xc6, 0xcf, 0x8d, 0xad, 0xb7, 0xe5, 0x53, 0x21, 0x6a, 0xbe, 0x5c, 0xbc, 0xd7, 0x01, 0x06, 0xaa, - 0xa3, 0x3c, 0x56, 0x0d, 0x97, 0x68, 0x22, 0xe8, 0x21, 0x09, 0x6a, 0x40, 0x81, 0xf6, 0x26, 0x0e, - 0xd1, 0xc4, 0x2d, 0xc1, 0xef, 0x87, 0xe6, 0x99, 0xff, 0x7e, 0xf3, 0x8c, 0x46, 0xb9, 0x30, 0x15, - 0xe5, 0x10, 0x75, 0x92, 0xc2, 0xd4, 0x89, 0x8e, 0xcd, 0xb2, 0x75, 0xd3, 0xd6, 0xdd, 0x33, 0xb6, - 0x34, 0x69, 0xec, 0xf7, 0xe9, 0xa5, 0x73, 0x4c, 0xc6, 0x96, 0x69, 0x8e, 0x14, 0x0e, 0x37, 0x45, - 0x66, 0x5a, 0x12, 0xc2, 0x36, 0x43, 0x9d, 0xdf, 0xa4, 0x82, 0xf3, 0x17, 0x50, 0xe4, 0xff, 0xb9, - 0x00, 0xcb, 0xbf, 0x65, 0x17, 0xe7, 0x68, 0x16, 0x47, 0x47, 0xb0, 0xe2, 0x1f, 0x7f, 0x65, 0xc2, - 0x60, 0xc1, 0xdb, 0xd0, 0xcb, 0xe2, 0x47, 0xed, 0x24, 0x2a, 0x76, 0xd0, 0xa7, 0xf0, 0xf2, 0x14, - 0xb6, 0xf9, 0xae, 0x53, 0xcb, 0x42, 0xdc, 0x4b, 0x51, 0x88, 0xf3, 0x5c, 0x07, 0xc1, 0x4a, 0x7f, - 0xcf, 0x53, 0xb7, 0x4b, 0xef, 0x62, 0x61, 0x52, 0x32, 0x77, 0xf9, 0x5f, 0x87, 0xb2, 0x4d, 0x5c, - 0x55, 0x37, 0x94, 0xc8, 0x6d, 0xb7, 0xc4, 0x85, 0xe2, 0x0e, 0x7d, 0x08, 0x2f, 0xcd, 0x25, 0x27, - 0xe8, 0xff, 0x41, 0x0a, 0x78, 0x4d, 0x32, 0xe6, 0xe2, 0xe8, 0x5f, 0x86, 0x02, 0x5d, 0xf9, 0x4f, - 0xc9, 0xc0, 0x65, 0xf4, 0x7a, 0xd5, 0x86, 0x9c, 0x4d, 0x9c, 0xc9, 0x88, 0x5f, 0x78, 0x2a, 0xdb, - 0xef, 0x2d, 0x47, 0x6b, 0xa8, 0x74, 0x32, 0x72, 0xb1, 0x30, 0x96, 0x1f, 0x42, 0x8e, 0x4b, 0x50, - 0x11, 0xf2, 0xf7, 0xf7, 0xef, 0xed, 0x1f, 0x7c, 0xb2, 0x5f, 0x4b, 0x20, 0x80, 0xdc, 0x4e, 0xab, - 0xd5, 0x3e, 0xec, 0xd6, 0x92, 0x48, 0x82, 0xec, 0x4e, 0xf3, 0x00, 0x77, 0x6b, 0x29, 0x2a, 0xc6, - 0xed, 0x8f, 0xdb, 0xad, 0x6e, 0x2d, 0x8d, 0x56, 0xa0, 0xcc, 0xdb, 0xca, 0xdd, 0x03, 0xfc, 0xd3, - 0x9d, 0x6e, 0x2d, 0x13, 0x12, 0x1d, 0xb5, 0xf7, 0xef, 0xb4, 0x71, 0x2d, 0x2b, 0xbf, 0x4f, 0x6f, - 0x54, 0x31, 0x44, 0x28, 0xb8, 0x3b, 0x25, 0x43, 0x77, 0x27, 0xf9, 0xf7, 0x29, 0x68, 0xc4, 0xb3, - 0x1b, 0xf4, 0xf1, 0xd4, 0xc4, 0xb7, 0x2f, 0x40, 0x8d, 0xa6, 0x66, 0x8f, 0xde, 0x80, 0x8a, 0x4d, - 0x8e, 0x89, 0xdb, 0x1f, 0x72, 0xb6, 0xc5, 0x53, 0x66, 0x19, 0x97, 0x85, 0x94, 0x19, 0x39, 0x5c, - 0xed, 0x0b, 0xd2, 0x77, 0x15, 0x8e, 0x45, 0x7c, 0xd3, 0x49, 0x54, 0x8d, 0x4a, 0x8f, 0xb8, 0x50, - 0xfe, 0xfc, 0x42, 0xb1, 0x94, 0x20, 0x8b, 0xdb, 0x5d, 0xfc, 0x69, 0x2d, 0x8d, 0x10, 0x54, 0x58, - 0x53, 0x39, 0xda, 0xdf, 0x39, 0x3c, 0xea, 0x1c, 0xd0, 0x58, 0x5e, 0x82, 0xaa, 0x17, 0x4b, 0x4f, - 0x98, 0x95, 0x6f, 0xc3, 0xcb, 0x31, 0xd4, 0x6c, 0xc1, 0xfd, 0x51, 0xfe, 0x0c, 0x2a, 0xd1, 0x6a, - 0x07, 0x0d, 0xbe, 0x6d, 0x4e, 0x0c, 0x8d, 0x85, 0x31, 0x8b, 0x79, 0x07, 0xdd, 0x84, 0xec, 0x89, - 0xc9, 0x0f, 0xe8, 0xfc, 0x5d, 0xfa, 0xc0, 0x74, 0x49, 0xa8, 0x5a, 0xc2, 0xb5, 0xe5, 0x27, 0x90, - 0x65, 0xe7, 0x8d, 0x9e, 0x1d, 0x56, 0xb7, 0x10, 0x74, 0x8c, 0xb6, 0xd1, 0x67, 0x00, 0xaa, 0xeb, - 0xda, 0x7a, 0x6f, 0x12, 0x38, 0xde, 0x98, 0x7f, 0x5e, 0x77, 0x3c, 0xbd, 0xe6, 0x65, 0x71, 0x70, - 0x57, 0x03, 0xd3, 0xd0, 0xe1, 0x0d, 0x39, 0x94, 0xf7, 0xa1, 0x12, 0xb5, 0xf5, 0x08, 0x04, 0x1f, - 0x43, 0x94, 0x40, 0x70, 0x3e, 0x28, 0x08, 0x84, 0x4f, 0x3f, 0xd2, 0xbc, 0x46, 0xc5, 0x3a, 0xf2, - 0xd3, 0x24, 0x14, 0xba, 0xa7, 0x62, 0x25, 0x63, 0xca, 0x23, 0x81, 0x69, 0x2a, 0x5c, 0x0c, 0xe0, - 0xf5, 0x96, 0xb4, 0x5f, 0xc5, 0xf9, 0xc8, 0xdf, 0xab, 0x99, 0x65, 0xaf, 0x64, 0x5e, 0x39, 0x4b, - 0x9c, 0xcf, 0x0f, 0x41, 0xf2, 0xd1, 0x96, 0xf2, 0x5a, 0x55, 0xd3, 0x6c, 0xe2, 0x38, 0xe2, 0xc4, - 0x78, 0x5d, 0x56, 0x6d, 0x33, 0x1f, 0x8b, 0x72, 0x43, 0x1a, 0xf3, 0x8e, 0xac, 0x41, 0x75, 0x0a, - 0xaa, 0xd1, 0x87, 0x90, 0xb7, 0x26, 0x3d, 0xc5, 0x0b, 0xcf, 0xd4, 0x9b, 0x8d, 0xc7, 0x98, 0x26, - 0xbd, 0x91, 0xde, 0xbf, 0x47, 0xce, 0xbc, 0xc1, 0x58, 0x93, 0xde, 0x3d, 0x1e, 0x45, 0xfe, 0x2b, - 0xa9, 0xf0, 0xaf, 0x9c, 0x40, 0xc1, 0xdb, 0x14, 0xe8, 0x47, 0x20, 0xf9, 0x59, 0xc0, 0x2f, 0xc2, - 0xc6, 0xa6, 0x0f, 0xe1, 0x3e, 0x30, 0xa1, 0xf4, 0xdb, 0xd1, 0x07, 0x06, 0xd1, 0x94, 0x80, 0x59, - 0xb3, 0x5f, 0x2b, 0xe0, 0x2a, 0xff, 0xb0, 0xe7, 0xd1, 0x6a, 0xf9, 0x5f, 0x49, 0x28, 0x78, 0xc5, - 0x36, 0xf4, 0x7e, 0x68, 0xdf, 0x55, 0xe6, 0x54, 0x0e, 0x3c, 0xc5, 0xa0, 0x60, 0x16, 0x1d, 0x6b, - 0xea, 0xe2, 0x63, 0x8d, 0xab, 0x7c, 0x7a, 0x35, 0xe8, 0xcc, 0x85, 0x6b, 0xd0, 0xef, 0x02, 0x72, - 0x4d, 0x57, 0x1d, 0x29, 0x27, 0xa6, 0xab, 0x1b, 0x03, 0x85, 0x07, 0x9b, 0xb3, 0x88, 0x1a, 0xfb, - 0xf2, 0x80, 0x7d, 0x38, 0x64, 0x71, 0xff, 0x55, 0x12, 0x0a, 0x7e, 0x3a, 0xb8, 0x68, 0xfd, 0x6b, - 0x0d, 0x72, 0x02, 0xf1, 0x78, 0x01, 0x4c, 0xf4, 0xfc, 0x52, 0x6c, 0x26, 0x54, 0x8a, 0x6d, 0x40, - 0x61, 0x4c, 0x5c, 0x95, 0x01, 0x0b, 0xbf, 0xdc, 0xf8, 0xfd, 0xeb, 0x1f, 0x40, 0x31, 0x54, 0x8a, - 0xa4, 0x27, 0x6f, 0xbf, 0xfd, 0x49, 0x2d, 0xd1, 0xc8, 0x3f, 0xfd, 0xea, 0x6a, 0x7a, 0x9f, 0x3c, - 0xa6, 0x7b, 0x16, 0xb7, 0x5b, 0x9d, 0x76, 0xeb, 0x5e, 0x2d, 0xd9, 0x28, 0x3e, 0xfd, 0xea, 0x6a, - 0x1e, 0x13, 0x56, 0xb5, 0xb8, 0xde, 0x81, 0x52, 0x78, 0x55, 0xa2, 0xa0, 0x89, 0xa0, 0x72, 0xe7, - 0xfe, 0xe1, 0xde, 0x6e, 0x6b, 0xa7, 0xdb, 0x56, 0x1e, 0x1c, 0x74, 0xdb, 0xb5, 0x24, 0x7a, 0x19, - 0x2e, 0xed, 0xed, 0xfe, 0xa4, 0xd3, 0x55, 0x5a, 0x7b, 0xbb, 0xed, 0xfd, 0xae, 0xb2, 0xd3, 0xed, - 0xee, 0xb4, 0xee, 0xd5, 0x52, 0xdb, 0xbf, 0x03, 0xa8, 0xee, 0x34, 0x5b, 0xbb, 0x14, 0xf0, 0xf5, - 0xbe, 0xca, 0x6e, 0x9e, 0x2d, 0xc8, 0xb0, 0xbb, 0xe5, 0xb9, 0xcf, 0x9f, 0x8d, 0xf3, 0xeb, 0x59, - 0xe8, 0x2e, 0x64, 0xd9, 0xb5, 0x13, 0x9d, 0xff, 0x1e, 0xda, 0x58, 0x50, 0xe0, 0xa2, 0x83, 0x61, - 0xc7, 0xe3, 0xdc, 0x07, 0xd2, 0xc6, 0xf9, 0xf5, 0x2e, 0x84, 0x41, 0x0a, 0x68, 0xeb, 0xe2, 0x07, - 0xc3, 0xc6, 0x12, 0x60, 0x83, 0xf6, 0x20, 0xef, 0xdd, 0x34, 0x16, 0x3d, 0x61, 0x36, 0x16, 0x16, - 0xa4, 0x68, 0xb8, 0xf8, 0x8d, 0xf0, 0xfc, 0xf7, 0xd8, 0xc6, 0x82, 0xea, 0x1a, 0xda, 0x85, 0x9c, - 0xa0, 0x62, 0x0b, 0x9e, 0x25, 0x1b, 0x8b, 0x0a, 0x4c, 0x34, 0x68, 0xc1, 0x5d, 0x7b, 0xf1, 0x2b, - 0x73, 0x63, 0x89, 0xc2, 0x21, 0xba, 0x0f, 0x10, 0xba, 0xff, 0x2d, 0xf1, 0x7c, 0xdc, 0x58, 0xa6, - 0x20, 0x88, 0x0e, 0xa0, 0xe0, 0xd3, 0xf1, 0x85, 0x8f, 0xb9, 0x8d, 0xc5, 0x95, 0x39, 0xf4, 0x10, - 0xca, 0x51, 0x1a, 0xba, 0xdc, 0x13, 0x6d, 0x63, 0xc9, 0x92, 0x1b, 0xf5, 0x1f, 0xe5, 0xa4, 0xcb, - 0x3d, 0xd9, 0x36, 0x96, 0xac, 0xc0, 0xa1, 0x2f, 0x60, 0x65, 0x96, 0x33, 0x2e, 0xff, 0x82, 0xdb, - 0xb8, 0x40, 0x4d, 0x0e, 0x8d, 0x01, 0xcd, 0xe1, 0x9a, 0x17, 0x78, 0xd0, 0x6d, 0x5c, 0xa4, 0x44, - 0x87, 0x34, 0xa8, 0x4e, 0x13, 0xb8, 0x65, 0x1f, 0x78, 0x1b, 0x4b, 0x97, 0xeb, 0x9a, 0xed, 0xaf, - 0x9f, 0xaf, 0x27, 0xbf, 0x79, 0xbe, 0x9e, 0xfc, 0xc7, 0xf3, 0xf5, 0xe4, 0xb3, 0x17, 0xeb, 0x89, - 0x6f, 0x5e, 0xac, 0x27, 0xfe, 0xfa, 0x62, 0x3d, 0xf1, 0xf3, 0x77, 0x06, 0xba, 0x3b, 0x9c, 0xf4, - 0x36, 0xfb, 0xe6, 0x78, 0x2b, 0xfc, 0x7f, 0x94, 0x79, 0xff, 0x91, 0xe9, 0xe5, 0x58, 0xea, 0xba, - 0xf1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0xe5, 0xdf, 0xba, 0x43, 0x23, 0x00, 0x00, + // 2926 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5, + 0x15, 0xd7, 0xa7, 0xad, 0x79, 0xb2, 0x3e, 0xdc, 0x5e, 0x16, 0x31, 0xec, 0xda, 0xcb, 0x50, 0xc0, + 0xb2, 0x80, 0x1d, 0xbc, 0x05, 0x59, 0x8a, 0x24, 0x60, 0x69, 0xe5, 0xc8, 0xac, 0x63, 0x3b, 0x6d, + 0xed, 0x52, 0x24, 0xb0, 0xc3, 0x48, 0xd3, 0xb6, 0x86, 0x95, 0x66, 0x86, 0x99, 0x91, 0xb0, 0xf7, + 0x98, 0x4a, 0x2e, 0x54, 0x0e, 0x1c, 0x73, 0xe1, 0x94, 0xfc, 0x11, 0x39, 0xe5, 0x94, 0x03, 0x87, + 0xa4, 0x8a, 0x63, 0x0e, 0x29, 0x92, 0x62, 0x6f, 0xf9, 0x07, 0x72, 0x4a, 0x55, 0xaa, 0x3f, 0xe6, + 0x4b, 0xd2, 0xe8, 0x03, 0x72, 0xcb, 0xad, 0xfb, 0xf5, 0x7b, 0x6f, 0xba, 0x5f, 0x77, 0xbf, 0xf7, + 0x7b, 0x6f, 0x1a, 0x9e, 0xf5, 0x88, 0xa9, 0x13, 0x67, 0x60, 0x98, 0xde, 0x8e, 0xd6, 0xe9, 0x1a, + 0x3b, 0xde, 0xa5, 0x4d, 0xdc, 0x6d, 0xdb, 0xb1, 0x3c, 0x0b, 0x55, 0xc2, 0xc1, 0x6d, 0x3a, 0x28, + 0x5f, 0x8f, 0x70, 0x77, 0x9d, 0x4b, 0xdb, 0xb3, 0x76, 0x6c, 0xc7, 0xb2, 0xce, 0x38, 0xbf, 0x7c, + 0x2d, 0x32, 0xcc, 0xf4, 0x44, 0xb5, 0xc5, 0x46, 0x85, 0xf0, 0x23, 0x72, 0xe9, 0x8f, 0x5e, 0x9f, + 0x90, 0xb5, 0x35, 0x47, 0x1b, 0xf8, 0xc3, 0x5b, 0xe7, 0x96, 0x75, 0xde, 0x27, 0x3b, 0xac, 0xd7, + 0x19, 0x9e, 0xed, 0x78, 0xc6, 0x80, 0xb8, 0x9e, 0x36, 0xb0, 0x05, 0xc3, 0x95, 0x73, 0xeb, 0xdc, + 0x62, 0xcd, 0x1d, 0xda, 0xe2, 0x54, 0xe5, 0xaf, 0x12, 0xac, 0x62, 0xf2, 0xe9, 0x90, 0xb8, 0x1e, + 0xda, 0x85, 0x1c, 0xe9, 0xf6, 0xac, 0x5a, 0xfa, 0x46, 0xfa, 0x66, 0x71, 0xf7, 0xda, 0xf6, 0xd8, + 0xe2, 0xb6, 0x05, 0x5f, 0xb3, 0xdb, 0xb3, 0x5a, 0x29, 0xcc, 0x78, 0xd1, 0x1b, 0x90, 0x3f, 0xeb, + 0x0f, 0xdd, 0x5e, 0x2d, 0xc3, 0x84, 0xae, 0x27, 0x09, 0xed, 0x53, 0xa6, 0x56, 0x0a, 0x73, 0x6e, + 0xfa, 0x29, 0xc3, 0x3c, 0xb3, 0x6a, 0xd9, 0xd9, 0x9f, 0x3a, 0x30, 0xcf, 0xd8, 0xa7, 0x28, 0x2f, + 0xaa, 0x03, 0x18, 0xa6, 0xe1, 0xa9, 0xdd, 0x9e, 0x66, 0x98, 0xb5, 0x1c, 0x93, 0x7c, 0x2e, 0x59, + 0xd2, 0xf0, 0x1a, 0x94, 0xb1, 0x95, 0xc2, 0x92, 0xe1, 0x77, 0xe8, 0x74, 0x3f, 0x1d, 0x12, 0xe7, + 0xb2, 0x96, 0x9f, 0x3d, 0xdd, 0x9f, 0x53, 0x26, 0x3a, 0x5d, 0xc6, 0x8d, 0x9a, 0x50, 0xec, 0x90, + 0x73, 0xc3, 0x54, 0x3b, 0x7d, 0xab, 0xfb, 0xa8, 0xb6, 0xc2, 0x84, 0x95, 0x24, 0xe1, 0x3a, 0x65, + 0xad, 0x53, 0xce, 0x56, 0x0a, 0x43, 0x27, 0xe8, 0xa1, 0x1f, 0x41, 0xa1, 0xdb, 0x23, 0xdd, 0x47, + 0xaa, 0x77, 0x51, 0x5b, 0x65, 0x3a, 0xb6, 0x92, 0x74, 0x34, 0x28, 0x5f, 0xfb, 0xa2, 0x95, 0xc2, + 0xab, 0x5d, 0xde, 0xa4, 0xeb, 0xd7, 0x49, 0xdf, 0x18, 0x11, 0x87, 0xca, 0x17, 0x66, 0xaf, 0xff, + 0x2e, 0xe7, 0x64, 0x1a, 0x24, 0xdd, 0xef, 0xa0, 0x77, 0x40, 0x22, 0xa6, 0x2e, 0x96, 0x21, 0x31, + 0x15, 0x37, 0x12, 0xf7, 0xd9, 0xd4, 0xfd, 0x45, 0x14, 0x88, 0x68, 0xa3, 0x3b, 0xb0, 0xd2, 0xb5, + 0x06, 0x03, 0xc3, 0xab, 0x01, 0x93, 0xde, 0x4c, 0x5c, 0x00, 0xe3, 0x6a, 0xa5, 0xb0, 0xe0, 0x47, + 0x47, 0x50, 0xee, 0x1b, 0xae, 0xa7, 0xba, 0xa6, 0x66, 0xbb, 0x3d, 0xcb, 0x73, 0x6b, 0x45, 0xa6, + 0xe1, 0x85, 0x24, 0x0d, 0x87, 0x86, 0xeb, 0x9d, 0xfa, 0xcc, 0xad, 0x14, 0x2e, 0xf5, 0xa3, 0x04, + 0xaa, 0xcf, 0x3a, 0x3b, 0x23, 0x4e, 0xa0, 0xb0, 0xb6, 0x36, 0x5b, 0xdf, 0x31, 0xe5, 0xf6, 0xe5, + 0xa9, 0x3e, 0x2b, 0x4a, 0x40, 0xbf, 0x84, 0x8d, 0xbe, 0xa5, 0xe9, 0x81, 0x3a, 0xb5, 0xdb, 0x1b, + 0x9a, 0x8f, 0x6a, 0x25, 0xa6, 0xf4, 0xe5, 0xc4, 0x49, 0x5a, 0x9a, 0xee, 0xab, 0x68, 0x50, 0x81, + 0x56, 0x0a, 0xaf, 0xf7, 0xc7, 0x89, 0xe8, 0x21, 0x5c, 0xd1, 0x6c, 0xbb, 0x7f, 0x39, 0xae, 0xbd, + 0xcc, 0xb4, 0xdf, 0x4a, 0xd2, 0xbe, 0x47, 0x65, 0xc6, 0xd5, 0x23, 0x6d, 0x82, 0x8a, 0xda, 0x50, + 0xb5, 0x1d, 0x62, 0x6b, 0x0e, 0x51, 0x6d, 0xc7, 0xb2, 0x2d, 0x57, 0xeb, 0xd7, 0x2a, 0x4c, 0xf7, + 0x4b, 0x49, 0xba, 0x4f, 0x38, 0xff, 0x89, 0x60, 0x6f, 0xa5, 0x70, 0xc5, 0x8e, 0x93, 0xe8, 0xb1, + 0x27, 0x17, 0x54, 0x5c, 0x1d, 0x59, 0x1e, 0xa9, 0x55, 0x67, 0x1f, 0xfb, 0x26, 0x63, 0x7d, 0x60, + 0x79, 0x84, 0x1e, 0x7b, 0x12, 0xf4, 0x90, 0x06, 0x4f, 0x8d, 0x88, 0x63, 0x9c, 0x5d, 0x32, 0x35, + 0x2a, 0x1b, 0x71, 0x0d, 0xcb, 0xac, 0xad, 0x33, 0x85, 0xaf, 0x24, 0x29, 0x7c, 0xc0, 0x84, 0xa8, + 0x8a, 0xa6, 0x2f, 0xd2, 0x4a, 0xe1, 0x8d, 0xd1, 0x24, 0xb9, 0xbe, 0x0a, 0xf9, 0x91, 0xd6, 0x1f, + 0x12, 0xe5, 0x25, 0x28, 0x46, 0xdc, 0x14, 0xaa, 0xc1, 0xea, 0x80, 0xb8, 0xae, 0x76, 0x4e, 0x98, + 0x57, 0x93, 0xb0, 0xdf, 0x55, 0xca, 0xb0, 0x16, 0x75, 0x4d, 0xca, 0x17, 0xe9, 0x40, 0x92, 0x7a, + 0x1d, 0x2a, 0x39, 0x22, 0x0e, 0x9b, 0xa6, 0x90, 0x14, 0x5d, 0xf4, 0x3c, 0x94, 0xd8, 0xfd, 0x51, + 0xfd, 0x71, 0xea, 0xfa, 0x72, 0x78, 0x8d, 0x11, 0x1f, 0x08, 0xa6, 0x2d, 0x28, 0xda, 0xbb, 0x76, + 0xc0, 0x92, 0x65, 0x2c, 0x60, 0xef, 0xda, 0x3e, 0xc3, 0x73, 0xb0, 0x46, 0xd7, 0x1a, 0x70, 0xe4, + 0xd8, 0x47, 0x8a, 0x94, 0x26, 0x58, 0x94, 0xbf, 0x64, 0xa0, 0x3a, 0xee, 0xce, 0xd0, 0x1d, 0xc8, + 0x51, 0xcf, 0x2e, 0x9c, 0xb4, 0xbc, 0xcd, 0xdd, 0xfe, 0xb6, 0xef, 0xf6, 0xb7, 0xdb, 0xbe, 0xdb, + 0xaf, 0x17, 0xbe, 0xfa, 0x66, 0x2b, 0xf5, 0xc5, 0x3f, 0xb6, 0xd2, 0x98, 0x49, 0xa0, 0x67, 0xa8, + 0xf7, 0xd1, 0x0c, 0x53, 0x35, 0x74, 0x36, 0x65, 0x89, 0xba, 0x16, 0xcd, 0x30, 0x0f, 0x74, 0x74, + 0x08, 0xd5, 0xae, 0x65, 0xba, 0xc4, 0x74, 0x87, 0xae, 0xca, 0xc3, 0x8a, 0x70, 0xcd, 0x31, 0x07, + 0xc3, 0x83, 0x55, 0xc3, 0xe7, 0x3c, 0x61, 0x8c, 0xb8, 0xd2, 0x8d, 0x13, 0xd0, 0x3e, 0xc0, 0x48, + 0xeb, 0x1b, 0xba, 0xe6, 0x59, 0x8e, 0x5b, 0xcb, 0xdd, 0xc8, 0x4e, 0xf5, 0x32, 0x0f, 0x7c, 0x96, + 0xfb, 0xb6, 0xae, 0x79, 0xa4, 0x9e, 0xa3, 0xd3, 0xc5, 0x11, 0x49, 0xf4, 0x22, 0x54, 0x34, 0xdb, + 0x56, 0x5d, 0x4f, 0xf3, 0x88, 0xda, 0xb9, 0xf4, 0x88, 0xcb, 0xdc, 0xf6, 0x1a, 0x2e, 0x69, 0xb6, + 0x7d, 0x4a, 0xa9, 0x75, 0x4a, 0x44, 0x2f, 0x40, 0x99, 0x7a, 0x78, 0x43, 0xeb, 0xab, 0x3d, 0x62, + 0x9c, 0xf7, 0x3c, 0xe6, 0xa0, 0xb3, 0xb8, 0x24, 0xa8, 0x2d, 0x46, 0x54, 0xf4, 0x60, 0xc7, 0x99, + 0x77, 0x47, 0x08, 0x72, 0xba, 0xe6, 0x69, 0xcc, 0x92, 0x6b, 0x98, 0xb5, 0x29, 0xcd, 0xd6, 0xbc, + 0x9e, 0xb0, 0x0f, 0x6b, 0xa3, 0xab, 0xb0, 0x22, 0xd4, 0x66, 0x99, 0x5a, 0xd1, 0x43, 0x57, 0x20, + 0x6f, 0x3b, 0xd6, 0x88, 0xb0, 0xad, 0x2b, 0x60, 0xde, 0x51, 0x7e, 0x9d, 0x81, 0xf5, 0x89, 0x38, + 0x40, 0xf5, 0xf6, 0x34, 0xb7, 0xe7, 0x7f, 0x8b, 0xb6, 0xd1, 0x9b, 0x54, 0xaf, 0xa6, 0x13, 0x47, + 0xc4, 0xce, 0xda, 0xa4, 0xa9, 0x5b, 0x6c, 0x5c, 0x98, 0x46, 0x70, 0xa3, 0x63, 0xa8, 0xf6, 0x35, + 0xd7, 0x53, 0xb9, 0x5f, 0x55, 0x23, 0x71, 0x74, 0x32, 0x9a, 0x1c, 0x6a, 0xbe, 0x27, 0xa6, 0x87, + 0x5a, 0x28, 0x2a, 0xf7, 0x63, 0x54, 0x84, 0xe1, 0x4a, 0xe7, 0xf2, 0xb1, 0x66, 0x7a, 0x86, 0x49, + 0xd4, 0x89, 0x9d, 0x7b, 0x66, 0x42, 0x69, 0x73, 0x64, 0xe8, 0xc4, 0xec, 0xfa, 0x5b, 0xb6, 0x11, + 0x08, 0x07, 0x5b, 0xea, 0x2a, 0x18, 0xca, 0xf1, 0x48, 0x86, 0xca, 0x90, 0xf1, 0x2e, 0x84, 0x01, + 0x32, 0xde, 0x05, 0xfa, 0x01, 0xe4, 0xe8, 0x22, 0xd9, 0xe2, 0xcb, 0x53, 0x20, 0x80, 0x90, 0x6b, + 0x5f, 0xda, 0x04, 0x33, 0x4e, 0x45, 0x09, 0xae, 0x43, 0x10, 0xdd, 0xc6, 0xb5, 0x2a, 0x2f, 0x43, + 0x65, 0x2c, 0x7c, 0x45, 0xf6, 0x2f, 0x1d, 0xdd, 0x3f, 0xa5, 0x02, 0xa5, 0x58, 0xac, 0x52, 0xae, + 0xc2, 0x95, 0x69, 0xa1, 0x47, 0xe9, 0x05, 0xf4, 0x58, 0x08, 0x41, 0x6f, 0x40, 0x21, 0x88, 0x3d, + 0xfc, 0x3a, 0x4e, 0xda, 0xca, 0x67, 0xc6, 0x01, 0x2b, 0xbd, 0x87, 0xf4, 0x58, 0xb3, 0xf3, 0x90, + 0x61, 0x13, 0x5f, 0xd5, 0x6c, 0xbb, 0xa5, 0xb9, 0x3d, 0xe5, 0x63, 0xa8, 0x25, 0xc5, 0x95, 0xb1, + 0x65, 0xe4, 0x82, 0x63, 0x78, 0x15, 0x56, 0xce, 0x2c, 0x67, 0xa0, 0x79, 0x4c, 0x59, 0x09, 0x8b, + 0x1e, 0x3d, 0x9e, 0x3c, 0xc6, 0x64, 0x19, 0x99, 0x77, 0x14, 0x15, 0x9e, 0x49, 0x8c, 0x2d, 0x54, + 0xc4, 0x30, 0x75, 0xc2, 0xed, 0x59, 0xc2, 0xbc, 0x13, 0x2a, 0xe2, 0x93, 0xe5, 0x1d, 0xfa, 0x59, + 0x97, 0xad, 0x95, 0xe9, 0x97, 0xb0, 0xe8, 0x29, 0x2a, 0x5c, 0x9d, 0x1e, 0x60, 0xd0, 0x75, 0x00, + 0xee, 0x37, 0xc5, 0xad, 0xcb, 0xde, 0x5c, 0xc3, 0x12, 0xa3, 0xdc, 0xa5, 0x57, 0xef, 0x45, 0xa8, + 0x84, 0xc3, 0xaa, 0x6b, 0x3c, 0xe6, 0x47, 0x23, 0x8b, 0x4b, 0x01, 0xcf, 0xa9, 0xf1, 0x98, 0x28, + 0xef, 0x04, 0xf7, 0x2b, 0x0c, 0x38, 0xe8, 0x16, 0xe4, 0x58, 0x88, 0xe2, 0xdb, 0x70, 0x75, 0xf2, + 0x26, 0x51, 0x2e, 0xcc, 0x78, 0x94, 0x16, 0xc8, 0xc9, 0x01, 0x66, 0x29, 0x4d, 0xbf, 0x07, 0x28, + 0x60, 0xe2, 0xda, 0xd4, 0xff, 0xa1, 0x3a, 0x48, 0xe4, 0xa2, 0x4b, 0x6c, 0xcf, 0x0f, 0x19, 0xd3, + 0x43, 0x25, 0xe7, 0x6e, 0xfa, 0x9c, 0x14, 0x9e, 0x05, 0x62, 0xe8, 0xb6, 0x40, 0xe0, 0xc9, 0x60, + 0x5a, 0x88, 0x47, 0x21, 0xf8, 0x9b, 0x3e, 0x04, 0xcf, 0x26, 0x22, 0x32, 0x2e, 0x35, 0x86, 0xc1, + 0x6f, 0x0b, 0x0c, 0x9e, 0x9b, 0xf3, 0xb1, 0x18, 0x08, 0x6f, 0xc4, 0x40, 0x78, 0x7e, 0xce, 0x32, + 0x13, 0x50, 0xf8, 0x9b, 0x3e, 0x0a, 0x5f, 0x99, 0x33, 0xe3, 0x31, 0x18, 0xbe, 0x1f, 0x87, 0xe1, + 0x1c, 0x42, 0x3f, 0x9f, 0x28, 0x9d, 0x88, 0xc3, 0x7f, 0x1c, 0xc1, 0xe1, 0x85, 0x44, 0x10, 0xcc, + 0x95, 0x4c, 0x01, 0xe2, 0x8d, 0x18, 0x10, 0x97, 0xe6, 0xd8, 0x20, 0x01, 0x89, 0xbf, 0x1b, 0x45, + 0xe2, 0x90, 0x08, 0xe6, 0xc5, 0x7e, 0x4f, 0x83, 0xe2, 0x6f, 0x05, 0x50, 0xbc, 0x98, 0x98, 0x4b, + 0x88, 0x35, 0x8c, 0x63, 0xf1, 0xe3, 0x09, 0x2c, 0xce, 0xb1, 0xf3, 0x8b, 0x89, 0x2a, 0xe6, 0x80, + 0xf1, 0xe3, 0x09, 0x30, 0x5e, 0x9a, 0xa3, 0x70, 0x0e, 0x1a, 0xff, 0x70, 0x3a, 0x1a, 0x4f, 0xc6, + 0xcb, 0x62, 0x9a, 0x8b, 0xc1, 0x71, 0x35, 0x01, 0x8e, 0x57, 0x12, 0x01, 0x29, 0x57, 0xbf, 0x30, + 0x1e, 0xbf, 0x3f, 0x05, 0x8f, 0x73, 0xf8, 0x7c, 0x33, 0x51, 0xf9, 0x02, 0x80, 0x7c, 0x3f, 0x0e, + 0xc8, 0xd7, 0xe7, 0x5c, 0x80, 0x44, 0x44, 0xde, 0x49, 0x42, 0xe4, 0x88, 0x69, 0x7c, 0x35, 0x51, + 0xe3, 0x77, 0x81, 0xe4, 0x2f, 0x53, 0x87, 0x3d, 0xe6, 0xf6, 0x68, 0x50, 0x21, 0x8e, 0x63, 0x39, + 0x02, 0x5c, 0xf3, 0x8e, 0x72, 0x93, 0x42, 0xb4, 0xd0, 0xc5, 0xcd, 0x80, 0xef, 0x2c, 0x78, 0x47, + 0xdc, 0x9a, 0xf2, 0xc7, 0x74, 0x28, 0xcb, 0x50, 0x4d, 0x14, 0xde, 0x49, 0x02, 0xde, 0x45, 0x40, + 0x7d, 0x26, 0x0e, 0xea, 0xb7, 0xa0, 0x48, 0x83, 0xf2, 0x18, 0x5e, 0xd7, 0xec, 0x00, 0xaf, 0xdf, + 0x82, 0x75, 0x86, 0xba, 0x78, 0x8c, 0x12, 0x91, 0x38, 0xc7, 0x02, 0x54, 0x85, 0x0e, 0xf0, 0xfb, + 0xc9, 0x43, 0xf2, 0x6b, 0xb0, 0x11, 0xe1, 0x0d, 0x82, 0x3d, 0x07, 0xaf, 0xd5, 0x80, 0x7b, 0x4f, + 0x44, 0xfd, 0x3f, 0xa7, 0x43, 0x0b, 0x85, 0x40, 0x7f, 0x1a, 0x26, 0x4f, 0xff, 0x8f, 0x30, 0x79, + 0xe6, 0x3b, 0x63, 0xf2, 0x28, 0x78, 0xc9, 0xc6, 0xc1, 0xcb, 0xbf, 0xd3, 0xe1, 0x9e, 0x04, 0x08, + 0xbb, 0x6b, 0xe9, 0x44, 0xc0, 0x09, 0xd6, 0x46, 0x55, 0xc8, 0xf6, 0xad, 0x73, 0x01, 0x1a, 0x68, + 0x93, 0x72, 0x05, 0x71, 0x48, 0x12, 0x61, 0x26, 0x40, 0x22, 0x79, 0x66, 0x61, 0x81, 0x44, 0xaa, + 0x90, 0x7d, 0x44, 0x78, 0xd4, 0x58, 0xc3, 0xb4, 0x49, 0xf9, 0xd8, 0x21, 0x63, 0xb1, 0x60, 0x0d, + 0xf3, 0x0e, 0xba, 0x03, 0x12, 0xab, 0xba, 0xa9, 0x96, 0xed, 0x0a, 0x07, 0xff, 0x6c, 0x74, 0xad, + 0xbc, 0xb8, 0xb6, 0x7d, 0x42, 0x79, 0x8e, 0x6d, 0x17, 0x17, 0x6c, 0xd1, 0x8a, 0x80, 0x2c, 0x29, + 0x86, 0xf5, 0xaf, 0x81, 0x44, 0x67, 0xef, 0xda, 0x5a, 0x97, 0x30, 0x6f, 0x2d, 0xe1, 0x90, 0xa0, + 0x3c, 0x04, 0x34, 0x19, 0x73, 0x50, 0x0b, 0x56, 0xc8, 0x88, 0x98, 0x9e, 0xcb, 0xb0, 0xce, 0x18, + 0x96, 0x10, 0x40, 0x9a, 0x98, 0x5e, 0xbd, 0x46, 0x8d, 0xfc, 0xaf, 0x6f, 0xb6, 0xaa, 0x9c, 0xfb, + 0x55, 0x6b, 0x60, 0x78, 0x64, 0x60, 0x7b, 0x97, 0x58, 0xc8, 0x2b, 0x7f, 0xcf, 0x50, 0x54, 0x1b, + 0x8b, 0x47, 0x53, 0x6d, 0xeb, 0x1f, 0xf9, 0x4c, 0x24, 0xa3, 0x59, 0xcc, 0xde, 0x9b, 0x00, 0xe7, + 0x9a, 0xab, 0x7e, 0xa6, 0x99, 0x1e, 0xd1, 0x85, 0xd1, 0x23, 0x14, 0x24, 0x43, 0x81, 0xf6, 0x86, + 0x2e, 0xd1, 0x45, 0x72, 0x15, 0xf4, 0x23, 0xeb, 0x5c, 0xfd, 0x7e, 0xeb, 0x8c, 0x5b, 0xb9, 0x30, + 0x66, 0xe5, 0x08, 0xe2, 0x94, 0xa2, 0x88, 0x93, 0xce, 0xcd, 0x76, 0x0c, 0xcb, 0x31, 0xbc, 0x4b, + 0xb6, 0x35, 0x59, 0x1c, 0xf4, 0x69, 0xae, 0x3e, 0x20, 0x03, 0xdb, 0xb2, 0xfa, 0x2a, 0x77, 0x37, + 0x45, 0x26, 0xba, 0x26, 0x88, 0x4d, 0xe6, 0x75, 0x7e, 0x93, 0x09, 0xef, 0x5f, 0x98, 0x59, 0xfc, + 0xdf, 0x19, 0x58, 0xf9, 0x2d, 0xab, 0x37, 0xc4, 0x11, 0x07, 0x3a, 0x85, 0xf5, 0xe0, 0xfa, 0xab, + 0x43, 0xe6, 0x16, 0xfc, 0x03, 0xbd, 0xa8, 0xff, 0xa8, 0x8e, 0xe2, 0x64, 0x17, 0x7d, 0x00, 0x4f, + 0x8f, 0xf9, 0xb6, 0x40, 0x75, 0x66, 0x51, 0x17, 0xf7, 0x54, 0xdc, 0xc5, 0xf9, 0xaa, 0x43, 0x63, + 0x65, 0xbf, 0xe7, 0xad, 0x3b, 0xa0, 0x29, 0x6c, 0x14, 0x40, 0x4d, 0xdd, 0xfe, 0xe7, 0xa1, 0xe4, + 0x10, 0x4f, 0x33, 0x4c, 0x35, 0x56, 0x24, 0x58, 0xe3, 0x44, 0x51, 0x7a, 0x38, 0x81, 0xa7, 0xa6, + 0x02, 0x29, 0xf4, 0x43, 0x90, 0x42, 0x0c, 0x96, 0x4e, 0xc8, 0xb7, 0x83, 0x1c, 0x32, 0xe4, 0x55, + 0xfe, 0x94, 0x0e, 0x55, 0xc6, 0xb3, 0xd2, 0x26, 0xac, 0x38, 0xc4, 0x1d, 0xf6, 0x79, 0x9e, 0x58, + 0xde, 0x7d, 0x6d, 0x31, 0x08, 0x46, 0xa9, 0xc3, 0xbe, 0x87, 0x85, 0xb0, 0xf2, 0x10, 0x56, 0x38, + 0x05, 0x15, 0x61, 0xf5, 0xfe, 0xd1, 0xbd, 0xa3, 0xe3, 0xf7, 0x8f, 0xaa, 0x29, 0x04, 0xb0, 0xb2, + 0xd7, 0x68, 0x34, 0x4f, 0xda, 0xd5, 0x34, 0x92, 0x20, 0xbf, 0x57, 0x3f, 0xc6, 0xed, 0x6a, 0x86, + 0x92, 0x71, 0xf3, 0xbd, 0x66, 0xa3, 0x5d, 0xcd, 0xa2, 0x75, 0x28, 0xf1, 0xb6, 0xba, 0x7f, 0x8c, + 0x7f, 0xb6, 0xd7, 0xae, 0xe6, 0x22, 0xa4, 0xd3, 0xe6, 0xd1, 0xdd, 0x26, 0xae, 0xe6, 0x95, 0xd7, + 0x69, 0x22, 0x9a, 0x00, 0xda, 0xc2, 0x94, 0x33, 0x1d, 0x49, 0x39, 0x95, 0xdf, 0x65, 0x68, 0xe6, + 0x96, 0x84, 0xc4, 0xd0, 0x7b, 0x63, 0x0b, 0xdf, 0x5d, 0x02, 0xc6, 0x8d, 0xad, 0x1e, 0xbd, 0x00, + 0x65, 0x87, 0x9c, 0x11, 0xaf, 0xdb, 0xe3, 0xc8, 0x90, 0x87, 0xcc, 0x12, 0x2e, 0x09, 0x2a, 0x13, + 0x72, 0x39, 0xdb, 0x27, 0xa4, 0xeb, 0xa9, 0xdc, 0x17, 0xf1, 0x43, 0x27, 0x51, 0x36, 0x4a, 0x3d, + 0xe5, 0x44, 0xe5, 0xe3, 0xa5, 0x6c, 0x29, 0x41, 0x1e, 0x37, 0xdb, 0xf8, 0x83, 0x6a, 0x16, 0x21, + 0x28, 0xb3, 0xa6, 0x7a, 0x7a, 0xb4, 0x77, 0x72, 0xda, 0x3a, 0xa6, 0xb6, 0xdc, 0x80, 0x8a, 0x6f, + 0x4b, 0x9f, 0x98, 0x57, 0xee, 0xc0, 0xd3, 0x09, 0x30, 0x72, 0x4e, 0xda, 0xad, 0x7c, 0x18, 0xc6, + 0xae, 0x48, 0x3e, 0xbd, 0x0f, 0xe5, 0x31, 0x64, 0x98, 0x9e, 0xcc, 0x31, 0xc2, 0x7c, 0x38, 0x40, + 0x7d, 0xb8, 0x34, 0x8a, 0x76, 0x95, 0x3f, 0xa4, 0xe1, 0xd9, 0x19, 0xd8, 0x11, 0xdd, 0x1b, 0xdb, + 0xb3, 0xdb, 0xcb, 0x20, 0xcf, 0xf1, 0x23, 0x7b, 0x67, 0x21, 0x33, 0x9f, 0x1e, 0xee, 0x9d, 0xb6, + 0xe2, 0x47, 0x56, 0xf9, 0x08, 0xca, 0xf1, 0x4a, 0x19, 0x3d, 0x81, 0x8e, 0x35, 0x34, 0x75, 0x36, + 0xaf, 0x3c, 0xe6, 0x1d, 0xf4, 0x06, 0xe4, 0xe9, 0xfa, 0x7c, 0x00, 0x35, 0x79, 0x55, 0xe9, 0xfc, + 0x22, 0x95, 0x36, 0xce, 0xad, 0x3c, 0x86, 0x3c, 0x73, 0x3a, 0xd4, 0x81, 0xb0, 0x9a, 0x97, 0xc0, + 0xa4, 0xb4, 0x8d, 0x3e, 0x02, 0xd0, 0x3c, 0xcf, 0x31, 0x3a, 0xc3, 0x50, 0xf1, 0xd6, 0x74, 0xa7, + 0xb5, 0xe7, 0xf3, 0xd5, 0xaf, 0x09, 0xef, 0x75, 0x25, 0x14, 0x8d, 0x78, 0xb0, 0x88, 0x42, 0xe5, + 0x08, 0xca, 0x71, 0x59, 0x1f, 0x45, 0xf1, 0x39, 0xc4, 0x51, 0x14, 0x07, 0xc5, 0x02, 0x45, 0x05, + 0x18, 0x2c, 0xcb, 0xeb, 0x9b, 0xac, 0xa3, 0x7c, 0x9e, 0x86, 0x42, 0xfb, 0x42, 0xd8, 0x39, 0xa1, + 0xb4, 0x16, 0x8a, 0x66, 0xa2, 0x85, 0x24, 0x5e, 0xab, 0xcb, 0x06, 0x15, 0xc0, 0x77, 0x83, 0xcd, + 0xcf, 0x2d, 0x9a, 0x43, 0xfb, 0xa5, 0x50, 0xb1, 0xe3, 0x6f, 0x83, 0x14, 0x84, 0x1c, 0x0a, 0xee, + 0x35, 0x5d, 0x77, 0x88, 0xeb, 0x0a, 0xb7, 0xe1, 0x77, 0x59, 0xa5, 0xd6, 0xfa, 0x4c, 0x94, 0xaa, + 0xb2, 0x98, 0x77, 0x14, 0x1d, 0x2a, 0x63, 0xf1, 0x0a, 0xbd, 0x0d, 0xab, 0xf6, 0xb0, 0xa3, 0xfa, + 0xe6, 0x19, 0xfb, 0x33, 0xe9, 0xc3, 0xc6, 0x61, 0xa7, 0x6f, 0x74, 0xef, 0x91, 0x4b, 0x7f, 0x32, + 0xf6, 0xb0, 0x73, 0x8f, 0x5b, 0x91, 0x7f, 0x25, 0x13, 0xfd, 0xca, 0x08, 0x0a, 0xfe, 0xa1, 0x40, + 0x3f, 0x01, 0x29, 0x08, 0x85, 0x41, 0x01, 0x3f, 0x31, 0x86, 0x0a, 0xf5, 0xa1, 0x08, 0xcd, 0x41, + 0x5c, 0xe3, 0xdc, 0x24, 0xba, 0x1a, 0xa6, 0x17, 0xec, 0x6b, 0x05, 0x5c, 0xe1, 0x03, 0x87, 0x7e, + 0x6e, 0xa1, 0xfc, 0x27, 0x0d, 0x05, 0xbf, 0x50, 0x8b, 0x5e, 0x8f, 0x9c, 0xbb, 0xf2, 0x94, 0x52, + 0x8f, 0xcf, 0x18, 0x16, 0x5b, 0xe3, 0x73, 0xcd, 0x2c, 0x3f, 0xd7, 0xa4, 0xaa, 0xb9, 0xff, 0xff, + 0x22, 0xb7, 0xf4, 0xff, 0x8b, 0x57, 0x01, 0x79, 0x96, 0xa7, 0xf5, 0x69, 0xce, 0x6a, 0x98, 0xe7, + 0x2a, 0x37, 0x36, 0x87, 0x52, 0x55, 0x36, 0xf2, 0x80, 0x0d, 0x9c, 0x30, 0xbb, 0xff, 0x2a, 0x0d, + 0x85, 0x20, 0x26, 0x2e, 0x5b, 0x3b, 0xbd, 0x0a, 0x2b, 0xc2, 0xed, 0xf3, 0xe2, 0xa9, 0xe8, 0x05, + 0x65, 0xfc, 0x5c, 0xa4, 0x8c, 0x2f, 0x43, 0x61, 0x40, 0x3c, 0x8d, 0x79, 0x57, 0x9e, 0xe1, 0x05, + 0xfd, 0x5b, 0x6f, 0x41, 0x31, 0x52, 0xc6, 0xa6, 0x37, 0xef, 0xa8, 0xf9, 0x7e, 0x35, 0x25, 0xaf, + 0x7e, 0xfe, 0xe5, 0x8d, 0xec, 0x11, 0xf9, 0x8c, 0x9e, 0x59, 0xdc, 0x6c, 0xb4, 0x9a, 0x8d, 0x7b, + 0xd5, 0xb4, 0x5c, 0xfc, 0xfc, 0xcb, 0x1b, 0xab, 0x98, 0xb0, 0x32, 0xd3, 0xad, 0x16, 0xac, 0x45, + 0x77, 0x25, 0xee, 0xd2, 0x10, 0x94, 0xef, 0xde, 0x3f, 0x39, 0x3c, 0x68, 0xec, 0xb5, 0x9b, 0xea, + 0x83, 0xe3, 0x76, 0xb3, 0x9a, 0x46, 0x4f, 0xc3, 0xc6, 0xe1, 0xc1, 0x4f, 0x5b, 0x6d, 0xb5, 0x71, + 0x78, 0xd0, 0x3c, 0x6a, 0xab, 0x7b, 0xed, 0xf6, 0x5e, 0xe3, 0x5e, 0x35, 0xb3, 0xfb, 0x4d, 0x11, + 0x2a, 0x7b, 0xf5, 0xc6, 0x01, 0x8d, 0x7a, 0x46, 0x57, 0x63, 0xe9, 0x77, 0x03, 0x72, 0x2c, 0xc1, + 0x9e, 0xf9, 0x93, 0x5f, 0x9e, 0x5d, 0x80, 0x44, 0xfb, 0x90, 0x67, 0xb9, 0x37, 0x9a, 0xfd, 0xd7, + 0x5f, 0x9e, 0x53, 0x91, 0xa4, 0x93, 0x61, 0xd7, 0x63, 0xe6, 0x33, 0x00, 0x79, 0x76, 0x81, 0x12, + 0x61, 0x90, 0x42, 0xec, 0x3e, 0xff, 0xb7, 0xb8, 0xbc, 0x80, 0xb3, 0x41, 0x87, 0xb0, 0xea, 0xa7, + 0x5b, 0xf3, 0x7e, 0xd4, 0xcb, 0x73, 0x2b, 0x88, 0xd4, 0x5c, 0x3c, 0x2d, 0x9e, 0xfd, 0xea, 0x40, + 0x9e, 0x53, 0x0e, 0x45, 0x07, 0xb0, 0x22, 0xf0, 0xe8, 0x9c, 0x9f, 0xef, 0xf2, 0xbc, 0x8a, 0x20, + 0x35, 0x5a, 0x58, 0x70, 0x98, 0xff, 0x96, 0x42, 0x5e, 0xa0, 0xd2, 0x8b, 0xee, 0x03, 0x44, 0x92, + 0xe0, 0x05, 0x1e, 0x49, 0xc8, 0x8b, 0x54, 0x70, 0xd1, 0x31, 0x14, 0x82, 0x9c, 0x64, 0xee, 0x93, + 0x05, 0x79, 0x7e, 0x29, 0x15, 0x3d, 0x84, 0x52, 0x1c, 0x8b, 0x2f, 0xf6, 0x10, 0x41, 0x5e, 0xb0, + 0x46, 0x4a, 0xf5, 0xc7, 0x81, 0xf9, 0x62, 0x0f, 0x13, 0xe4, 0x05, 0x4b, 0xa6, 0xe8, 0x13, 0x58, + 0x9f, 0x04, 0xce, 0x8b, 0xbf, 0x53, 0x90, 0x97, 0x28, 0xa2, 0xa2, 0x01, 0xa0, 0x29, 0x80, 0x7b, + 0x89, 0x67, 0x0b, 0xf2, 0x32, 0x35, 0x55, 0xa4, 0x43, 0x65, 0x1c, 0xc5, 0x2e, 0xfa, 0x8c, 0x41, + 0x5e, 0xb8, 0xbe, 0x4a, 0x0f, 0x6a, 0x04, 0xf1, 0x2e, 0xf0, 0xac, 0x41, 0x5e, 0xa4, 0xd2, 0x8a, + 0x6c, 0xd8, 0x98, 0x86, 0x74, 0x97, 0x79, 0xe5, 0x20, 0x2f, 0x55, 0x80, 0xad, 0x37, 0xbf, 0xfa, + 0x76, 0x33, 0xfd, 0xf5, 0xb7, 0x9b, 0xe9, 0x7f, 0x7e, 0xbb, 0x99, 0xfe, 0xe2, 0xc9, 0x66, 0xea, + 0xeb, 0x27, 0x9b, 0xa9, 0xbf, 0x3d, 0xd9, 0x4c, 0xfd, 0xe2, 0x95, 0x73, 0xc3, 0xeb, 0x0d, 0x3b, + 0xdb, 0x5d, 0x6b, 0xb0, 0x13, 0x7d, 0x3e, 0x36, 0xed, 0x49, 0x5b, 0x67, 0x85, 0xc5, 0xe0, 0xdb, + 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x05, 0x6a, 0x5b, 0xf0, 0xf2, 0x26, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3293,6 +3571,8 @@ type ABCIApplicationClient interface { LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) + ExtendVote(ctx context.Context, in *RequestExtendVote, opts ...grpc.CallOption) (*ResponseExtendVote, error) + VerifyVoteExtension(ctx context.Context, in *RequestVerifyVoteExtension, opts ...grpc.CallOption) (*ResponseVerifyVoteExtension, error) } type aBCIApplicationClient struct { @@ -3438,6 +3718,24 @@ func (c *aBCIApplicationClient) PrepareProposal(ctx context.Context, in *Request return out, nil } +func (c *aBCIApplicationClient) ExtendVote(ctx context.Context, in *RequestExtendVote, opts ...grpc.CallOption) (*ResponseExtendVote, error) { + out := new(ResponseExtendVote) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ExtendVote", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *aBCIApplicationClient) VerifyVoteExtension(ctx context.Context, in *RequestVerifyVoteExtension, opts ...grpc.CallOption) (*ResponseVerifyVoteExtension, error) { + out := new(ResponseVerifyVoteExtension) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/VerifyVoteExtension", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ABCIApplicationServer is the server API for ABCIApplication service. type ABCIApplicationServer interface { Echo(context.Context, *RequestEcho) (*ResponseEcho, error) @@ -3455,6 +3753,8 @@ type ABCIApplicationServer interface { LoadSnapshotChunk(context.Context, *RequestLoadSnapshotChunk) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(context.Context, *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) PrepareProposal(context.Context, *RequestPrepareProposal) (*ResponsePrepareProposal, error) + ExtendVote(context.Context, *RequestExtendVote) (*ResponseExtendVote, error) + VerifyVoteExtension(context.Context, *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3506,6 +3806,12 @@ func (*UnimplementedABCIApplicationServer) ApplySnapshotChunk(ctx context.Contex func (*UnimplementedABCIApplicationServer) PrepareProposal(ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { return nil, status.Errorf(codes.Unimplemented, "method PrepareProposal not implemented") } +func (*UnimplementedABCIApplicationServer) ExtendVote(ctx context.Context, req *RequestExtendVote) (*ResponseExtendVote, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExtendVote not implemented") +} +func (*UnimplementedABCIApplicationServer) VerifyVoteExtension(ctx context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) { + return nil, status.Errorf(codes.Unimplemented, "method VerifyVoteExtension not implemented") +} func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { s.RegisterService(&_ABCIApplication_serviceDesc, srv) @@ -3781,6 +4087,42 @@ func _ABCIApplication_PrepareProposal_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } +func _ABCIApplication_ExtendVote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestExtendVote) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).ExtendVote(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/ExtendVote", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).ExtendVote(ctx, req.(*RequestExtendVote)) + } + return interceptor(ctx, in, info, handler) +} + +func _ABCIApplication_VerifyVoteExtension_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestVerifyVoteExtension) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).VerifyVoteExtension(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/VerifyVoteExtension", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).VerifyVoteExtension(ctx, req.(*RequestVerifyVoteExtension)) + } + return interceptor(ctx, in, info, handler) +} + var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ ServiceName: "tendermint.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), @@ -3845,6 +4187,14 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "PrepareProposal", Handler: _ABCIApplication_PrepareProposal_Handler, }, + { + MethodName: "ExtendVote", + Handler: _ABCIApplication_ExtendVote_Handler, + }, + { + MethodName: "VerifyVoteExtension", + Handler: _ABCIApplication_VerifyVoteExtension_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "tendermint/abci/types.proto", @@ -4197,32 +4547,78 @@ func (m *Request_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } -func (m *RequestEcho) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RequestEcho) MarshalTo(dAtA []byte) (int, error) { +func (m *Request_ExtendVote) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Request_ExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Message) > 0 { - i -= len(m.Message) - copy(dAtA[i:], m.Message) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Message))) - i-- - dAtA[i] = 0xa + if m.ExtendVote != nil { + { + size, err := m.ExtendVote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + return len(dAtA) - i, nil +} +func (m *Request_VerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_VerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.VerifyVoteExtension != nil { + { + size, err := m.VerifyVoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} +func (m *RequestEcho) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RequestEcho) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Message) > 0 { + i -= len(m.Message) + copy(dAtA[i:], m.Message) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Message))) + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -4362,12 +4758,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err17 != nil { - return 0, err17 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err19 != nil { + return 0, err19 } - i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i -= n19 + i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4787,6 +5183,76 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *RequestExtendVote) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RequestExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Vote != nil { + { + size, err := m.Vote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *RequestVerifyVoteExtension) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RequestVerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Vote != nil { + { + size, err := m.Vote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Response) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5157,6 +5623,52 @@ func (m *Response_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error } return len(dAtA) - i, nil } +func (m *Response_ExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_ExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.ExtendVote != nil { + { + size, err := m.ExtendVote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} +func (m *Response_VerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_VerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.VerifyVoteExtension != nil { + { + size, err := m.VerifyVoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + return len(dAtA) - i, nil +} func (m *ResponseException) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5874,20 +6386,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA41 := make([]byte, len(m.RefetchChunks)*10) - var j40 int + dAtA47 := make([]byte, len(m.RefetchChunks)*10) + var j46 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA47[j46] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j46++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA47[j46] = uint8(num) + j46++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i -= j46 + copy(dAtA[i:], dAtA47[:j46]) + i = encodeVarintTypes(dAtA, i, uint64(j46)) i-- dAtA[i] = 0x12 } @@ -5931,6 +6443,69 @@ func (m *ResponsePrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *ResponseExtendVote) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ResponseExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *ResponseVerifyVoteExtension) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ResponseVerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6255,12 +6830,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err45 != nil { - return 0, err45 + n52, err52 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err52 != nil { + return 0, err52 } - i -= n45 - i = encodeVarintTypes(dAtA, i, uint64(n45)) + i -= n52 + i = encodeVarintTypes(dAtA, i, uint64(n52)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6541,6 +7116,30 @@ func (m *Request_PrepareProposal) Size() (n int) { } return n } +func (m *Request_ExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ExtendVote != nil { + l = m.ExtendVote.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Request_VerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.VerifyVoteExtension != nil { + l = m.VerifyVoteExtension.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *RequestEcho) Size() (n int) { if m == nil { return 0 @@ -6796,6 +7395,32 @@ func (m *RequestPrepareProposal) Size() (n int) { return n } +func (m *RequestExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Vote != nil { + l = m.Vote.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *RequestVerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Vote != nil { + l = m.Vote.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Response) Size() (n int) { if m == nil { return 0 @@ -7000,27 +7625,51 @@ func (m *Response_PrepareProposal) Size() (n int) { } return n } -func (m *ResponseException) Size() (n int) { +func (m *Response_ExtendVote) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Error) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + if m.ExtendVote != nil { + l = m.ExtendVote.Size() + n += 2 + l + sovTypes(uint64(l)) } return n } - -func (m *ResponseEcho) Size() (n int) { +func (m *Response_VerifyVoteExtension) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Message) - if l > 0 { + if m.VerifyVoteExtension != nil { + l = m.VerifyVoteExtension.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *ResponseException) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Error) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *ResponseEcho) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Message) + if l > 0 { n += 1 + l + sovTypes(uint64(l)) } return n @@ -7354,6 +8003,31 @@ func (m *ResponsePrepareProposal) Size() (n int) { return n } +func (m *ResponseExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *ResponseVerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + return n +} + func (m *LastCommitInfo) Size() (n int) { if m == nil { return 0 @@ -8084,6 +8758,76 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_PrepareProposal{v} iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtendVote", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &RequestExtendVote{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_ExtendVote{v} + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VerifyVoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &RequestVerifyVoteExtension{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_VerifyVoteExtension{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -9633,9 +10377,192 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RequestPrepareProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestPrepareProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) + copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + } + m.BlockDataSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockDataSize |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RequestExtendVote: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestExtendVote: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -9645,23 +10572,27 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Sender = string(dAtA[iNdEx:postIndex]) + if m.Vote == nil { + m.Vote = &types1.Vote{} + } + if err := m.Vote.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -9684,7 +10615,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { +func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9707,17 +10638,17 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RequestPrepareProposal: wiretype end group for non-group") + return fmt.Errorf("proto: RequestVerifyVoteExtension: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RequestPrepareProposal: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RequestVerifyVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -9727,43 +10658,28 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) - copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + if m.Vote == nil { + m.Vote = &types1.Vote{} } - m.BlockDataSize = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockDataSize |= int64(b&0x7F) << shift - if b < 0x80 { - break - } + if err := m.Vote.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -10374,6 +11290,76 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_PrepareProposal{v} iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtendVote", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &ResponseExtendVote{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_ExtendVote{v} + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VerifyVoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &ResponseVerifyVoteExtension{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_VerifyVoteExtension{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -12718,6 +13704,161 @@ func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { } return nil } +func (m *ResponseExtendVote) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ResponseExtendVote: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseExtendVote: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteExtension == nil { + m.VoteExtension = &types1.VoteExtension{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ResponseVerifyVoteExtension) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ResponseVerifyVoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseVerifyVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= ResponseVerifyVoteExtension_Result(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/internal/consensus/msgs_test.go b/internal/consensus/msgs_test.go index dd3384b8b..e85936820 100644 --- a/internal/consensus/msgs_test.go +++ b/internal/consensus/msgs_test.go @@ -357,6 +357,11 @@ func TestConsMsgsVectors(t *testing.T) { } pbProposal := proposal.ToProto() + ext := types.VoteExtension{ + AppDataToSign: []byte("signed"), + AppDataSelfAuthenticating: []byte("auth"), + } + v := &types.Vote{ ValidatorAddress: []byte("add_more_exclamation"), ValidatorIndex: 1, @@ -365,6 +370,7 @@ func TestConsMsgsVectors(t *testing.T) { Timestamp: date, Type: tmproto.PrecommitType, BlockID: bi, + VoteExtension: ext, } vpb := v.ToProto() @@ -401,7 +407,7 @@ func TestConsMsgsVectors(t *testing.T) { "2a36080110011a3008011204746573741a26080110011a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d"}, {"Vote", &tmcons.Message{Sum: &tmcons.Message_Vote{ Vote: &tmcons.Vote{Vote: vpb}}}, - "32700a6e0802100122480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d2a0608c0b89fdc0532146164645f6d6f72655f6578636c616d6174696f6e3801"}, + "3280010a7e0802100122480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d2a0608c0b89fdc0532146164645f6d6f72655f6578636c616d6174696f6e38014a0e0a067369676e6564120461757468"}, {"HasVote", &tmcons.Message{Sum: &tmcons.Message_HasVote{ HasVote: &tmcons.HasVote{Height: 1, Round: 1, Type: tmproto.PrevoteType, Index: 1}}}, "3a080801100118012001"}, diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 8bf6a8290..ef4cc3bba 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2379,6 +2379,12 @@ func (cs *State) signVote( switch msgType { case tmproto.PrecommitType: timeout = cs.config.TimeoutPrecommit + // if the signedMessage type is for a precommit, add VoteExtension + ext, err := cs.blockExec.ExtendVote(vote) + if err != nil { + return nil, err + } + vote.VoteExtension = ext case tmproto.PrevoteType: timeout = cs.config.TimeoutPrevote default: @@ -2392,11 +2398,17 @@ func (cs *State) signVote( vote.Signature = v.Signature vote.Timestamp = v.Timestamp + return vote, err } // sign the vote and publish on internalMsgQueue -func (cs *State) signAddVote(ctx context.Context, msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { +func (cs *State) signAddVote( + ctx context.Context, + msgType tmproto.SignedMsgType, + hash []byte, + header types.PartSetHeader, +) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil } diff --git a/internal/proxy/app_conn.go b/internal/proxy/app_conn.go index d1d50eb8d..79d462f2c 100644 --- a/internal/proxy/app_conn.go +++ b/internal/proxy/app_conn.go @@ -21,6 +21,8 @@ type AppConnConsensus interface { InitChain(context.Context, types.RequestInitChain) (*types.ResponseInitChain, error) PrepareProposal(context.Context, types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) + ExtendVote(context.Context, types.RequestExtendVote) (*types.ResponseExtendVote, error) + VerifyVoteExtension(context.Context, types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) BeginBlock(context.Context, types.RequestBeginBlock) (*types.ResponseBeginBlock, error) DeliverTx(context.Context, types.RequestDeliverTx) (*types.ResponseDeliverTx, error) EndBlock(context.Context, types.RequestEndBlock) (*types.ResponseEndBlock, error) @@ -96,6 +98,22 @@ func (app *appConnConsensus) PrepareProposal( return app.appConn.PrepareProposal(ctx, req) } +func (app *appConnConsensus) ExtendVote( + ctx context.Context, + req types.RequestExtendVote, +) (*types.ResponseExtendVote, error) { + defer addTimeSample(app.metrics.MethodTiming.With("method", "extend_vote", "type", "sync"))() + return app.appConn.ExtendVote(ctx, req) +} + +func (app *appConnConsensus) VerifyVoteExtension( + ctx context.Context, + req types.RequestVerifyVoteExtension, +) (*types.ResponseVerifyVoteExtension, error) { + defer addTimeSample(app.metrics.MethodTiming.With("method", "verify_vote_extension", "type", "sync"))() + return app.appConn.VerifyVoteExtension(ctx, req) +} + func (app *appConnConsensus) BeginBlock( ctx context.Context, req types.RequestBeginBlock, diff --git a/internal/proxy/mocks/app_conn_consensus.go b/internal/proxy/mocks/app_conn_consensus.go index 7d1270aa4..9c03cacae 100644 --- a/internal/proxy/mocks/app_conn_consensus.go +++ b/internal/proxy/mocks/app_conn_consensus.go @@ -123,6 +123,29 @@ func (_m *AppConnConsensus) Error() error { return r0 } +// ExtendVote provides a mock function with given fields: _a0, _a1 +func (_m *AppConnConsensus) ExtendVote(_a0 context.Context, _a1 types.RequestExtendVote) (*types.ResponseExtendVote, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseExtendVote + if rf, ok := ret.Get(0).(func(context.Context, types.RequestExtendVote) *types.ResponseExtendVote); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseExtendVote) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestExtendVote) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // InitChain provides a mock function with given fields: _a0, _a1 func (_m *AppConnConsensus) InitChain(_a0 context.Context, _a1 types.RequestInitChain) (*types.ResponseInitChain, error) { ret := _m.Called(_a0, _a1) @@ -173,3 +196,26 @@ func (_m *AppConnConsensus) PrepareProposal(_a0 context.Context, _a1 types.Reque func (_m *AppConnConsensus) SetResponseCallback(_a0 abciclient.Callback) { _m.Called(_a0) } + +// VerifyVoteExtension provides a mock function with given fields: _a0, _a1 +func (_m *AppConnConsensus) VerifyVoteExtension(_a0 context.Context, _a1 types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseVerifyVoteExtension + if rf, ok := ret.Get(0).(func(context.Context, types.RequestVerifyVoteExtension) *types.ResponseVerifyVoteExtension); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseVerifyVoteExtension) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestVerifyVoteExtension) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/internal/state/execution.go b/internal/state/execution.go index e522b16f6..1465c33ed 100644 --- a/internal/state/execution.go +++ b/internal/state/execution.go @@ -260,6 +260,20 @@ func (blockExec *BlockExecutor) ApplyBlock( return state, nil } +func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtension, error) { + ctx := context.TODO() + req := abci.RequestExtendVote{ + Vote: vote.ToProto(), + } + + resp, err := blockExec.proxyApp.ExtendVote(ctx, req) + if err != nil { + return types.VoteExtension{}, err + } + + return types.VoteExtensionFromProto(resp.VoteExtension), nil +} + // Commit locks the mempool, runs the ABCI Commit message, and updates the // mempool. // It returns the result of calling abci.Commit (the AppHash) and the height to retain (if any). @@ -497,7 +511,7 @@ func updateState( nextVersion := state.Version - // NOTE: the AppHash has not been populated. + // NOTE: the AppHash and the VoteExtension has not been populated. // It will be filled on state.Save. return State{ Version: nextVersion, diff --git a/internal/state/execution_test.go b/internal/state/execution_test.go index bb5c67ae3..06f12d640 100644 --- a/internal/state/execution_test.go +++ b/internal/state/execution_test.go @@ -90,11 +90,15 @@ func TestBeginBlockValidators(t *testing.T) { commitSig0 = types.NewCommitSigForBlock( []byte("Signature1"), state.Validators.Validators[0].Address, - now) + now, + types.VoteExtensionToSign{}, + ) commitSig1 = types.NewCommitSigForBlock( []byte("Signature2"), state.Validators.Validators[1].Address, - now) + now, + types.VoteExtensionToSign{}, + ) absentSig = types.NewCommitSigAbsent() ) diff --git a/privval/msgs_test.go b/privval/msgs_test.go index 43752749b..3c15f1089 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -35,6 +35,10 @@ func exampleVote() *types.Vote { }, ValidatorAddress: crypto.AddressHash([]byte("validator_address")), ValidatorIndex: 56789, + VoteExtension: types.VoteExtension { + AppDataToSign: []byte("app_data_signed"), + AppDataSelfAuthenticating: []byte("app_data_self_authenticating"), + }, } } @@ -83,8 +87,8 @@ func TestPrivvalVectors(t *testing.T) { {"pubKey request", &privproto.PubKeyRequest{}, "0a00"}, {"pubKey response", &privproto.PubKeyResponse{PubKey: ppk, Error: nil}, "12240a220a20556a436f1218d30942efe798420f51dc9b6a311b929c578257457d05c5fcf230"}, {"pubKey response with error", &privproto.PubKeyResponse{PubKey: cryptoproto.PublicKey{}, Error: remoteError}, "12140a0012100801120c697427732061206572726f72"}, - {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1a760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, - {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, + {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1aa8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, + {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22a8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, {"Vote Response with error", &privproto.SignedVoteResponse{Vote: tmproto.Vote{}, Error: remoteError}, "22250a11220212002a0b088092b8c398feffffff0112100801120c697427732061206572726f72"}, {"Proposal Request", &privproto.SignProposalRequest{Proposal: proposalpb}, "2a700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, {"Proposal Response", &privproto.SignedProposalResponse{Proposal: *proposalpb, Error: nil}, "32700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 709831043..0cd7386f7 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -225,12 +225,13 @@ func (m *CanonicalProposal) GetChainID() string { } type CanonicalVote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` - Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` - BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` + Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` + BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } @@ -308,6 +309,13 @@ func (m *CanonicalVote) GetChainID() string { return "" } +func (m *CanonicalVote) GetVoteExtension() *VoteExtensionToSign { + if m != nil { + return m.VoteExtension + } + return nil +} + func init() { proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID") proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader") @@ -318,38 +326,40 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xce, 0xa5, 0x4e, 0xe2, 0x5c, 0x1b, 0x08, 0xa7, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x1e, 0x90, - 0x59, 0x6c, 0xa9, 0x1d, 0xd8, 0x5d, 0x06, 0x82, 0x40, 0x94, 0x6b, 0xd5, 0x81, 0x25, 0xba, 0xd8, - 0x87, 0x6d, 0xe1, 0xf8, 0x4e, 0xf6, 0x65, 0xe8, 0xc2, 0x6f, 0xe8, 0xef, 0xe0, 0x97, 0x74, 0xec, - 0x08, 0x4b, 0x40, 0xce, 0x1f, 0x41, 0x77, 0x4e, 0xec, 0xa8, 0x01, 0x16, 0x10, 0xcb, 0xe9, 0xfd, - 0x78, 0xee, 0x79, 0x1f, 0x3d, 0xaf, 0x5e, 0x68, 0x0b, 0x9a, 0x47, 0xb4, 0x58, 0xa4, 0xb9, 0xf0, - 0xc5, 0x0d, 0xa7, 0xa5, 0x1f, 0x92, 0x9c, 0xe5, 0x69, 0x48, 0x32, 0x8f, 0x17, 0x4c, 0x30, 0x34, - 0x6e, 0x11, 0x9e, 0x42, 0x4c, 0x8e, 0x63, 0x16, 0x33, 0xd5, 0xf4, 0x65, 0x54, 0xe3, 0x26, 0x4f, - 0xf7, 0x98, 0xd4, 0xbb, 0xe9, 0x5a, 0x31, 0x63, 0x71, 0x46, 0x7d, 0x95, 0xcd, 0x97, 0x1f, 0x7d, - 0x91, 0x2e, 0x68, 0x29, 0xc8, 0x82, 0xd7, 0x00, 0xe7, 0x33, 0x1c, 0x9f, 0x6f, 0x27, 0x07, 0x19, - 0x0b, 0x3f, 0x4d, 0x5f, 0x22, 0x04, 0xb5, 0x84, 0x94, 0x89, 0x01, 0x6c, 0xe0, 0x1e, 0x61, 0x15, - 0xa3, 0x6b, 0xf8, 0x98, 0x93, 0x42, 0xcc, 0x4a, 0x2a, 0x66, 0x09, 0x25, 0x11, 0x2d, 0x8c, 0xae, - 0x0d, 0xdc, 0xc3, 0x53, 0xd7, 0x7b, 0x28, 0xd4, 0x6b, 0x08, 0x2f, 0x48, 0x21, 0x2e, 0xa9, 0x78, - 0xa5, 0xf0, 0x81, 0x76, 0xb7, 0xb2, 0x3a, 0x78, 0xc4, 0x77, 0x8b, 0x4e, 0x00, 0x4f, 0x7e, 0x0d, - 0x47, 0xc7, 0xb0, 0x27, 0x98, 0x20, 0x99, 0x92, 0x31, 0xc2, 0x75, 0xd2, 0x68, 0xeb, 0xb6, 0xda, - 0x9c, 0x6f, 0x5d, 0xf8, 0xa4, 0x25, 0x29, 0x18, 0x67, 0x25, 0xc9, 0xd0, 0x19, 0xd4, 0xa4, 0x1c, - 0xf5, 0xfd, 0xd1, 0xa9, 0xb5, 0x2f, 0xf3, 0x32, 0x8d, 0x73, 0x1a, 0xbd, 0x2d, 0xe3, 0xab, 0x1b, - 0x4e, 0xb1, 0x02, 0xa3, 0x13, 0xd8, 0x4f, 0x68, 0x1a, 0x27, 0x42, 0x0d, 0x18, 0xe3, 0x4d, 0x26, - 0xc5, 0x14, 0x6c, 0x99, 0x47, 0xc6, 0x81, 0x2a, 0xd7, 0x09, 0x7a, 0x0e, 0x87, 0x9c, 0x65, 0xb3, - 0xba, 0xa3, 0xd9, 0xc0, 0x3d, 0x08, 0x8e, 0xaa, 0x95, 0xa5, 0x5f, 0xbc, 0x7b, 0x83, 0x65, 0x0d, - 0xeb, 0x9c, 0x65, 0x2a, 0x42, 0xaf, 0xa1, 0x3e, 0x97, 0xf6, 0xce, 0xd2, 0xc8, 0xe8, 0x29, 0xe3, - 0x9c, 0x3f, 0x18, 0xb7, 0xd9, 0x44, 0x70, 0x58, 0xad, 0xac, 0xc1, 0x26, 0xc1, 0x03, 0x45, 0x30, - 0x8d, 0x50, 0x00, 0x87, 0xcd, 0x1a, 0x8d, 0xbe, 0x22, 0x9b, 0x78, 0xf5, 0xa2, 0xbd, 0xed, 0xa2, - 0xbd, 0xab, 0x2d, 0x22, 0xd0, 0xa5, 0xef, 0xb7, 0xdf, 0x2d, 0x80, 0xdb, 0x6f, 0xe8, 0x19, 0xd4, - 0xc3, 0x84, 0xa4, 0xb9, 0xd4, 0x33, 0xb0, 0x81, 0x3b, 0xac, 0x67, 0x9d, 0xcb, 0x9a, 0x9c, 0xa5, - 0x9a, 0xd3, 0xc8, 0xf9, 0xd2, 0x85, 0xa3, 0x46, 0xd6, 0x35, 0x13, 0xf4, 0x7f, 0xf8, 0xba, 0x6b, - 0x96, 0xf6, 0x2f, 0xcd, 0xea, 0xfd, 0xbd, 0x59, 0xfd, 0xdf, 0x9b, 0x15, 0xbc, 0xbf, 0xab, 0x4c, - 0x70, 0x5f, 0x99, 0xe0, 0x47, 0x65, 0x82, 0xdb, 0xb5, 0xd9, 0xb9, 0x5f, 0x9b, 0x9d, 0xaf, 0x6b, - 0xb3, 0xf3, 0xe1, 0x45, 0x9c, 0x8a, 0x64, 0x39, 0xf7, 0x42, 0xb6, 0xf0, 0x77, 0x0f, 0xb6, 0x0d, - 0xeb, 0xc3, 0x7e, 0x78, 0xcc, 0xf3, 0xbe, 0xaa, 0x9f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, - 0xdd, 0x12, 0x5d, 0x31, 0x04, 0x00, 0x00, + // 522 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0xe3, 0xd4, 0x49, 0x9c, 0x4b, 0x53, 0xc2, 0xa9, 0xaa, 0xac, 0x08, 0xd9, 0x96, 0x25, + 0x90, 0x59, 0x6c, 0x29, 0x1d, 0xd8, 0x5d, 0x90, 0x08, 0x2a, 0xa2, 0x5c, 0xa3, 0x0e, 0x2c, 0xd6, + 0xc5, 0x3e, 0x6c, 0x0b, 0xc7, 0x67, 0xd9, 0x97, 0x8a, 0x2e, 0x7c, 0x86, 0x7e, 0xac, 0x8e, 0x1d, + 0x61, 0x09, 0xc8, 0xf9, 0x12, 0x8c, 0xe8, 0xce, 0x49, 0x1c, 0x25, 0xc0, 0x02, 0xea, 0x12, 0xbd, + 0x7f, 0x1e, 0xbf, 0xef, 0xa3, 0xdf, 0xab, 0x1c, 0x30, 0x18, 0x49, 0x03, 0x92, 0xcf, 0xe2, 0x94, + 0x39, 0xec, 0x26, 0x23, 0x85, 0xe3, 0xe3, 0x94, 0xa6, 0xb1, 0x8f, 0x13, 0x3b, 0xcb, 0x29, 0xa3, + 0x70, 0x50, 0x2b, 0x6c, 0xa1, 0x18, 0x1e, 0x87, 0x34, 0xa4, 0xa2, 0xe9, 0xf0, 0xa8, 0xd2, 0x0d, + 0x9f, 0xec, 0x4d, 0x12, 0xbf, 0xab, 0xae, 0x1e, 0x52, 0x1a, 0x26, 0xc4, 0x11, 0xd9, 0x74, 0xfe, + 0xd1, 0x61, 0xf1, 0x8c, 0x14, 0x0c, 0xcf, 0xb2, 0x4a, 0x60, 0x7e, 0x01, 0x83, 0xb3, 0xf5, 0x66, + 0x37, 0xa1, 0xfe, 0xa7, 0xf1, 0x4b, 0x08, 0x81, 0x1c, 0xe1, 0x22, 0x52, 0x25, 0x43, 0xb2, 0x0e, + 0x91, 0x88, 0xe1, 0x15, 0x78, 0x94, 0xe1, 0x9c, 0x79, 0x05, 0x61, 0x5e, 0x44, 0x70, 0x40, 0x72, + 0xb5, 0x69, 0x48, 0x56, 0x6f, 0x64, 0xd9, 0xbb, 0x46, 0xed, 0xcd, 0xc0, 0x0b, 0x9c, 0xb3, 0x4b, + 0xc2, 0x5e, 0x0b, 0xbd, 0x2b, 0xdf, 0x2d, 0xf4, 0x06, 0xea, 0x67, 0xdb, 0x45, 0xd3, 0x05, 0x27, + 0xbf, 0x97, 0xc3, 0x63, 0xd0, 0x62, 0x94, 0xe1, 0x44, 0xd8, 0xe8, 0xa3, 0x2a, 0xd9, 0x78, 0x6b, + 0xd6, 0xde, 0xcc, 0x6f, 0x4d, 0xf0, 0xb8, 0x1e, 0x92, 0xd3, 0x8c, 0x16, 0x38, 0x81, 0xa7, 0x40, + 0xe6, 0x76, 0xc4, 0xe7, 0x47, 0x23, 0x7d, 0xdf, 0xe6, 0x65, 0x1c, 0xa6, 0x24, 0x78, 0x5b, 0x84, + 0x93, 0x9b, 0x8c, 0x20, 0x21, 0x86, 0x27, 0xa0, 0x1d, 0x91, 0x38, 0x8c, 0x98, 0x58, 0x30, 0x40, + 0xab, 0x8c, 0x9b, 0xc9, 0xe9, 0x3c, 0x0d, 0xd4, 0x03, 0x51, 0xae, 0x12, 0xf8, 0x1c, 0x74, 0x33, + 0x9a, 0x78, 0x55, 0x47, 0x36, 0x24, 0xeb, 0xc0, 0x3d, 0x2c, 0x17, 0xba, 0x72, 0xf1, 0xee, 0x1c, + 0xf1, 0x1a, 0x52, 0x32, 0x9a, 0x88, 0x08, 0xbe, 0x01, 0xca, 0x94, 0xe3, 0xf5, 0xe2, 0x40, 0x6d, + 0x09, 0x70, 0xe6, 0x5f, 0xc0, 0xad, 0x2e, 0xe1, 0xf6, 0xca, 0x85, 0xde, 0x59, 0x25, 0xa8, 0x23, + 0x06, 0x8c, 0x03, 0xe8, 0x82, 0xee, 0xe6, 0x8c, 0x6a, 0x5b, 0x0c, 0x1b, 0xda, 0xd5, 0xa1, 0xed, + 0xf5, 0xa1, 0xed, 0xc9, 0x5a, 0xe1, 0x2a, 0x9c, 0xfb, 0xed, 0x77, 0x5d, 0x42, 0xf5, 0x67, 0xf0, + 0x19, 0x50, 0xfc, 0x08, 0xc7, 0x29, 0xf7, 0xd3, 0x31, 0x24, 0xab, 0x5b, 0xed, 0x3a, 0xe3, 0x35, + 0xbe, 0x4b, 0x34, 0xc7, 0x81, 0xf9, 0xb3, 0x09, 0xfa, 0x1b, 0x5b, 0x57, 0x94, 0x91, 0x87, 0xe0, + 0xba, 0x0d, 0x4b, 0xfe, 0x9f, 0xb0, 0x5a, 0xff, 0x0e, 0xab, 0xfd, 0x67, 0x58, 0xf0, 0x1c, 0x1c, + 0x5d, 0x53, 0x46, 0x3c, 0xf2, 0x99, 0x91, 0xb4, 0x88, 0x69, 0x2a, 0xd0, 0xf6, 0x46, 0x4f, 0xf7, + 0xdd, 0x73, 0x94, 0xaf, 0xd6, 0xb2, 0x09, 0xe5, 0xcc, 0x50, 0xff, 0x7a, 0xbb, 0xe8, 0xbe, 0xbf, + 0x2b, 0x35, 0xe9, 0xbe, 0xd4, 0xa4, 0x1f, 0xa5, 0x26, 0xdd, 0x2e, 0xb5, 0xc6, 0xfd, 0x52, 0x6b, + 0x7c, 0x5d, 0x6a, 0x8d, 0x0f, 0x2f, 0xc2, 0x98, 0x45, 0xf3, 0xa9, 0xed, 0xd3, 0x99, 0xb3, 0xfd, + 0xf7, 0xaf, 0xc3, 0xea, 0x99, 0xd8, 0x7d, 0x1a, 0xa6, 0x6d, 0x51, 0x3f, 0xfd, 0x15, 0x00, 0x00, + 0xff, 0xff, 0x4e, 0x61, 0xcb, 0xc4, 0x7f, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -519,6 +529,18 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCanonical(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + } if len(m.ChainID) > 0 { i -= len(m.ChainID) copy(dAtA[i:], m.ChainID) @@ -526,12 +548,12 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err4 != nil { - return 0, err4 + n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err5 != nil { + return 0, err5 } - i -= n4 - i = encodeVarintCanonical(dAtA, i, uint64(n4)) + i -= n5 + i = encodeVarintCanonical(dAtA, i, uint64(n5)) i-- dAtA[i] = 0x2a if m.BlockID != nil { @@ -664,6 +686,10 @@ func (m *CanonicalVote) Size() (n int) { if l > 0 { n += 1 + l + sovCanonical(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovCanonical(uint64(l)) + } return n } @@ -1271,6 +1297,42 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { } m.ChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCanonical + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCanonical + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteExtension == nil { + m.VoteExtension = &VoteExtensionToSign{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCanonical(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index e88fd6ffe..b7a66d4d2 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -34,4 +34,5 @@ message CanonicalVote { CanonicalBlockID block_id = 4 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; + VoteExtensionToSign vote_extension = 7; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 653497c56..5c1f99d23 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -466,14 +466,15 @@ func (m *Data) GetTxs() [][]byte { // Vote represents a prevote, precommit, or commit vote from validators for // consensus. type Vote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` - BlockID BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ValidatorAddress []byte `protobuf:"bytes,6,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - ValidatorIndex int32 `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` - Signature []byte `protobuf:"bytes,8,opt,name=signature,proto3" json:"signature,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` + BlockID BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` + Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ValidatorAddress []byte `protobuf:"bytes,6,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + ValidatorIndex int32 `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` + Signature []byte `protobuf:"bytes,8,opt,name=signature,proto3" json:"signature,omitempty"` + VoteExtension *VoteExtension `protobuf:"bytes,9,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *Vote) Reset() { *m = Vote{} } @@ -565,6 +566,112 @@ func (m *Vote) GetSignature() []byte { return nil } +func (m *Vote) GetVoteExtension() *VoteExtension { + if m != nil { + return m.VoteExtension + } + return nil +} + +// VoteExtension is app-defined additional information to the validator votes. +type VoteExtension struct { + AppDataToSign []byte `protobuf:"bytes,1,opt,name=app_data_to_sign,json=appDataToSign,proto3" json:"app_data_to_sign,omitempty"` + AppDataSelfAuthenticating []byte `protobuf:"bytes,2,opt,name=app_data_self_authenticating,json=appDataSelfAuthenticating,proto3" json:"app_data_self_authenticating,omitempty"` +} + +func (m *VoteExtension) Reset() { *m = VoteExtension{} } +func (m *VoteExtension) String() string { return proto.CompactTextString(m) } +func (*VoteExtension) ProtoMessage() {} +func (*VoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{6} +} +func (m *VoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VoteExtension.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *VoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_VoteExtension.Merge(m, src) +} +func (m *VoteExtension) XXX_Size() int { + return m.Size() +} +func (m *VoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_VoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_VoteExtension proto.InternalMessageInfo + +func (m *VoteExtension) GetAppDataToSign() []byte { + if m != nil { + return m.AppDataToSign + } + return nil +} + +func (m *VoteExtension) GetAppDataSelfAuthenticating() []byte { + if m != nil { + return m.AppDataSelfAuthenticating + } + return nil +} + +// VoteExtensionToSign is a subset of VoteExtension that is signed by the validators private key. +// VoteExtensionToSign is extracted from an existing VoteExtension. +type VoteExtensionToSign struct { + AppDataToSign []byte `protobuf:"bytes,1,opt,name=app_data_to_sign,json=appDataToSign,proto3" json:"app_data_to_sign,omitempty"` +} + +func (m *VoteExtensionToSign) Reset() { *m = VoteExtensionToSign{} } +func (m *VoteExtensionToSign) String() string { return proto.CompactTextString(m) } +func (*VoteExtensionToSign) ProtoMessage() {} +func (*VoteExtensionToSign) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{7} +} +func (m *VoteExtensionToSign) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VoteExtensionToSign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VoteExtensionToSign.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *VoteExtensionToSign) XXX_Merge(src proto.Message) { + xxx_messageInfo_VoteExtensionToSign.Merge(m, src) +} +func (m *VoteExtensionToSign) XXX_Size() int { + return m.Size() +} +func (m *VoteExtensionToSign) XXX_DiscardUnknown() { + xxx_messageInfo_VoteExtensionToSign.DiscardUnknown(m) +} + +var xxx_messageInfo_VoteExtensionToSign proto.InternalMessageInfo + +func (m *VoteExtensionToSign) GetAppDataToSign() []byte { + if m != nil { + return m.AppDataToSign + } + return nil +} + // Commit contains the evidence that a block was committed by a set of // validators. type Commit struct { @@ -578,7 +685,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{6} + return fileDescriptor_d3a6e55e2345de56, []int{8} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -637,17 +744,18 @@ func (m *Commit) GetSignatures() []CommitSig { // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` - ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,5,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{7} + return fileDescriptor_d3a6e55e2345de56, []int{9} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -704,6 +812,13 @@ func (m *CommitSig) GetSignature() []byte { return nil } +func (m *CommitSig) GetVoteExtension() *VoteExtensionToSign { + if m != nil { + return m.VoteExtension + } + return nil +} + type Proposal struct { Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` @@ -718,7 +833,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{8} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -805,7 +920,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{9} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -857,7 +972,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -911,7 +1026,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -980,7 +1095,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_d3a6e55e2345de56, []int{14} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1039,6 +1154,8 @@ func init() { proto.RegisterType((*Header)(nil), "tendermint.types.Header") proto.RegisterType((*Data)(nil), "tendermint.types.Data") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") + proto.RegisterType((*VoteExtension)(nil), "tendermint.types.VoteExtension") + proto.RegisterType((*VoteExtensionToSign)(nil), "tendermint.types.VoteExtensionToSign") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") @@ -1051,90 +1168,96 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xda, 0x9b, 0xd8, 0x7e, 0xb6, 0x13, 0x67, 0x95, 0xb6, 0xae, 0xdb, 0x38, 0x2b, 0x23, - 0x20, 0x2d, 0x68, 0x53, 0x52, 0xc4, 0x9f, 0x03, 0x07, 0xdb, 0x49, 0x5b, 0xab, 0x89, 0x63, 0xd6, - 0x6e, 0x11, 0x5c, 0x56, 0x6b, 0xef, 0xd4, 0x5e, 0xba, 0xde, 0x59, 0xed, 0x8c, 0x43, 0xd2, 0x4f, - 0x80, 0x72, 0xea, 0x89, 0x5b, 0x4e, 0x70, 0xe0, 0xce, 0x17, 0x40, 0x9c, 0x7a, 0xec, 0x0d, 0x2e, - 0x14, 0x94, 0x4a, 0x88, 0x8f, 0x81, 0xe6, 0x8f, 0xd7, 0xeb, 0x38, 0x86, 0xaa, 0xaa, 0xb8, 0x58, - 0x3b, 0xef, 0xfd, 0xde, 0xcc, 0x7b, 0xbf, 0xf7, 0x9b, 0x3f, 0x86, 0xeb, 0x14, 0xf9, 0x0e, 0x0a, - 0x87, 0xae, 0x4f, 0xb7, 0xe8, 0x71, 0x80, 0x88, 0xf8, 0x35, 0x82, 0x10, 0x53, 0xac, 0x15, 0x26, - 0x5e, 0x83, 0xdb, 0x4b, 0x6b, 0x7d, 0xdc, 0xc7, 0xdc, 0xb9, 0xc5, 0xbe, 0x04, 0xae, 0xb4, 0xd1, - 0xc7, 0xb8, 0xef, 0xa1, 0x2d, 0x3e, 0xea, 0x8e, 0x1e, 0x6d, 0x51, 0x77, 0x88, 0x08, 0xb5, 0x87, - 0x81, 0x04, 0xac, 0xc7, 0x96, 0xe9, 0x85, 0xc7, 0x01, 0xc5, 0x0c, 0x8b, 0x1f, 0x49, 0x77, 0x39, - 0xe6, 0x3e, 0x44, 0x21, 0x71, 0xb1, 0x1f, 0xcf, 0xa3, 0xa4, 0xcf, 0x64, 0x79, 0x68, 0x7b, 0xae, - 0x63, 0x53, 0x1c, 0x0a, 0x44, 0xe5, 0x53, 0xc8, 0xb7, 0xec, 0x90, 0xb6, 0x11, 0xbd, 0x87, 0x6c, - 0x07, 0x85, 0xda, 0x1a, 0x2c, 0x52, 0x4c, 0x6d, 0xaf, 0xa8, 0xe8, 0xca, 0x66, 0xde, 0x14, 0x03, - 0x4d, 0x03, 0x75, 0x60, 0x93, 0x41, 0x31, 0xa1, 0x2b, 0x9b, 0x39, 0x93, 0x7f, 0x57, 0x06, 0xa0, - 0xb2, 0x50, 0x16, 0xe1, 0xfa, 0x0e, 0x3a, 0x1a, 0x47, 0xf0, 0x01, 0xb3, 0x76, 0x8f, 0x29, 0x22, - 0x32, 0x44, 0x0c, 0xb4, 0x0f, 0x61, 0x91, 0xe7, 0x5f, 0x4c, 0xea, 0xca, 0x66, 0x76, 0xbb, 0x68, - 0xc4, 0x88, 0x12, 0xf5, 0x19, 0x2d, 0xe6, 0xaf, 0xa9, 0xcf, 0x5e, 0x6c, 0x2c, 0x98, 0x02, 0x5c, - 0xf1, 0x20, 0x55, 0xf3, 0x70, 0xef, 0x71, 0x63, 0x27, 0x4a, 0x44, 0x99, 0x24, 0xa2, 0xed, 0xc3, - 0x4a, 0x60, 0x87, 0xd4, 0x22, 0x88, 0x5a, 0x03, 0x5e, 0x05, 0x5f, 0x34, 0xbb, 0xbd, 0x61, 0x9c, - 0xef, 0x83, 0x31, 0x55, 0xac, 0x5c, 0x25, 0x1f, 0xc4, 0x8d, 0x95, 0xbf, 0x54, 0x58, 0x92, 0x64, - 0x7c, 0x06, 0x29, 0x49, 0x2b, 0x5f, 0x30, 0xbb, 0xbd, 0x1e, 0x9f, 0x51, 0xba, 0x8c, 0x3a, 0xf6, - 0x09, 0xf2, 0xc9, 0x88, 0xc8, 0xf9, 0xc6, 0x31, 0xda, 0x3b, 0x90, 0xee, 0x0d, 0x6c, 0xd7, 0xb7, - 0x5c, 0x87, 0x67, 0x94, 0xa9, 0x65, 0xcf, 0x5e, 0x6c, 0xa4, 0xea, 0xcc, 0xd6, 0xd8, 0x31, 0x53, - 0xdc, 0xd9, 0x70, 0xb4, 0xcb, 0xb0, 0x34, 0x40, 0x6e, 0x7f, 0x40, 0x39, 0x2d, 0x49, 0x53, 0x8e, - 0xb4, 0x4f, 0x40, 0x65, 0x82, 0x28, 0xaa, 0x7c, 0xed, 0x92, 0x21, 0xd4, 0x62, 0x8c, 0xd5, 0x62, - 0x74, 0xc6, 0x6a, 0xa9, 0xa5, 0xd9, 0xc2, 0x4f, 0xff, 0xd8, 0x50, 0x4c, 0x1e, 0xa1, 0xd5, 0x21, - 0xef, 0xd9, 0x84, 0x5a, 0x5d, 0x46, 0x1b, 0x5b, 0x7e, 0x91, 0x4f, 0x71, 0x75, 0x96, 0x10, 0x49, - 0xac, 0x4c, 0x3d, 0xcb, 0xa2, 0x84, 0xc9, 0xd1, 0x36, 0xa1, 0xc0, 0x27, 0xe9, 0xe1, 0xe1, 0xd0, - 0xa5, 0x16, 0xe7, 0x7d, 0x89, 0xf3, 0xbe, 0xcc, 0xec, 0x75, 0x6e, 0xbe, 0xc7, 0x3a, 0x70, 0x0d, - 0x32, 0x8e, 0x4d, 0x6d, 0x01, 0x49, 0x71, 0x48, 0x9a, 0x19, 0xb8, 0xf3, 0x5d, 0x58, 0x89, 0x54, - 0x47, 0x04, 0x24, 0x2d, 0x66, 0x99, 0x98, 0x39, 0xf0, 0x16, 0xac, 0xf9, 0xe8, 0x88, 0x5a, 0xe7, - 0xd1, 0x19, 0x8e, 0xd6, 0x98, 0xef, 0xe1, 0x74, 0xc4, 0xdb, 0xb0, 0xdc, 0x1b, 0x93, 0x2f, 0xb0, - 0xc0, 0xb1, 0xf9, 0xc8, 0xca, 0x61, 0x57, 0x21, 0x6d, 0x07, 0x81, 0x00, 0x64, 0x39, 0x20, 0x65, - 0x07, 0x01, 0x77, 0xdd, 0x84, 0x55, 0x5e, 0x63, 0x88, 0xc8, 0xc8, 0xa3, 0x72, 0x92, 0x1c, 0xc7, - 0xac, 0x30, 0x87, 0x29, 0xec, 0x1c, 0xfb, 0x16, 0xe4, 0xd1, 0xa1, 0xeb, 0x20, 0xbf, 0x87, 0x04, - 0x2e, 0xcf, 0x71, 0xb9, 0xb1, 0x91, 0x83, 0x6e, 0x40, 0x21, 0x08, 0x71, 0x80, 0x09, 0x0a, 0x2d, - 0xdb, 0x71, 0x42, 0x44, 0x48, 0x71, 0x59, 0xcc, 0x37, 0xb6, 0x57, 0x85, 0xb9, 0x52, 0x04, 0x75, - 0xc7, 0xa6, 0xb6, 0x56, 0x80, 0x24, 0x3d, 0x22, 0x45, 0x45, 0x4f, 0x6e, 0xe6, 0x4c, 0xf6, 0x59, - 0xf9, 0x3b, 0x01, 0xea, 0x43, 0x4c, 0x91, 0x76, 0x1b, 0x54, 0xd6, 0x26, 0xae, 0xbe, 0xe5, 0x8b, - 0xf4, 0xdc, 0x76, 0xfb, 0x3e, 0x72, 0xf6, 0x49, 0xbf, 0x73, 0x1c, 0x20, 0x93, 0x83, 0x63, 0x72, - 0x4a, 0x4c, 0xc9, 0x69, 0x0d, 0x16, 0x43, 0x3c, 0xf2, 0x1d, 0xae, 0xb2, 0x45, 0x53, 0x0c, 0xb4, - 0x5d, 0x48, 0x47, 0x2a, 0x51, 0xff, 0x4b, 0x25, 0x2b, 0x4c, 0x25, 0x4c, 0xc3, 0xd2, 0x60, 0xa6, - 0xba, 0x52, 0x2c, 0x35, 0xc8, 0x44, 0x87, 0x97, 0x54, 0xdb, 0xab, 0x09, 0x76, 0x12, 0xa6, 0xbd, - 0x07, 0xab, 0x51, 0xef, 0x23, 0xf2, 0x84, 0xe2, 0x0a, 0x91, 0x43, 0xb2, 0x37, 0x25, 0x2b, 0x4b, - 0x1c, 0x40, 0x29, 0x5e, 0xd7, 0x44, 0x56, 0x0d, 0x7e, 0x12, 0x5d, 0x87, 0x0c, 0x71, 0xfb, 0xbe, - 0x4d, 0x47, 0x21, 0x92, 0xca, 0x9b, 0x18, 0x2a, 0x3f, 0x2b, 0xb0, 0x24, 0x94, 0x1c, 0xe3, 0x4d, - 0xb9, 0x98, 0xb7, 0xc4, 0x3c, 0xde, 0x92, 0xaf, 0xcf, 0x5b, 0x15, 0x20, 0x4a, 0x86, 0x14, 0x55, - 0x3d, 0xb9, 0x99, 0xdd, 0xbe, 0x36, 0x3b, 0x91, 0x48, 0xb1, 0xed, 0xf6, 0xe5, 0x46, 0x8d, 0x05, - 0x55, 0x7e, 0x57, 0x20, 0x13, 0xf9, 0xb5, 0x2a, 0xe4, 0xc7, 0x79, 0x59, 0x8f, 0x3c, 0xbb, 0x2f, - 0xb5, 0xb3, 0x3e, 0x37, 0xb9, 0x3b, 0x9e, 0xdd, 0x37, 0xb3, 0x32, 0x1f, 0x36, 0xb8, 0xb8, 0x0f, - 0x89, 0x39, 0x7d, 0x98, 0x6a, 0x7c, 0xf2, 0xf5, 0x1a, 0x3f, 0xd5, 0x22, 0xf5, 0x7c, 0x8b, 0x7e, - 0x4a, 0x40, 0xba, 0xc5, 0xf7, 0x8e, 0xed, 0xfd, 0x1f, 0x3b, 0xe2, 0x1a, 0x64, 0x02, 0xec, 0x59, - 0xc2, 0xa3, 0x72, 0x4f, 0x3a, 0xc0, 0x9e, 0x39, 0xd3, 0xf6, 0xc5, 0x37, 0xb4, 0x5d, 0x96, 0xde, - 0x00, 0x6b, 0xa9, 0xf3, 0xac, 0x85, 0x90, 0x13, 0x54, 0xc8, 0xbb, 0xec, 0x16, 0xe3, 0x80, 0x5f, - 0x8e, 0xca, 0xec, 0xdd, 0x2b, 0xd2, 0x16, 0x48, 0x53, 0xe2, 0x58, 0x84, 0x38, 0xfa, 0xe5, 0x75, - 0x5a, 0x9c, 0x27, 0x4b, 0x53, 0xe2, 0x2a, 0xdf, 0x29, 0x00, 0x7b, 0x8c, 0x59, 0x5e, 0x2f, 0xbb, - 0x85, 0x08, 0x4f, 0xc1, 0x9a, 0x5a, 0xb9, 0x3c, 0xaf, 0x69, 0x72, 0xfd, 0x1c, 0x89, 0xe7, 0x5d, - 0x87, 0xfc, 0x44, 0x8c, 0x04, 0x8d, 0x93, 0xb9, 0x60, 0x92, 0xe8, 0x72, 0x68, 0x23, 0x6a, 0xe6, - 0x0e, 0x63, 0xa3, 0xca, 0x2f, 0x0a, 0x64, 0x78, 0x4e, 0xfb, 0x88, 0xda, 0x53, 0x3d, 0x54, 0x5e, - 0xbf, 0x87, 0xeb, 0x00, 0x62, 0x1a, 0xe2, 0x3e, 0x41, 0x52, 0x59, 0x19, 0x6e, 0x69, 0xbb, 0x4f, - 0x90, 0xf6, 0x51, 0x44, 0x78, 0xf2, 0xdf, 0x09, 0x97, 0x5b, 0x7a, 0x4c, 0xfb, 0x15, 0x48, 0xf9, - 0xa3, 0xa1, 0xc5, 0xae, 0x04, 0x55, 0xa8, 0xd5, 0x1f, 0x0d, 0x3b, 0x47, 0xa4, 0xf2, 0x35, 0xa4, - 0x3a, 0x47, 0xfc, 0x79, 0xc4, 0x24, 0x1a, 0x62, 0x2c, 0xef, 0x64, 0xf1, 0x16, 0x4a, 0x33, 0x03, - 0xbf, 0x82, 0x34, 0x50, 0xd9, 0xe5, 0x3b, 0x7e, 0xac, 0xb1, 0x6f, 0xcd, 0x78, 0xc5, 0x87, 0x97, - 0x7c, 0x72, 0xdd, 0xfc, 0x55, 0x81, 0x6c, 0xec, 0x7c, 0xd0, 0x3e, 0x80, 0x4b, 0xb5, 0xbd, 0x83, - 0xfa, 0x7d, 0xab, 0xb1, 0x63, 0xdd, 0xd9, 0xab, 0xde, 0xb5, 0x1e, 0x34, 0xef, 0x37, 0x0f, 0xbe, - 0x68, 0x16, 0x16, 0x4a, 0x97, 0x4f, 0x4e, 0x75, 0x2d, 0x86, 0x7d, 0xe0, 0x3f, 0xf6, 0xf1, 0x37, - 0xbe, 0xb6, 0x05, 0x6b, 0xd3, 0x21, 0xd5, 0x5a, 0x7b, 0xb7, 0xd9, 0x29, 0x28, 0xa5, 0x4b, 0x27, - 0xa7, 0xfa, 0x6a, 0x2c, 0xa2, 0xda, 0x25, 0xc8, 0xa7, 0xb3, 0x01, 0xf5, 0x83, 0xfd, 0xfd, 0x46, - 0xa7, 0x90, 0x98, 0x09, 0x90, 0x07, 0xf6, 0x0d, 0x58, 0x9d, 0x0e, 0x68, 0x36, 0xf6, 0x0a, 0xc9, - 0x92, 0x76, 0x72, 0xaa, 0x2f, 0xc7, 0xd0, 0x4d, 0xd7, 0x2b, 0xa5, 0xbf, 0xfd, 0xbe, 0xbc, 0xf0, - 0xe3, 0x0f, 0x65, 0x85, 0x55, 0x96, 0x9f, 0x3a, 0x23, 0xb4, 0xf7, 0xe1, 0x4a, 0xbb, 0x71, 0xb7, - 0xb9, 0xbb, 0x63, 0xed, 0xb7, 0xef, 0x5a, 0x9d, 0x2f, 0x5b, 0xbb, 0xb1, 0xea, 0x56, 0x4e, 0x4e, - 0xf5, 0xac, 0x2c, 0x69, 0x1e, 0xba, 0x65, 0xee, 0x3e, 0x3c, 0xe8, 0xec, 0x16, 0x14, 0x81, 0x6e, - 0x85, 0xe8, 0x10, 0x53, 0xc4, 0xd1, 0xb7, 0xe0, 0xea, 0x05, 0xe8, 0xa8, 0xb0, 0xd5, 0x93, 0x53, - 0x3d, 0xdf, 0x0a, 0x91, 0xd8, 0x3f, 0x3c, 0xc2, 0x80, 0xe2, 0x6c, 0xc4, 0x41, 0xeb, 0xa0, 0x5d, - 0xdd, 0x2b, 0xe8, 0xa5, 0xc2, 0xc9, 0xa9, 0x9e, 0x1b, 0x1f, 0x86, 0x0c, 0x3f, 0xa9, 0xac, 0xf6, - 0xf9, 0xb3, 0xb3, 0xb2, 0xf2, 0xfc, 0xac, 0xac, 0xfc, 0x79, 0x56, 0x56, 0x9e, 0xbe, 0x2c, 0x2f, - 0x3c, 0x7f, 0x59, 0x5e, 0xf8, 0xed, 0x65, 0x79, 0xe1, 0xab, 0x8f, 0xfb, 0x2e, 0x1d, 0x8c, 0xba, - 0x46, 0x0f, 0x0f, 0xb7, 0xe2, 0x7f, 0x09, 0x26, 0x9f, 0xe2, 0xaf, 0xc9, 0xf9, 0xbf, 0x0b, 0xdd, - 0x25, 0x6e, 0xbf, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x78, 0x43, 0xdf, 0xef, 0x0c, - 0x00, 0x00, + // 1423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdb, 0x64, + 0x18, 0xaf, 0x13, 0xb7, 0x49, 0x9e, 0xc4, 0x6d, 0xfa, 0xd2, 0x6d, 0x69, 0xb6, 0xa6, 0x91, 0xd1, + 0x58, 0x37, 0x50, 0x3a, 0x3a, 0xc4, 0x9f, 0x03, 0xa0, 0x24, 0xcd, 0xb6, 0x68, 0x6d, 0x1a, 0x9c, + 0x6c, 0x08, 0x2e, 0x96, 0x93, 0xbc, 0x4d, 0xcc, 0x1c, 0xdb, 0xb2, 0xdf, 0x94, 0x76, 0x9f, 0x00, + 0xf5, 0xb4, 0x13, 0xb7, 0x9e, 0xe0, 0x80, 0xc4, 0x05, 0x89, 0x2f, 0x80, 0x38, 0xed, 0xb8, 0x1b, + 0x9c, 0x06, 0xea, 0x24, 0x3e, 0x07, 0x7a, 0xff, 0xc4, 0xb1, 0x9b, 0x86, 0x4d, 0xd5, 0xc4, 0x25, + 0xf2, 0xfb, 0x3c, 0xbf, 0xe7, 0xff, 0xcf, 0x8f, 0xdf, 0xc0, 0x35, 0x82, 0xed, 0x1e, 0xf6, 0x86, + 0xa6, 0x4d, 0x36, 0xc9, 0x91, 0x8b, 0x7d, 0xfe, 0x5b, 0x72, 0x3d, 0x87, 0x38, 0x28, 0x3b, 0xd1, + 0x96, 0x98, 0x3c, 0xbf, 0xd2, 0x77, 0xfa, 0x0e, 0x53, 0x6e, 0xd2, 0x27, 0x8e, 0xcb, 0xaf, 0xf7, + 0x1d, 0xa7, 0x6f, 0xe1, 0x4d, 0x76, 0xea, 0x8c, 0xf6, 0x37, 0x89, 0x39, 0xc4, 0x3e, 0x31, 0x86, + 0xae, 0x00, 0xac, 0x85, 0xc2, 0x74, 0xbd, 0x23, 0x97, 0x38, 0x14, 0xeb, 0xec, 0x0b, 0x75, 0x21, + 0xa4, 0x3e, 0xc0, 0x9e, 0x6f, 0x3a, 0x76, 0x38, 0x8f, 0x7c, 0x71, 0x2a, 0xcb, 0x03, 0xc3, 0x32, + 0x7b, 0x06, 0x71, 0x3c, 0x8e, 0x50, 0x3f, 0x01, 0xa5, 0x69, 0x78, 0xa4, 0x85, 0xc9, 0x7d, 0x6c, + 0xf4, 0xb0, 0x87, 0x56, 0x60, 0x9e, 0x38, 0xc4, 0xb0, 0x72, 0x52, 0x51, 0xda, 0x50, 0x34, 0x7e, + 0x40, 0x08, 0xe4, 0x81, 0xe1, 0x0f, 0x72, 0xb1, 0xa2, 0xb4, 0x91, 0xd1, 0xd8, 0xb3, 0x3a, 0x00, + 0x99, 0x9a, 0x52, 0x0b, 0xd3, 0xee, 0xe1, 0xc3, 0xb1, 0x05, 0x3b, 0x50, 0x69, 0xe7, 0x88, 0x60, + 0x5f, 0x98, 0xf0, 0x03, 0xfa, 0x00, 0xe6, 0x59, 0xfe, 0xb9, 0x78, 0x51, 0xda, 0x48, 0x6f, 0xe5, + 0x4a, 0xa1, 0x46, 0xf1, 0xfa, 0x4a, 0x4d, 0xaa, 0xaf, 0xc8, 0xcf, 0x5e, 0xac, 0xcf, 0x69, 0x1c, + 0xac, 0x5a, 0x90, 0xa8, 0x58, 0x4e, 0xf7, 0x71, 0x7d, 0x3b, 0x48, 0x44, 0x9a, 0x24, 0x82, 0x76, + 0x61, 0xc9, 0x35, 0x3c, 0xa2, 0xfb, 0x98, 0xe8, 0x03, 0x56, 0x05, 0x0b, 0x9a, 0xde, 0x5a, 0x2f, + 0x9d, 0x9d, 0x43, 0x29, 0x52, 0xac, 0x88, 0xa2, 0xb8, 0x61, 0xa1, 0xfa, 0x8f, 0x0c, 0x0b, 0xa2, + 0x19, 0x9f, 0x42, 0x42, 0xb4, 0x95, 0x05, 0x4c, 0x6f, 0xad, 0x85, 0x3d, 0x0a, 0x55, 0xa9, 0xea, + 0xd8, 0x3e, 0xb6, 0xfd, 0x91, 0x2f, 0xfc, 0x8d, 0x6d, 0xd0, 0x3b, 0x90, 0xec, 0x0e, 0x0c, 0xd3, + 0xd6, 0xcd, 0x1e, 0xcb, 0x28, 0x55, 0x49, 0x9f, 0xbe, 0x58, 0x4f, 0x54, 0xa9, 0xac, 0xbe, 0xad, + 0x25, 0x98, 0xb2, 0xde, 0x43, 0x97, 0x61, 0x61, 0x80, 0xcd, 0xfe, 0x80, 0xb0, 0xb6, 0xc4, 0x35, + 0x71, 0x42, 0x1f, 0x83, 0x4c, 0x09, 0x91, 0x93, 0x59, 0xec, 0x7c, 0x89, 0xb3, 0xa5, 0x34, 0x66, + 0x4b, 0xa9, 0x3d, 0x66, 0x4b, 0x25, 0x49, 0x03, 0x3f, 0xfd, 0x6b, 0x5d, 0xd2, 0x98, 0x05, 0xaa, + 0x82, 0x62, 0x19, 0x3e, 0xd1, 0x3b, 0xb4, 0x6d, 0x34, 0xfc, 0x3c, 0x73, 0xb1, 0x3a, 0xdd, 0x10, + 0xd1, 0x58, 0x91, 0x7a, 0x9a, 0x5a, 0x71, 0x51, 0x0f, 0x6d, 0x40, 0x96, 0x39, 0xe9, 0x3a, 0xc3, + 0xa1, 0x49, 0x74, 0xd6, 0xf7, 0x05, 0xd6, 0xf7, 0x45, 0x2a, 0xaf, 0x32, 0xf1, 0x7d, 0x3a, 0x81, + 0xab, 0x90, 0xea, 0x19, 0xc4, 0xe0, 0x90, 0x04, 0x83, 0x24, 0xa9, 0x80, 0x29, 0x6f, 0xc0, 0x52, + 0xc0, 0x3a, 0x9f, 0x43, 0x92, 0xdc, 0xcb, 0x44, 0xcc, 0x80, 0xb7, 0x61, 0xc5, 0xc6, 0x87, 0x44, + 0x3f, 0x8b, 0x4e, 0x31, 0x34, 0xa2, 0xba, 0x47, 0x51, 0x8b, 0xeb, 0xb0, 0xd8, 0x1d, 0x37, 0x9f, + 0x63, 0x81, 0x61, 0x95, 0x40, 0xca, 0x60, 0xab, 0x90, 0x34, 0x5c, 0x97, 0x03, 0xd2, 0x0c, 0x90, + 0x30, 0x5c, 0x97, 0xa9, 0x6e, 0xc1, 0x32, 0xab, 0xd1, 0xc3, 0xfe, 0xc8, 0x22, 0xc2, 0x49, 0x86, + 0x61, 0x96, 0xa8, 0x42, 0xe3, 0x72, 0x86, 0x7d, 0x1b, 0x14, 0x7c, 0x60, 0xf6, 0xb0, 0xdd, 0xc5, + 0x1c, 0xa7, 0x30, 0x5c, 0x66, 0x2c, 0x64, 0xa0, 0x9b, 0x90, 0x75, 0x3d, 0xc7, 0x75, 0x7c, 0xec, + 0xe9, 0x46, 0xaf, 0xe7, 0x61, 0xdf, 0xcf, 0x2d, 0x72, 0x7f, 0x63, 0x79, 0x99, 0x8b, 0xd5, 0x1c, + 0xc8, 0xdb, 0x06, 0x31, 0x50, 0x16, 0xe2, 0xe4, 0xd0, 0xcf, 0x49, 0xc5, 0xf8, 0x46, 0x46, 0xa3, + 0x8f, 0xea, 0x2f, 0x71, 0x90, 0x1f, 0x39, 0x04, 0xa3, 0x3b, 0x20, 0xd3, 0x31, 0x31, 0xf6, 0x2d, + 0x9e, 0xc7, 0xe7, 0x96, 0xd9, 0xb7, 0x71, 0x6f, 0xd7, 0xef, 0xb7, 0x8f, 0x5c, 0xac, 0x31, 0x70, + 0x88, 0x4e, 0xb1, 0x08, 0x9d, 0x56, 0x60, 0xde, 0x73, 0x46, 0x76, 0x8f, 0xb1, 0x6c, 0x5e, 0xe3, + 0x07, 0x54, 0x83, 0x64, 0xc0, 0x12, 0xf9, 0x55, 0x2c, 0x59, 0xa2, 0x2c, 0xa1, 0x1c, 0x16, 0x02, + 0x2d, 0xd1, 0x11, 0x64, 0xa9, 0x40, 0x2a, 0x58, 0x5e, 0x82, 0x6d, 0xaf, 0x47, 0xd8, 0x89, 0x19, + 0x7a, 0x17, 0x96, 0x83, 0xd9, 0x07, 0xcd, 0xe3, 0x8c, 0xcb, 0x06, 0x0a, 0xd1, 0xbd, 0x08, 0xad, + 0x74, 0xbe, 0x80, 0x12, 0xac, 0xae, 0x09, 0xad, 0xea, 0x6c, 0x13, 0x5d, 0x83, 0x94, 0x6f, 0xf6, + 0x6d, 0x83, 0x8c, 0x3c, 0x2c, 0x98, 0x37, 0x11, 0xa0, 0xbb, 0xb0, 0x78, 0xe0, 0x10, 0xac, 0xe3, + 0x43, 0x82, 0x6d, 0xf6, 0xa6, 0xa7, 0x66, 0xed, 0x0e, 0x3a, 0x91, 0xda, 0x18, 0xa6, 0x29, 0x07, + 0xe1, 0xa3, 0x7a, 0x04, 0x4a, 0x44, 0x8f, 0x6e, 0x40, 0x96, 0x92, 0x8e, 0xbd, 0x17, 0xc4, 0xd1, + 0x69, 0x44, 0xb1, 0xb5, 0x14, 0xc3, 0x75, 0xe9, 0xe0, 0xdb, 0x0e, 0x9d, 0x1e, 0xfa, 0x1c, 0xae, + 0x05, 0x40, 0x1f, 0x5b, 0xfb, 0xba, 0x31, 0x22, 0x03, 0x6c, 0x13, 0xb3, 0x6b, 0x10, 0xd3, 0xee, + 0x8b, 0x05, 0xba, 0x2a, 0x8c, 0x5a, 0xd8, 0xda, 0x2f, 0x47, 0x00, 0xea, 0x67, 0xf0, 0x56, 0x24, + 0xb4, 0xf0, 0xfb, 0xba, 0x09, 0xa8, 0xbf, 0x49, 0xb0, 0xc0, 0x5f, 0xe6, 0x10, 0x75, 0xa4, 0xf3, + 0xa9, 0x13, 0x9b, 0x45, 0x9d, 0xf8, 0xc5, 0xa9, 0x53, 0x06, 0x08, 0xe6, 0xe1, 0xe7, 0xe4, 0x62, + 0x7c, 0x23, 0xbd, 0x75, 0x75, 0xda, 0x11, 0x4f, 0xb1, 0x65, 0xf6, 0xc5, 0xae, 0x0a, 0x19, 0xa9, + 0x3f, 0xc7, 0x20, 0x15, 0xe8, 0x51, 0x19, 0x94, 0x71, 0x5e, 0xfa, 0xbe, 0x65, 0xf4, 0xc5, 0xeb, + 0xb3, 0x36, 0x33, 0xb9, 0xbb, 0x96, 0xd1, 0xd7, 0xd2, 0x22, 0x1f, 0x7a, 0x38, 0x9f, 0x8a, 0xb1, + 0x19, 0x54, 0x8c, 0x70, 0x3f, 0x7e, 0x31, 0xee, 0x47, 0x58, 0x2a, 0x9f, 0x65, 0xe9, 0xce, 0x14, + 0x4b, 0xf9, 0x2b, 0x76, 0xfd, 0x15, 0x2c, 0xe5, 0x13, 0x3e, 0xcb, 0xd5, 0x5f, 0x63, 0x90, 0x6c, + 0xb2, 0x65, 0x64, 0x58, 0xff, 0xc7, 0x8a, 0xb9, 0x0a, 0x29, 0xd7, 0xb1, 0x74, 0xae, 0x91, 0x99, + 0x26, 0xe9, 0x3a, 0x96, 0x36, 0x45, 0xa2, 0xf9, 0x37, 0xb4, 0x7f, 0x16, 0xde, 0xc0, 0x0c, 0x12, + 0x67, 0x66, 0xa0, 0x7a, 0x90, 0xe1, 0xad, 0x10, 0x97, 0x83, 0xdb, 0xb4, 0x07, 0xec, 0xb6, 0x21, + 0x4d, 0x5f, 0x66, 0x78, 0xda, 0x1c, 0xa9, 0x09, 0x1c, 0xb5, 0xe0, 0xdf, 0x52, 0x71, 0x3f, 0xc9, + 0xcd, 0x22, 0xb9, 0x26, 0x70, 0xea, 0xf7, 0x12, 0xc0, 0x0e, 0xed, 0x2c, 0xab, 0x97, 0x7e, 0xd6, + 0x7d, 0x96, 0x82, 0x1e, 0x89, 0x5c, 0x98, 0x35, 0x34, 0x11, 0x3f, 0xe3, 0x87, 0xf3, 0xae, 0x82, + 0x32, 0xa1, 0xb6, 0x8f, 0xc7, 0xc9, 0x9c, 0xe3, 0x24, 0xf8, 0xda, 0xb6, 0x30, 0xd1, 0x32, 0x07, + 0xa1, 0x93, 0xfa, 0xbb, 0x04, 0x29, 0x96, 0xd3, 0x2e, 0x26, 0x46, 0x64, 0x86, 0xd2, 0xc5, 0x67, + 0xb8, 0x06, 0xc0, 0xdd, 0xf8, 0xe6, 0x13, 0x2c, 0x98, 0x95, 0x62, 0x92, 0x96, 0xf9, 0x04, 0xa3, + 0x0f, 0x83, 0x86, 0xc7, 0xff, 0xbb, 0xe1, 0x62, 0x41, 0x8c, 0xdb, 0x7e, 0x05, 0x12, 0xf6, 0x68, + 0xa8, 0xd3, 0x6f, 0xac, 0xcc, 0xd9, 0x6a, 0x8f, 0x86, 0xed, 0x43, 0x5f, 0xfd, 0x06, 0x12, 0xed, + 0x43, 0x76, 0xdf, 0xa4, 0x14, 0xf5, 0x1c, 0x47, 0x5c, 0x72, 0xf8, 0x96, 0x4c, 0x52, 0x01, 0xfb, + 0xa6, 0x23, 0x90, 0xe9, 0x16, 0x1d, 0xdf, 0x7e, 0xe9, 0x33, 0x2a, 0xbd, 0xe6, 0x4d, 0x56, 0xdc, + 0x61, 0x6f, 0xfd, 0x21, 0x41, 0x3a, 0xb4, 0x6d, 0xd0, 0xfb, 0x70, 0xa9, 0xb2, 0xb3, 0x57, 0x7d, + 0xa0, 0xd7, 0xb7, 0xf5, 0xbb, 0x3b, 0xe5, 0x7b, 0xfa, 0xc3, 0xc6, 0x83, 0xc6, 0xde, 0x97, 0x8d, + 0xec, 0x5c, 0xfe, 0xf2, 0xf1, 0x49, 0x11, 0x85, 0xb0, 0x0f, 0xed, 0xc7, 0xb6, 0xf3, 0xad, 0x8d, + 0x36, 0x61, 0x25, 0x6a, 0x52, 0xae, 0xb4, 0x6a, 0x8d, 0x76, 0x56, 0xca, 0x5f, 0x3a, 0x3e, 0x29, + 0x2e, 0x87, 0x2c, 0xca, 0x1d, 0x1f, 0xdb, 0x64, 0xda, 0xa0, 0xba, 0xb7, 0xbb, 0x5b, 0x6f, 0x67, + 0x63, 0x53, 0x06, 0x62, 0xfd, 0xdf, 0x84, 0xe5, 0xa8, 0x41, 0xa3, 0xbe, 0x93, 0x8d, 0xe7, 0xd1, + 0xf1, 0x49, 0x71, 0x31, 0x84, 0x6e, 0x98, 0x56, 0x3e, 0xf9, 0xdd, 0x0f, 0x85, 0xb9, 0x9f, 0x7e, + 0x2c, 0x48, 0xb4, 0x32, 0x25, 0xb2, 0x23, 0xd0, 0x7b, 0x70, 0xa5, 0x55, 0xbf, 0xd7, 0xa8, 0x6d, + 0xeb, 0xbb, 0xad, 0x7b, 0x7a, 0xfb, 0xab, 0x66, 0x2d, 0x54, 0xdd, 0xd2, 0xf1, 0x49, 0x31, 0x2d, + 0x4a, 0x9a, 0x85, 0x6e, 0x6a, 0xb5, 0x47, 0x7b, 0xed, 0x5a, 0x56, 0xe2, 0xe8, 0xa6, 0x87, 0xe9, + 0x02, 0x63, 0xe8, 0xdb, 0xb0, 0x7a, 0x0e, 0x3a, 0x28, 0x6c, 0xf9, 0xf8, 0xa4, 0xa8, 0x34, 0x3d, + 0xcc, 0xdf, 0x1f, 0x66, 0x51, 0x82, 0xdc, 0xb4, 0xc5, 0x5e, 0x73, 0xaf, 0x55, 0xde, 0xc9, 0x16, + 0xf3, 0xd9, 0xe3, 0x93, 0x62, 0x66, 0xbc, 0x0c, 0x29, 0x7e, 0x52, 0x59, 0xe5, 0x8b, 0x67, 0xa7, + 0x05, 0xe9, 0xf9, 0x69, 0x41, 0xfa, 0xfb, 0xb4, 0x20, 0x3d, 0x7d, 0x59, 0x98, 0x7b, 0xfe, 0xb2, + 0x30, 0xf7, 0xe7, 0xcb, 0xc2, 0xdc, 0xd7, 0x1f, 0xf5, 0x4d, 0x32, 0x18, 0x75, 0x4a, 0x5d, 0x67, + 0xb8, 0x19, 0xfe, 0x8f, 0x35, 0x79, 0xe4, 0xff, 0xf5, 0xce, 0xfe, 0xff, 0xea, 0x2c, 0x30, 0xf9, + 0x9d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x38, 0xfc, 0x14, 0xb1, 0x40, 0x0e, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1435,6 +1558,18 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } if len(m.Signature) > 0 { i -= len(m.Signature) copy(dAtA[i:], m.Signature) @@ -1454,12 +1589,12 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err6 != nil { - return 0, err6 + n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err7 != nil { + return 0, err7 } - i -= n6 - i = encodeVarintTypes(dAtA, i, uint64(n6)) + i -= n7 + i = encodeVarintTypes(dAtA, i, uint64(n7)) i-- dAtA[i] = 0x2a { @@ -1490,6 +1625,73 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *VoteExtension) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *VoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *VoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AppDataSelfAuthenticating) > 0 { + i -= len(m.AppDataSelfAuthenticating) + copy(dAtA[i:], m.AppDataSelfAuthenticating) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataSelfAuthenticating))) + i-- + dAtA[i] = 0x12 + } + if len(m.AppDataToSign) > 0 { + i -= len(m.AppDataToSign) + copy(dAtA[i:], m.AppDataToSign) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataToSign))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *VoteExtensionToSign) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *VoteExtensionToSign) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *VoteExtensionToSign) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AppDataToSign) > 0 { + i -= len(m.AppDataToSign) + copy(dAtA[i:], m.AppDataToSign) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataToSign))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Commit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1567,6 +1769,18 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } if len(m.Signature) > 0 { i -= len(m.Signature) copy(dAtA[i:], m.Signature) @@ -1574,12 +1788,12 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err9 != nil { - return 0, err9 + n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err11 != nil { + return 0, err11 } - i -= n9 - i = encodeVarintTypes(dAtA, i, uint64(n9)) + i -= n11 + i = encodeVarintTypes(dAtA, i, uint64(n11)) i-- dAtA[i] = 0x1a if len(m.ValidatorAddress) > 0 { @@ -1624,12 +1838,12 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n10, err10 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err10 != nil { - return 0, err10 + n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err12 != nil { + return 0, err12 } - i -= n10 - i = encodeVarintTypes(dAtA, i, uint64(n10)) + i -= n12 + i = encodeVarintTypes(dAtA, i, uint64(n12)) i-- dAtA[i] = 0x32 { @@ -2024,6 +2238,40 @@ func (m *Vote) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *VoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.AppDataToSign) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.AppDataSelfAuthenticating) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *VoteExtensionToSign) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.AppDataToSign) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -2069,6 +2317,10 @@ func (m *CommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -3364,6 +3616,244 @@ func (m *Vote) Unmarshal(dAtA []byte) error { m.Signature = []byte{} } iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteExtension == nil { + m.VoteExtension = &VoteExtension{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *VoteExtension) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: VoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: VoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataToSign", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataToSign = append(m.AppDataToSign[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataToSign == nil { + m.AppDataToSign = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataSelfAuthenticating", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataSelfAuthenticating = append(m.AppDataSelfAuthenticating[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataSelfAuthenticating == nil { + m.AppDataSelfAuthenticating = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *VoteExtensionToSign) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: VoteExtensionToSign: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: VoteExtensionToSign: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataToSign", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataToSign = append(m.AppDataToSign[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataToSign == nil { + m.AppDataToSign = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -3689,6 +4179,42 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { m.Signature = []byte{} } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteExtension == nil { + m.VoteExtension = &VoteExtensionToSign{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/types/block.go b/types/block.go index d674bd6b4..0caa80195 100644 --- a/types/block.go +++ b/types/block.go @@ -602,19 +602,21 @@ const ( // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIDFlag BlockIDFlag `json:"block_id_flag"` - ValidatorAddress Address `json:"validator_address"` - Timestamp time.Time `json:"timestamp"` - Signature []byte `json:"signature"` + BlockIDFlag BlockIDFlag `json:"block_id_flag"` + ValidatorAddress Address `json:"validator_address"` + Timestamp time.Time `json:"timestamp"` + Signature []byte `json:"signature"` + VoteExtension VoteExtensionToSign `json:"vote_extension"` } // NewCommitSigForBlock returns new CommitSig with BlockIDFlagCommit. -func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time) CommitSig { +func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time, ext VoteExtensionToSign) CommitSig { return CommitSig{ BlockIDFlag: BlockIDFlagCommit, ValidatorAddress: valAddr, Timestamp: ts, Signature: signature, + VoteExtension: ext, } } @@ -647,12 +649,14 @@ func (cs CommitSig) Absent() bool { // 1. first 6 bytes of signature // 2. first 6 bytes of validator address // 3. block ID flag -// 4. timestamp +// 4. first 6 bytes of the vote extension +// 5. timestamp func (cs CommitSig) String() string { - return fmt.Sprintf("CommitSig{%X by %X on %v @ %s}", + return fmt.Sprintf("CommitSig{%X by %X on %v with %X @ %s}", tmbytes.Fingerprint(cs.Signature), tmbytes.Fingerprint(cs.ValidatorAddress), cs.BlockIDFlag, + tmbytes.Fingerprint(cs.VoteExtension.BytesPacked()), CanonicalTime(cs.Timestamp)) } @@ -801,6 +805,7 @@ func (commit *Commit) GetVote(valIdx int32) *Vote { ValidatorAddress: commitSig.ValidatorAddress, ValidatorIndex: valIdx, Signature: commitSig.Signature, + VoteExtension: commitSig.VoteExtension.ToVoteExtension(), } } diff --git a/types/canonical.go b/types/canonical.go index fc07ab477..2e2063e36 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -51,16 +51,26 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca } } +func GetVoteExtensionToSign(ext *tmproto.VoteExtension) *tmproto.VoteExtensionToSign { + if ext == nil { + return nil + } + return &tmproto.VoteExtensionToSign{ + AppDataToSign: ext.AppDataToSign, + } +} + // CanonicalizeVote transforms the given Vote to a CanonicalVote, which does // not contain ValidatorIndex and ValidatorAddress fields. func CanonicalizeVote(chainID string, vote *tmproto.Vote) tmproto.CanonicalVote { return tmproto.CanonicalVote{ - Type: vote.Type, - Height: vote.Height, // encoded as sfixed64 - Round: int64(vote.Round), // encoded as sfixed64 - BlockID: CanonicalizeBlockID(vote.BlockID), - Timestamp: vote.Timestamp, - ChainID: chainID, + Type: vote.Type, + Height: vote.Height, // encoded as sfixed64 + Round: int64(vote.Round), // encoded as sfixed64 + BlockID: CanonicalizeBlockID(vote.BlockID), + Timestamp: vote.Timestamp, + ChainID: chainID, + VoteExtension: GetVoteExtensionToSign(vote.VoteExtension), } } diff --git a/types/vote.go b/types/vote.go index e5aa32ada..3dd8ad525 100644 --- a/types/vote.go +++ b/types/vote.go @@ -24,6 +24,7 @@ var ( ErrVoteInvalidBlockHash = errors.New("invalid block hash") ErrVoteNonDeterministicSignature = errors.New("non-deterministic signature") ErrVoteNil = errors.New("nil vote") + ErrVoteInvalidExtension = errors.New("invalid vote extension") ) type ErrVoteConflictingVotes struct { @@ -45,6 +46,52 @@ func NewConflictingVoteError(vote1, vote2 *Vote) *ErrVoteConflictingVotes { // Address is hex bytes. type Address = crypto.Address +// VoteExtensionToSign is a subset of VoteExtension +// that is signed by the validators private key +type VoteExtensionToSign struct { + AppDataToSign []byte `json:"app_data_to_sign"` +} + +// BytesPacked returns a bytes-packed representation for +// debugging and human identification. This function should +// not be used for any logical operations. +func (ext VoteExtensionToSign) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataToSign)) + copy(res, ext.AppDataToSign) + return res +} + +// ToVoteExtension constructs a VoteExtension from a VoteExtensionToSign +func (ext VoteExtensionToSign) ToVoteExtension() VoteExtension { + return VoteExtension{ + AppDataToSign: ext.AppDataToSign, + } +} + +// VoteExtension is a set of data provided by the application +// that is additionally included in the vote +type VoteExtension struct { + AppDataToSign []byte `json:"app_data_to_sign"` + AppDataSelfAuthenticating []byte `json:"app_data_self_authenticating"` +} + +// ToSign constructs a VoteExtensionToSign from a VoteExtenstion +func (ext VoteExtension) ToSign() VoteExtensionToSign { + return VoteExtensionToSign{ + AppDataToSign: ext.AppDataToSign, + } +} + +// BytesPacked returns a bytes-packed representation for +// debugging and human identification. This function should +// not be used for any logical operations. +func (ext VoteExtension) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataToSign)+len(ext.AppDataSelfAuthenticating)) + copy(res[:len(ext.AppDataToSign)], ext.AppDataToSign) + copy(res[len(ext.AppDataToSign):], ext.AppDataSelfAuthenticating) + return res +} + // Vote represents a prevote, precommit, or commit vote from validators for // consensus. type Vote struct { @@ -56,6 +103,7 @@ type Vote struct { ValidatorAddress Address `json:"validator_address"` ValidatorIndex int32 `json:"validator_index"` Signature []byte `json:"signature"` + VoteExtension VoteExtension `json:"vote_extension"` } // CommitSig converts the Vote to a CommitSig. @@ -79,6 +127,7 @@ func (vote *Vote) CommitSig() CommitSig { ValidatorAddress: vote.ValidatorAddress, Timestamp: vote.Timestamp, Signature: vote.Signature, + VoteExtension: vote.VoteExtension.ToSign(), } } @@ -102,6 +151,7 @@ func VoteSignBytes(chainID string, vote *tmproto.Vote) []byte { func (vote *Vote) Copy() *Vote { voteCopy := *vote + voteCopy.VoteExtension = vote.VoteExtension.Copy() return &voteCopy } @@ -115,7 +165,8 @@ func (vote *Vote) Copy() *Vote { // 6. type string // 7. first 6 bytes of block hash // 8. first 6 bytes of signature -// 9. timestamp +// 9. first 6 bytes of vote extension +// 10. timestamp func (vote *Vote) String() string { if vote == nil { return nilVoteStr @@ -131,7 +182,7 @@ func (vote *Vote) String() string { panic("Unknown vote type") } - return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X @ %s}", + return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X %X @ %s}", vote.ValidatorIndex, tmbytes.Fingerprint(vote.ValidatorAddress), vote.Height, @@ -140,6 +191,7 @@ func (vote *Vote) String() string { typeString, tmbytes.Fingerprint(vote.BlockID.Hash), tmbytes.Fingerprint(vote.Signature), + tmbytes.Fingerprint(vote.VoteExtension.BytesPacked()), CanonicalTime(vote.Timestamp), ) } @@ -198,9 +250,42 @@ func (vote *Vote) ValidateBasic() error { return fmt.Errorf("signature is too big (max: %d)", MaxSignatureSize) } + // XXX: add length verification for vote extension? + return nil } +func (ext VoteExtension) Copy() VoteExtension { + res := VoteExtension{ + AppDataToSign: make([]byte, len(ext.AppDataToSign)), + AppDataSelfAuthenticating: make([]byte, len(ext.AppDataSelfAuthenticating)), + } + copy(res.AppDataToSign, ext.AppDataToSign) + copy(res.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) + return res +} + +func (ext VoteExtension) IsEmpty() bool { + if len(ext.AppDataToSign) != 0 { + return false + } + if len(ext.AppDataSelfAuthenticating) != 0 { + return false + } + return true +} + +func (ext VoteExtension) ToProto() *tmproto.VoteExtension { + if ext.IsEmpty() { + return nil + } + + return &tmproto.VoteExtension{ + AppDataToSign: ext.AppDataToSign, + AppDataSelfAuthenticating: ext.AppDataSelfAuthenticating, + } +} + // ToProto converts the handwritten type to proto generated type // return type, nil if everything converts safely, otherwise nil, error func (vote *Vote) ToProto() *tmproto.Vote { @@ -217,7 +302,17 @@ func (vote *Vote) ToProto() *tmproto.Vote { ValidatorAddress: vote.ValidatorAddress, ValidatorIndex: vote.ValidatorIndex, Signature: vote.Signature, + VoteExtension: vote.VoteExtension.ToProto(), + } +} + +func VoteExtensionFromProto(pext *tmproto.VoteExtension) VoteExtension { + ext := VoteExtension{} + if pext != nil { + ext.AppDataToSign = pext.AppDataToSign + ext.AppDataSelfAuthenticating = pext.AppDataSelfAuthenticating } + return ext } // FromProto converts a proto generetad type to a handwritten type @@ -241,6 +336,7 @@ func VoteFromProto(pv *tmproto.Vote) (*Vote, error) { vote.ValidatorAddress = pv.ValidatorAddress vote.ValidatorIndex = pv.ValidatorIndex vote.Signature = pv.Signature + vote.VoteExtension = VoteExtensionFromProto(pv.VoteExtension) return vote, vote.ValidateBasic() } diff --git a/types/vote_test.go b/types/vote_test.go index c4102229b..4a852d81f 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -128,6 +128,33 @@ func TestVoteSignBytesTestVectors(t *testing.T) { 0x32, 0xd, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64}, // chainID }, + // containing vote extension + 5: { + "test_chain_id", &Vote{Height: 1, Round: 1, VoteExtension: VoteExtension{ + AppDataToSign: []byte("signed"), + AppDataSelfAuthenticating: []byte("auth"), + }}, + []byte{ + 0x38, // length + 0x11, // (field_number << 3) | wire_type + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // height + 0x19, // (field_number << 3) | wire_type + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // round + // remaning fields: + 0x2a, // (field_number << 3) | wire_type + 0xb, 0x8, 0x80, 0x92, 0xb8, 0xc3, 0x98, 0xfe, 0xff, 0xff, 0xff, 0x1, // timestamp + // (field_number << 3) | wire_type + 0x32, + 0xd, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, // chainID + // (field_number << 3) | wire_type + 0x3a, + 0x8, // length + 0xa, // (field_number << 3) | wire_type + 0x6, // length + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, // AppDataSigned + // SelfAuthenticating data is excluded on signing + }, // chainID + }, } for i, tc := range tests { v := tc.vote.ToProto() @@ -226,13 +253,13 @@ func TestVoteVerify(t *testing.T) { func TestVoteString(t *testing.T) { str := examplePrecommit(t).String() - expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` + expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str) } str2 := examplePrevote(t).String() - expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` + expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str2 != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str2) }