diff --git a/abci/client/client.go b/abci/client/client.go index b6d34e4229..0a0a176404 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -46,6 +46,7 @@ type Client interface { OfferSnapshotAsync(context.Context, types.RequestOfferSnapshot) (*ReqRes, error) LoadSnapshotChunkAsync(context.Context, types.RequestLoadSnapshotChunk) (*ReqRes, error) ApplySnapshotChunkAsync(context.Context, types.RequestApplySnapshotChunk) (*ReqRes, error) + PreprocessTxsAsync(context.Context, types.RequestPreprocessTxs) (*ReqRes, error) // Synchronous requests FlushSync(context.Context) error @@ -62,6 +63,7 @@ type Client interface { OfferSnapshotSync(context.Context, types.RequestOfferSnapshot) (*types.ResponseOfferSnapshot, error) LoadSnapshotChunkSync(context.Context, types.RequestLoadSnapshotChunk) (*types.ResponseLoadSnapshotChunk, error) ApplySnapshotChunkSync(context.Context, types.RequestApplySnapshotChunk) (*types.ResponseApplySnapshotChunk, error) + PreprocessTxsSync(context.Context, types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) } //---------------------------------------- diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 31bd6fae1f..c6746aaee6 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -314,6 +314,15 @@ func (cli *grpcClient) ApplySnapshotChunkAsync( ) } +func (cli *grpcClient) PreprocessTxsAsync(ctx context.Context, params types.RequestPreprocessTxs) (*ReqRes, error) { + req := types.ToRequestPreprocessTxs(params) + res, err := cli.client.PreprocessTxs(context.Background(), req.GetPreprocessTxs(), grpc.WaitForReady(true)) + if err != nil { + cli.StopForError(err) + } + return cli.finishAsyncCall(ctx, req, &types.Response{Value: &types.Response_PreprocessTxs{PreprocessTxs: res}}) +} + // finishAsyncCall creates a ReqRes for an async call, and immediately populates it // with the response. We don't complete it until it's been ordered via the channel. func (cli *grpcClient) finishAsyncCall(ctx context.Context, req *types.Request, res *types.Response) (*ReqRes, error) { @@ -504,3 +513,15 @@ func (cli *grpcClient) ApplySnapshotChunkSync( } return cli.finishSyncCall(reqres).GetApplySnapshotChunk(), cli.Error() } + +func (cli *grpcClient) PreprocessTxsSync( + ctx context.Context, + params types.RequestPreprocessTxs, +) (*types.ResponsePreprocessTxs, error) { + + reqres, err := cli.PreprocessTxsAsync(ctx, params) + if err != nil { + return nil, err + } + return reqres.Response.GetPreprocessTxs(), cli.Error() +} diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 69457b5b0b..f02af13457 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -204,6 +204,17 @@ func (app *localClient) ApplySnapshotChunkAsync( ), nil } +func (app *localClient) PreprocessTxsAsync(ctx context.Context, req types.RequestPreprocessTxs) (*ReqRes, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.PreprocessTxs(req) + return app.callback( + types.ToRequestPreprocessTxs(req), + types.ToResponsePreprocessTx(res), + ), nil +} + //------------------------------------------------------- func (app *localClient) FlushSync(ctx context.Context) error { @@ -346,6 +357,17 @@ func (app *localClient) ApplySnapshotChunkSync( return &res, nil } +func (app *localClient) PreprocessTxsSync( + ctx context.Context, + req types.RequestPreprocessTxs, +) (*types.ResponsePreprocessTxs, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.PreprocessTxs(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 6726ce95e6..4bdf5c5f22 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -669,6 +669,52 @@ func (_m *Client) OnStop() { _m.Called() } +// PreprocessTxsAsync provides a mock function with given fields: _a0, _a1 +func (_m *Client) PreprocessTxsAsync(_a0 context.Context, _a1 types.RequestPreprocessTxs) (*abcicli.ReqRes, error) { + ret := _m.Called(_a0, _a1) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(context.Context, types.RequestPreprocessTxs) *abcicli.ReqRes); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestPreprocessTxs) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// PreprocessTxsSync provides a mock function with given fields: _a0, _a1 +func (_m *Client) PreprocessTxsSync(_a0 context.Context, _a1 types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponsePreprocessTxs + if rf, ok := ret.Get(0).(func(context.Context, types.RequestPreprocessTxs) *types.ResponsePreprocessTxs); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponsePreprocessTxs) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestPreprocessTxs) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // QueryAsync provides a mock function with given fields: _a0, _a1 func (_m *Client) QueryAsync(_a0 context.Context, _a1 types.RequestQuery) (*abcicli.ReqRes, error) { ret := _m.Called(_a0, _a1) diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 3fef8540d1..437c5bc873 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -295,6 +295,10 @@ func (cli *socketClient) ApplySnapshotChunkAsync( return cli.queueRequestAsync(ctx, types.ToRequestApplySnapshotChunk(req)) } +func (cli *socketClient) PreprocessTxsAsync(ctx context.Context, req types.RequestPreprocessTxs) (*ReqRes, error) { + return cli.queueRequestAsync(ctx, types.ToRequestPreprocessTxs(req)) +} + //---------------------------------------- func (cli *socketClient) FlushSync(ctx context.Context) error { @@ -465,6 +469,17 @@ func (cli *socketClient) ApplySnapshotChunkSync( return reqres.Response.GetApplySnapshotChunk(), nil } +func (cli *socketClient) PreprocessTxsSync( + ctx context.Context, + req types.RequestPreprocessTxs, +) (*types.ResponsePreprocessTxs, error) { + reqres, err := cli.queueRequestAndFlushSync(ctx, types.ToRequestPreprocessTxs(req)) + if err != nil { + return nil, err + } + return reqres.Response.GetPreprocessTxs(), nil +} + //---------------------------------------- // queueRequest enqueues req onto the queue. If the queue is full, it ether @@ -591,6 +606,8 @@ 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_PreprocessTxs: + _, ok = res.Value.(*types.Response_PreprocessTxs) } return ok } diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 97256c8ac4..9fbaebc8a2 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -171,3 +171,8 @@ func (app *Application) Query(reqQuery types.RequestQuery) (resQuery types.Respo return resQuery } + +func (app *Application) PreprocessTxs( + req types.RequestPreprocessTxs) types.ResponsePreprocessTxs { + return types.ResponsePreprocessTxs{Txs: req.Txs} +} diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 0fcfcadf77..de6b80be65 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -170,6 +170,11 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} } +func (app *PersistentKVStoreApplication) PreprocessTxs( + req types.RequestPreprocessTxs) types.ResponsePreprocessTxs { + return types.ResponsePreprocessTxs{Txs: req.Txs} +} + //--------------------------------------------- // update validators diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 543b444b17..f8ec687828 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -233,6 +233,9 @@ 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_PreprocessTxs: + res := s.app.PreprocessTxs(*r.PreprocessTxs) + responses <- types.ToResponsePreprocessTx(res) default: responses <- types.ToResponseException("Unknown request") } diff --git a/abci/types/application.go b/abci/types/application.go index 2a3cabd8bb..4a46351a2b 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -8,6 +8,7 @@ import ( // to be driven by a blockchain-based replication engine via the ABCI. // All methods take a RequestXxx argument and return a ResponseXxx argument, // except CheckTx/DeliverTx, which take `tx []byte`, and `Commit`, which takes nothing. +// nolint:lll // ignore for interface type Application interface { // Info/Query Connection Info(RequestInfo) ResponseInfo // Return application info @@ -17,11 +18,12 @@ type Application interface { CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool // Consensus Connection - InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore - BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block - 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 + InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore + BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block + 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 + PreprocessTxs(RequestPreprocessTxs) ResponsePreprocessTxs // State machine preprocessing of txs // State Sync Connection ListSnapshots(RequestListSnapshots) ResponseListSnapshots // List available snapshots @@ -90,6 +92,10 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons return ResponseApplySnapshotChunk{} } +func (BaseApplication) PreprocessTxs(req RequestPreprocessTxs) ResponsePreprocessTxs { + return ResponsePreprocessTxs{} +} + //------------------------------------------------------- // GRPCApplication is a GRPC wrapper for Application @@ -172,3 +178,9 @@ func (app *GRPCApplication) ApplySnapshotChunk( res := app.app.ApplySnapshotChunk(*req) return &res, nil } + +func (app *GRPCApplication) PreprocessTxs( + ctx context.Context, req *RequestPreprocessTxs) (*ResponsePreprocessTxs, error) { + res := app.app.PreprocessTxs(*req) + return &res, nil +} diff --git a/abci/types/messages.go b/abci/types/messages.go index 74f3cc75c8..7a7aa337c8 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -110,6 +110,12 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request { } } +func ToRequestPreprocessTxs(res RequestPreprocessTxs) *Request { + return &Request{ + Value: &Request_PreprocessTxs{&res}, + } +} + //---------------------------------------- func ToResponseException(errStr string) *Response { @@ -200,3 +206,9 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response { Value: &Response_ApplySnapshotChunk{&res}, } } + +func ToResponsePreprocessTx(res ResponsePreprocessTxs) *Response { + return &Response{ + Value: &Response_PreprocessTxs{&res}, + } +} diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 6b00c587a1..f8f36e2fdc 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{28, 0} + return fileDescriptor_252557cfdd89a31a, []int{29, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30, 0} + return fileDescriptor_252557cfdd89a31a, []int{31, 0} } type Request struct { @@ -176,6 +176,7 @@ type Request struct { // *Request_OfferSnapshot // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk + // *Request_PreprocessTxs Value isRequest_Value `protobuf_oneof:"value"` } @@ -260,6 +261,9 @@ type Request_LoadSnapshotChunk struct { type Request_ApplySnapshotChunk struct { ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,14,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } +type Request_PreprocessTxs struct { + PreprocessTxs *RequestPreprocessTxs `protobuf:"bytes,15,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +} func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} @@ -275,6 +279,7 @@ func (*Request_ListSnapshots) isRequest_Value() {} func (*Request_OfferSnapshot) isRequest_Value() {} func (*Request_LoadSnapshotChunk) isRequest_Value() {} func (*Request_ApplySnapshotChunk) isRequest_Value() {} +func (*Request_PreprocessTxs) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -381,6 +386,13 @@ func (m *Request) GetApplySnapshotChunk() *RequestApplySnapshotChunk { return nil } +func (m *Request) GetPreprocessTxs() *RequestPreprocessTxs { + if x, ok := m.GetValue().(*Request_PreprocessTxs); ok { + return x.PreprocessTxs + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -398,6 +410,7 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_OfferSnapshot)(nil), (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), + (*Request_PreprocessTxs)(nil), } } @@ -1157,6 +1170,50 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } +type RequestPreprocessTxs struct { + Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` +} + +func (m *RequestPreprocessTxs) Reset() { *m = RequestPreprocessTxs{} } +func (m *RequestPreprocessTxs) String() string { return proto.CompactTextString(m) } +func (*RequestPreprocessTxs) ProtoMessage() {} +func (*RequestPreprocessTxs) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{15} +} +func (m *RequestPreprocessTxs) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestPreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestPreprocessTxs.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 *RequestPreprocessTxs) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestPreprocessTxs.Merge(m, src) +} +func (m *RequestPreprocessTxs) XXX_Size() int { + return m.Size() +} +func (m *RequestPreprocessTxs) XXX_DiscardUnknown() { + xxx_messageInfo_RequestPreprocessTxs.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestPreprocessTxs proto.InternalMessageInfo + +func (m *RequestPreprocessTxs) GetTxs() [][]byte { + if m != nil { + return m.Txs + } + return nil +} + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -1174,6 +1231,7 @@ type Response struct { // *Response_OfferSnapshot // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk + // *Response_PreprocessTxs Value isResponse_Value `protobuf_oneof:"value"` } @@ -1181,7 +1239,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{15} + return fileDescriptor_252557cfdd89a31a, []int{16} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1261,6 +1319,9 @@ type Response_LoadSnapshotChunk struct { type Response_ApplySnapshotChunk struct { ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } +type Response_PreprocessTxs struct { + PreprocessTxs *ResponsePreprocessTxs `protobuf:"bytes,16,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +} func (*Response_Exception) isResponse_Value() {} func (*Response_Echo) isResponse_Value() {} @@ -1277,6 +1338,7 @@ func (*Response_ListSnapshots) isResponse_Value() {} func (*Response_OfferSnapshot) isResponse_Value() {} func (*Response_LoadSnapshotChunk) isResponse_Value() {} func (*Response_ApplySnapshotChunk) isResponse_Value() {} +func (*Response_PreprocessTxs) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1390,6 +1452,13 @@ func (m *Response) GetApplySnapshotChunk() *ResponseApplySnapshotChunk { return nil } +func (m *Response) GetPreprocessTxs() *ResponsePreprocessTxs { + if x, ok := m.GetValue().(*Response_PreprocessTxs); ok { + return x.PreprocessTxs + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1408,6 +1477,7 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_OfferSnapshot)(nil), (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), + (*Response_PreprocessTxs)(nil), } } @@ -1420,7 +1490,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{16} + return fileDescriptor_252557cfdd89a31a, []int{17} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1464,7 +1534,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{17} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1507,7 +1577,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{18} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1549,7 +1619,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{19} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1623,7 +1693,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{20} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1690,7 +1760,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{21} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1790,7 +1860,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{22} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1846,7 +1916,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{23} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1967,7 +2037,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{24} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2062,7 +2132,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{25} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2122,7 +2192,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{26} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2173,7 +2243,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{27} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2217,7 +2287,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{28} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2261,7 +2331,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{29} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2307,7 +2377,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{30} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2357,6 +2427,58 @@ func (m *ResponseApplySnapshotChunk) GetRejectSenders() []string { return nil } +type ResponsePreprocessTxs struct { + Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` + Messages *types1.Messages `protobuf:"bytes,2,opt,name=messages,proto3" json:"messages,omitempty"` +} + +func (m *ResponsePreprocessTxs) Reset() { *m = ResponsePreprocessTxs{} } +func (m *ResponsePreprocessTxs) String() string { return proto.CompactTextString(m) } +func (*ResponsePreprocessTxs) ProtoMessage() {} +func (*ResponsePreprocessTxs) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{32} +} +func (m *ResponsePreprocessTxs) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponsePreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponsePreprocessTxs.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 *ResponsePreprocessTxs) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponsePreprocessTxs.Merge(m, src) +} +func (m *ResponsePreprocessTxs) XXX_Size() int { + return m.Size() +} +func (m *ResponsePreprocessTxs) XXX_DiscardUnknown() { + xxx_messageInfo_ResponsePreprocessTxs.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponsePreprocessTxs proto.InternalMessageInfo + +func (m *ResponsePreprocessTxs) GetTxs() [][]byte { + if m != nil { + return m.Txs + } + return nil +} + +func (m *ResponsePreprocessTxs) GetMessages() *types1.Messages { + if m != nil { + return m.Messages + } + return nil +} + 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"` @@ -2366,7 +2488,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{31} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2421,7 +2543,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{32} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2475,7 +2597,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{33} + return fileDescriptor_252557cfdd89a31a, []int{35} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2539,7 +2661,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{34} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2607,7 +2729,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{35} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2660,7 +2782,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{36} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2713,7 +2835,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{37} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2774,7 +2896,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{38} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2850,7 +2972,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{39} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2934,6 +3056,7 @@ func init() { proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.RequestOfferSnapshot") proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") + proto.RegisterType((*RequestPreprocessTxs)(nil), "tendermint.abci.RequestPreprocessTxs") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") @@ -2950,6 +3073,7 @@ func init() { proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.ResponseOfferSnapshot") proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ResponsePreprocessTxs)(nil), "tendermint.abci.ResponsePreprocessTxs") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") @@ -2964,172 +3088,177 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2627 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0xdb, 0xc6, - 0x15, 0xe7, 0x37, 0x89, 0x47, 0x91, 0xa2, 0xd6, 0x8a, 0x43, 0x33, 0xb6, 0xe4, 0xc0, 0xe3, 0x34, - 0x76, 0x12, 0xa9, 0x91, 0xc7, 0xae, 0x33, 0xe9, 0x47, 0x44, 0x9a, 0x2e, 0x15, 0xab, 0x92, 0xba, - 0xa2, 0x9d, 0x49, 0xdb, 0x18, 0x01, 0x89, 0x15, 0x89, 0x98, 0x04, 0x10, 0x60, 0x29, 0x4b, 0x39, - 0x76, 0xda, 0x8b, 0xa7, 0x07, 0x1f, 0x7b, 0xc9, 0x4c, 0xff, 0x83, 0x5e, 0x7b, 0xea, 0xa9, 0x87, - 0x1c, 0xda, 0x99, 0x1c, 0x7b, 0xe8, 0xa4, 0x1d, 0xfb, 0xd6, 0x7f, 0xa0, 0xa7, 0xce, 0x74, 0xf6, - 0x03, 0x20, 0x40, 0x12, 0x22, 0xd5, 0xf4, 0xd6, 0xdb, 0xee, 0xc3, 0x7b, 0x8f, 0xbb, 0x6f, 0xf7, - 0xfd, 0xf6, 0xb7, 0x6f, 0x09, 0xaf, 0x51, 0x62, 0x19, 0xc4, 0x1d, 0x9a, 0x16, 0xdd, 0xd4, 0x3b, - 0x5d, 0x73, 0x93, 0x9e, 0x3a, 0xc4, 0xdb, 0x70, 0x5c, 0x9b, 0xda, 0x68, 0x79, 0xfc, 0x71, 0x83, - 0x7d, 0xac, 0x5d, 0x09, 0x69, 0x77, 0xdd, 0x53, 0x87, 0xda, 0x9b, 0x8e, 0x6b, 0xdb, 0x47, 0x42, - 0xbf, 0x76, 0x39, 0xf4, 0x99, 0xfb, 0x09, 0x7b, 0x8b, 0x7c, 0x95, 0xc6, 0x4f, 0xc8, 0xa9, 0xff, - 0xf5, 0xca, 0x94, 0xad, 0xa3, 0xbb, 0xfa, 0xd0, 0xff, 0xbc, 0xde, 0xb3, 0xed, 0xde, 0x80, 0x6c, - 0xf2, 0x5e, 0x67, 0x74, 0xb4, 0x49, 0xcd, 0x21, 0xf1, 0xa8, 0x3e, 0x74, 0xa4, 0xc2, 0x6a, 0xcf, - 0xee, 0xd9, 0xbc, 0xb9, 0xc9, 0x5a, 0x42, 0xaa, 0xfe, 0x25, 0x0f, 0x79, 0x4c, 0x3e, 0x1f, 0x11, - 0x8f, 0xa2, 0x2d, 0xc8, 0x90, 0x6e, 0xdf, 0xae, 0x26, 0xaf, 0x26, 0xdf, 0x2c, 0x6e, 0x5d, 0xde, - 0x98, 0x98, 0xdc, 0x86, 0xd4, 0x6b, 0x76, 0xfb, 0x76, 0x2b, 0x81, 0xb9, 0x2e, 0xba, 0x0d, 0xd9, - 0xa3, 0xc1, 0xc8, 0xeb, 0x57, 0x53, 0xdc, 0xe8, 0x4a, 0x9c, 0xd1, 0x7d, 0xa6, 0xd4, 0x4a, 0x60, - 0xa1, 0xcd, 0x7e, 0xca, 0xb4, 0x8e, 0xec, 0x6a, 0xfa, 0xec, 0x9f, 0xda, 0xb1, 0x8e, 0xf8, 0x4f, - 0x31, 0x5d, 0x54, 0x07, 0x30, 0x2d, 0x93, 0x6a, 0xdd, 0xbe, 0x6e, 0x5a, 0xd5, 0x0c, 0xb7, 0x7c, - 0x3d, 0xde, 0xd2, 0xa4, 0x0d, 0xa6, 0xd8, 0x4a, 0x60, 0xc5, 0xf4, 0x3b, 0x6c, 0xb8, 0x9f, 0x8f, - 0x88, 0x7b, 0x5a, 0xcd, 0x9e, 0x3d, 0xdc, 0x9f, 0x32, 0x25, 0x36, 0x5c, 0xae, 0x8d, 0x9a, 0x50, - 0xec, 0x90, 0x9e, 0x69, 0x69, 0x9d, 0x81, 0xdd, 0x7d, 0x52, 0xcd, 0x71, 0x63, 0x35, 0xce, 0xb8, - 0xce, 0x54, 0xeb, 0x4c, 0xb3, 0x95, 0xc0, 0xd0, 0x09, 0x7a, 0xe8, 0xfb, 0x50, 0xe8, 0xf6, 0x49, - 0xf7, 0x89, 0x46, 0x4f, 0xaa, 0x79, 0xee, 0x63, 0x3d, 0xce, 0x47, 0x83, 0xe9, 0xb5, 0x4f, 0x5a, - 0x09, 0x9c, 0xef, 0x8a, 0x26, 0x9b, 0xbf, 0x41, 0x06, 0xe6, 0x31, 0x71, 0x99, 0x7d, 0xe1, 0xec, - 0xf9, 0xdf, 0x13, 0x9a, 0xdc, 0x83, 0x62, 0xf8, 0x1d, 0xf4, 0x23, 0x50, 0x88, 0x65, 0xc8, 0x69, - 0x28, 0xdc, 0xc5, 0xd5, 0xd8, 0x75, 0xb6, 0x0c, 0x7f, 0x12, 0x05, 0x22, 0xdb, 0xe8, 0x2e, 0xe4, - 0xba, 0xf6, 0x70, 0x68, 0xd2, 0x2a, 0x70, 0xeb, 0xb5, 0xd8, 0x09, 0x70, 0xad, 0x56, 0x02, 0x4b, - 0x7d, 0xb4, 0x07, 0xe5, 0x81, 0xe9, 0x51, 0xcd, 0xb3, 0x74, 0xc7, 0xeb, 0xdb, 0xd4, 0xab, 0x16, - 0xb9, 0x87, 0xeb, 0x71, 0x1e, 0x76, 0x4d, 0x8f, 0x1e, 0xfa, 0xca, 0xad, 0x04, 0x2e, 0x0d, 0xc2, - 0x02, 0xe6, 0xcf, 0x3e, 0x3a, 0x22, 0x6e, 0xe0, 0xb0, 0xba, 0x74, 0xb6, 0xbf, 0x7d, 0xa6, 0xed, - 0xdb, 0x33, 0x7f, 0x76, 0x58, 0x80, 0x7e, 0x0e, 0x17, 0x06, 0xb6, 0x6e, 0x04, 0xee, 0xb4, 0x6e, - 0x7f, 0x64, 0x3d, 0xa9, 0x96, 0xb8, 0xd3, 0x1b, 0xb1, 0x83, 0xb4, 0x75, 0xc3, 0x77, 0xd1, 0x60, - 0x06, 0xad, 0x04, 0x5e, 0x19, 0x4c, 0x0a, 0xd1, 0x63, 0x58, 0xd5, 0x1d, 0x67, 0x70, 0x3a, 0xe9, - 0xbd, 0xcc, 0xbd, 0xdf, 0x8c, 0xf3, 0xbe, 0xcd, 0x6c, 0x26, 0xdd, 0x23, 0x7d, 0x4a, 0x5a, 0xcf, - 0x43, 0xf6, 0x58, 0x1f, 0x8c, 0x88, 0xfa, 0x1d, 0x28, 0x86, 0xd2, 0x14, 0x55, 0x21, 0x3f, 0x24, - 0x9e, 0xa7, 0xf7, 0x08, 0xcf, 0x6a, 0x05, 0xfb, 0x5d, 0xb5, 0x0c, 0x4b, 0xe1, 0xd4, 0x54, 0x9f, - 0x27, 0x03, 0x4b, 0x96, 0x75, 0xcc, 0xf2, 0x98, 0xb8, 0x9e, 0x69, 0x5b, 0xbe, 0xa5, 0xec, 0xa2, - 0x6b, 0x50, 0xe2, 0xfb, 0x47, 0xf3, 0xbf, 0xb3, 0xd4, 0xcf, 0xe0, 0x25, 0x2e, 0x7c, 0x24, 0x95, - 0xd6, 0xa1, 0xe8, 0x6c, 0x39, 0x81, 0x4a, 0x9a, 0xab, 0x80, 0xb3, 0xe5, 0xf8, 0x0a, 0xaf, 0xc3, - 0x12, 0x9b, 0x69, 0xa0, 0x91, 0xe1, 0x3f, 0x52, 0x64, 0x32, 0xa9, 0xa2, 0xfe, 0x39, 0x05, 0x95, - 0xc9, 0x74, 0x46, 0x77, 0x21, 0xc3, 0x90, 0x4d, 0x82, 0x54, 0x6d, 0x43, 0xc0, 0xde, 0x86, 0x0f, - 0x7b, 0x1b, 0x6d, 0x1f, 0xf6, 0xea, 0x85, 0xaf, 0xbe, 0x59, 0x4f, 0x3c, 0xff, 0xfb, 0x7a, 0x12, - 0x73, 0x0b, 0x74, 0x89, 0x65, 0x9f, 0x6e, 0x5a, 0x9a, 0x69, 0xf0, 0x21, 0x2b, 0x2c, 0xb5, 0x74, - 0xd3, 0xda, 0x31, 0xd0, 0x2e, 0x54, 0xba, 0xb6, 0xe5, 0x11, 0xcb, 0x1b, 0x79, 0x9a, 0x80, 0x55, - 0x09, 0x4d, 0x91, 0x04, 0x13, 0x60, 0xdd, 0xf0, 0x35, 0x0f, 0xb8, 0x22, 0x5e, 0xee, 0x46, 0x05, - 0xe8, 0x3e, 0xc0, 0xb1, 0x3e, 0x30, 0x0d, 0x9d, 0xda, 0xae, 0x57, 0xcd, 0x5c, 0x4d, 0xcf, 0xcc, - 0xb2, 0x47, 0xbe, 0xca, 0x43, 0xc7, 0xd0, 0x29, 0xa9, 0x67, 0xd8, 0x70, 0x71, 0xc8, 0x12, 0xbd, - 0x01, 0xcb, 0xba, 0xe3, 0x68, 0x1e, 0xd5, 0x29, 0xd1, 0x3a, 0xa7, 0x94, 0x78, 0x1c, 0xb6, 0x96, - 0x70, 0x49, 0x77, 0x9c, 0x43, 0x26, 0xad, 0x33, 0x21, 0xba, 0x0e, 0x65, 0x86, 0x70, 0xa6, 0x3e, - 0xd0, 0xfa, 0xc4, 0xec, 0xf5, 0x29, 0x07, 0xa8, 0x34, 0x2e, 0x49, 0x69, 0x8b, 0x0b, 0x55, 0x23, - 0x58, 0x71, 0x8e, 0x6e, 0x08, 0x41, 0xc6, 0xd0, 0xa9, 0xce, 0x23, 0xb9, 0x84, 0x79, 0x9b, 0xc9, - 0x1c, 0x9d, 0xf6, 0x65, 0x7c, 0x78, 0x1b, 0x5d, 0x84, 0x9c, 0x74, 0x9b, 0xe6, 0x6e, 0x65, 0x0f, - 0xad, 0x42, 0xd6, 0x71, 0xed, 0x63, 0xc2, 0x97, 0xae, 0x80, 0x45, 0x47, 0xfd, 0x55, 0x0a, 0x56, - 0xa6, 0x70, 0x90, 0xf9, 0xed, 0xeb, 0x5e, 0xdf, 0xff, 0x2d, 0xd6, 0x46, 0x77, 0x98, 0x5f, 0xdd, - 0x20, 0xae, 0x3c, 0x3b, 0xaa, 0xd3, 0xa1, 0x6e, 0xf1, 0xef, 0x32, 0x34, 0x52, 0x1b, 0xed, 0x43, - 0x65, 0xa0, 0x7b, 0x54, 0x13, 0xb8, 0xa2, 0x85, 0xce, 0x91, 0x69, 0x34, 0xdd, 0xd5, 0x7d, 0x24, - 0x62, 0x9b, 0x5a, 0x3a, 0x2a, 0x0f, 0x22, 0x52, 0x84, 0x61, 0xb5, 0x73, 0xfa, 0x85, 0x6e, 0x51, - 0xd3, 0x22, 0xda, 0xd4, 0xca, 0x5d, 0x9a, 0x72, 0xda, 0x3c, 0x36, 0x0d, 0x62, 0x75, 0xfd, 0x25, - 0xbb, 0x10, 0x18, 0x07, 0x4b, 0xea, 0xa9, 0x18, 0xca, 0x51, 0x24, 0x47, 0x65, 0x48, 0xd1, 0x13, - 0x19, 0x80, 0x14, 0x3d, 0x41, 0xdf, 0x85, 0x0c, 0x9b, 0x24, 0x9f, 0x7c, 0x79, 0xc6, 0x11, 0x28, - 0xed, 0xda, 0xa7, 0x0e, 0xc1, 0x5c, 0x53, 0x55, 0x83, 0x74, 0x08, 0xd0, 0x7d, 0xd2, 0xab, 0x7a, - 0x03, 0x96, 0x27, 0xe0, 0x3b, 0xb4, 0x7e, 0xc9, 0xf0, 0xfa, 0xa9, 0xcb, 0x50, 0x8a, 0x60, 0xb5, - 0x7a, 0x11, 0x56, 0x67, 0x41, 0xaf, 0xda, 0x0f, 0xe4, 0x11, 0x08, 0x45, 0xb7, 0xa1, 0x10, 0x60, - 0xaf, 0x48, 0xc7, 0xe9, 0x58, 0xf9, 0xca, 0x38, 0x50, 0x65, 0x79, 0xc8, 0xb6, 0x35, 0xdf, 0x0f, - 0x29, 0x3e, 0xf0, 0xbc, 0xee, 0x38, 0x2d, 0xdd, 0xeb, 0xab, 0x9f, 0x42, 0x35, 0x0e, 0x57, 0x27, - 0xa6, 0x91, 0x09, 0xb6, 0xe1, 0x45, 0xc8, 0x1d, 0xd9, 0xee, 0x50, 0xa7, 0xdc, 0x59, 0x09, 0xcb, - 0x1e, 0xdb, 0x9e, 0x02, 0x63, 0xd3, 0x5c, 0x2c, 0x3a, 0xaa, 0x06, 0x97, 0x62, 0xb1, 0x95, 0x99, - 0x98, 0x96, 0x41, 0x44, 0x3c, 0x4b, 0x58, 0x74, 0xc6, 0x8e, 0xc4, 0x60, 0x45, 0x87, 0xfd, 0xac, - 0xc7, 0xe7, 0xca, 0xfd, 0x2b, 0x58, 0xf6, 0xd4, 0xdf, 0x15, 0xa0, 0x80, 0x89, 0xe7, 0x30, 0x4c, - 0x40, 0x75, 0x50, 0xc8, 0x49, 0x97, 0x38, 0xd4, 0x87, 0xd1, 0xd9, 0xac, 0x41, 0x68, 0x37, 0x7d, - 0x4d, 0x76, 0x64, 0x07, 0x66, 0xe8, 0x96, 0x64, 0x65, 0xf1, 0x04, 0x4b, 0x9a, 0x87, 0x69, 0xd9, - 0x1d, 0x9f, 0x96, 0xa5, 0x63, 0x4f, 0x69, 0x61, 0x35, 0xc1, 0xcb, 0x6e, 0x49, 0x5e, 0x96, 0x99, - 0xf3, 0x63, 0x11, 0x62, 0xd6, 0x88, 0x10, 0xb3, 0xec, 0x9c, 0x69, 0xc6, 0x30, 0xb3, 0x3b, 0x3e, - 0x33, 0xcb, 0xcd, 0x19, 0xf1, 0x04, 0x35, 0xbb, 0x1f, 0xa5, 0x66, 0x82, 0x56, 0x5d, 0x8b, 0xb5, - 0x8e, 0xe5, 0x66, 0x3f, 0x08, 0x71, 0xb3, 0x42, 0x2c, 0x31, 0x12, 0x4e, 0x66, 0x90, 0xb3, 0x46, - 0x84, 0x9c, 0x29, 0x73, 0x62, 0x10, 0xc3, 0xce, 0x3e, 0x08, 0xb3, 0x33, 0x88, 0x25, 0x78, 0x72, - 0xbd, 0x67, 0xd1, 0xb3, 0xf7, 0x02, 0x7a, 0x56, 0x8c, 0xe5, 0x97, 0x72, 0x0e, 0x93, 0xfc, 0x6c, - 0x7f, 0x8a, 0x9f, 0x09, 0x3e, 0xf5, 0x46, 0xac, 0x8b, 0x39, 0x04, 0x6d, 0x7f, 0x8a, 0xa0, 0x95, - 0xe6, 0x38, 0x9c, 0xc3, 0xd0, 0x7e, 0x31, 0x9b, 0xa1, 0xc5, 0x73, 0x28, 0x39, 0xcc, 0xc5, 0x28, - 0x9a, 0x16, 0x43, 0xd1, 0x96, 0xb9, 0xfb, 0xb7, 0x62, 0xdd, 0x9f, 0x9f, 0xa3, 0xdd, 0x60, 0x27, - 0xe4, 0x44, 0xce, 0x33, 0x94, 0x21, 0xae, 0x6b, 0xbb, 0x92, 0x6d, 0x89, 0x8e, 0xfa, 0x26, 0x3b, - 0xb3, 0xc7, 0xf9, 0x7d, 0x06, 0x9f, 0xe3, 0x68, 0x1e, 0xca, 0x69, 0xf5, 0x0f, 0xc9, 0xb1, 0x2d, - 0x3f, 0xe6, 0xc2, 0xe7, 0xbd, 0x22, 0xcf, 0xfb, 0x10, 0xcb, 0x4b, 0x45, 0x59, 0xde, 0x3a, 0x14, - 0x19, 0x4a, 0x4f, 0x10, 0x38, 0xdd, 0x09, 0x08, 0xdc, 0x4d, 0x58, 0xe1, 0xc7, 0xb0, 0xe0, 0x82, - 0x12, 0x9a, 0x33, 0xfc, 0x84, 0x59, 0x66, 0x1f, 0xc4, 0xe6, 0x14, 0x18, 0xfd, 0x0e, 0x5c, 0x08, - 0xe9, 0x06, 0xe8, 0x2f, 0xd8, 0x4c, 0x25, 0xd0, 0xde, 0x96, 0xc7, 0xc0, 0x9f, 0x92, 0xe3, 0x08, - 0x8d, 0x99, 0xdf, 0x2c, 0x92, 0x96, 0xfc, 0x1f, 0x91, 0xb4, 0xd4, 0x7f, 0x4d, 0xd2, 0xc2, 0xa7, - 0x59, 0x3a, 0x7a, 0x9a, 0xfd, 0x2b, 0x39, 0x5e, 0x93, 0x80, 0x72, 0x75, 0x6d, 0x83, 0xc8, 0xf3, - 0x85, 0xb7, 0x51, 0x05, 0xd2, 0x03, 0xbb, 0x27, 0x4f, 0x11, 0xd6, 0x64, 0x5a, 0x01, 0x08, 0x2b, - 0x12, 0x63, 0x83, 0xa3, 0x29, 0xcb, 0x23, 0x2c, 0x8f, 0xa6, 0x0a, 0xa4, 0x9f, 0x10, 0x01, 0x99, - 0x4b, 0x98, 0x35, 0x99, 0x1e, 0xdf, 0x64, 0x1c, 0x08, 0x97, 0xb0, 0xe8, 0xa0, 0xbb, 0xa0, 0xf0, - 0x32, 0x84, 0x66, 0x3b, 0x9e, 0x44, 0xb7, 0xd7, 0xc2, 0x73, 0x15, 0xd5, 0x86, 0x8d, 0x03, 0xa6, - 0xb3, 0xef, 0x78, 0xb8, 0xe0, 0xc8, 0x56, 0xe8, 0xd4, 0x55, 0x22, 0xe4, 0xef, 0x32, 0x28, 0x6c, - 0xf4, 0x9e, 0xa3, 0x77, 0x09, 0x87, 0x2a, 0x05, 0x8f, 0x05, 0xea, 0x63, 0x40, 0xd3, 0x80, 0x8b, - 0x5a, 0x90, 0x23, 0xc7, 0xc4, 0xa2, 0x6c, 0xd9, 0x58, 0xb8, 0x2f, 0xce, 0x60, 0x56, 0xc4, 0xa2, - 0xf5, 0x2a, 0x0b, 0xf2, 0x3f, 0xbf, 0x59, 0xaf, 0x08, 0xed, 0xb7, 0xed, 0xa1, 0x49, 0xc9, 0xd0, - 0xa1, 0xa7, 0x58, 0xda, 0xab, 0x7f, 0x4b, 0x31, 0x9a, 0x13, 0x01, 0xe3, 0x99, 0xb1, 0xf5, 0xb7, - 0x7c, 0x2a, 0x44, 0x71, 0x17, 0x8b, 0xf7, 0x1a, 0x40, 0x4f, 0xf7, 0xb4, 0xa7, 0xba, 0x45, 0x89, - 0x21, 0x83, 0x1e, 0x92, 0xa0, 0x1a, 0x14, 0x58, 0x6f, 0xe4, 0x11, 0x43, 0xb2, 0xed, 0xa0, 0x1f, - 0x9a, 0x67, 0xfe, 0xdb, 0xcd, 0x33, 0x1a, 0xe5, 0xc2, 0x44, 0x94, 0x43, 0x14, 0x44, 0x09, 0x53, - 0x10, 0x36, 0x36, 0xc7, 0x35, 0x6d, 0xd7, 0xa4, 0xa7, 0x7c, 0x69, 0xd2, 0x38, 0xe8, 0xb3, 0xcb, - 0xdb, 0x90, 0x0c, 0x1d, 0xdb, 0x1e, 0x68, 0x02, 0x6e, 0x8a, 0xdc, 0x74, 0x49, 0x0a, 0x9b, 0x1c, - 0x75, 0x7e, 0x9d, 0x1a, 0xe7, 0xdf, 0x98, 0x6a, 0xfe, 0xdf, 0x05, 0x58, 0xfd, 0x0d, 0xbf, 0x80, - 0x46, 0x8f, 0x5b, 0x74, 0x08, 0x2b, 0x41, 0xfa, 0x6b, 0x23, 0x0e, 0x0b, 0xfe, 0x86, 0x5e, 0x14, - 0x3f, 0x2a, 0xc7, 0x51, 0xb1, 0x87, 0x3e, 0x86, 0x57, 0x27, 0xb0, 0x2d, 0x70, 0x9d, 0x5a, 0x14, - 0xe2, 0x5e, 0x89, 0x42, 0x9c, 0xef, 0x7a, 0x1c, 0xac, 0xf4, 0xb7, 0xcc, 0xba, 0x1d, 0x76, 0xa7, - 0x09, 0xb3, 0x87, 0x99, 0xcb, 0x7f, 0x0d, 0x4a, 0x2e, 0xa1, 0xec, 0x9e, 0x1d, 0xb9, 0x35, 0x2e, - 0x09, 0xa1, 0xbc, 0x8b, 0x1e, 0xc0, 0x2b, 0x33, 0x59, 0x04, 0xfa, 0x1e, 0x28, 0x63, 0x02, 0x92, - 0x8c, 0xb9, 0x80, 0x05, 0x97, 0x8a, 0xb1, 0xae, 0xfa, 0xc7, 0xe4, 0xd8, 0x65, 0xf4, 0x9a, 0xd2, - 0x84, 0x9c, 0x4b, 0xbc, 0xd1, 0x40, 0x5c, 0x1c, 0xca, 0x5b, 0xef, 0x2c, 0xc6, 0x3f, 0x98, 0x74, - 0x34, 0xa0, 0x58, 0x1a, 0xab, 0x8f, 0x21, 0x27, 0x24, 0xa8, 0x08, 0xf9, 0x87, 0x7b, 0x0f, 0xf6, - 0xf6, 0x3f, 0xda, 0xab, 0x24, 0x10, 0x40, 0x6e, 0xbb, 0xd1, 0x68, 0x1e, 0xb4, 0x2b, 0x49, 0xa4, - 0x40, 0x76, 0xbb, 0xbe, 0x8f, 0xdb, 0x95, 0x14, 0x13, 0xe3, 0xe6, 0x87, 0xcd, 0x46, 0xbb, 0x92, - 0x46, 0x2b, 0x50, 0x12, 0x6d, 0xed, 0xfe, 0x3e, 0xfe, 0xc9, 0x76, 0xbb, 0x92, 0x09, 0x89, 0x0e, - 0x9b, 0x7b, 0xf7, 0x9a, 0xb8, 0x92, 0x55, 0xdf, 0x65, 0x37, 0x93, 0x18, 0xc6, 0x32, 0xbe, 0x83, - 0x24, 0x43, 0x77, 0x10, 0xf5, 0xb7, 0x29, 0xa8, 0xc5, 0xd3, 0x10, 0xf4, 0xe1, 0xc4, 0xc4, 0xb7, - 0xce, 0xc1, 0x61, 0x26, 0x66, 0x8f, 0xae, 0x43, 0xd9, 0x25, 0x47, 0x84, 0x76, 0xfb, 0x82, 0x16, - 0x89, 0x23, 0xb3, 0x84, 0x4b, 0x52, 0xca, 0x8d, 0x3c, 0xa1, 0xf6, 0x19, 0xe9, 0x52, 0x4d, 0x60, - 0x91, 0xd8, 0x74, 0x0a, 0x53, 0x63, 0xd2, 0x43, 0x21, 0x54, 0x3f, 0x3d, 0x57, 0x2c, 0x15, 0xc8, - 0xe2, 0x66, 0x1b, 0x7f, 0x5c, 0x49, 0x23, 0x04, 0x65, 0xde, 0xd4, 0x0e, 0xf7, 0xb6, 0x0f, 0x0e, - 0x5b, 0xfb, 0x2c, 0x96, 0x17, 0x60, 0xd9, 0x8f, 0xa5, 0x2f, 0xcc, 0xaa, 0x9f, 0x40, 0x39, 0x7a, - 0xf7, 0x67, 0x21, 0x74, 0xed, 0x91, 0x65, 0xf0, 0x60, 0x64, 0xb1, 0xe8, 0xa0, 0xdb, 0x90, 0x3d, - 0xb6, 0x45, 0x9a, 0xcd, 0xde, 0x6b, 0x8f, 0x6c, 0x4a, 0x42, 0xb5, 0x03, 0xa1, 0xad, 0x7e, 0x01, - 0x59, 0x9e, 0x35, 0x2c, 0x03, 0xf8, 0x2d, 0x5e, 0x92, 0x2a, 0xd6, 0x46, 0x9f, 0x00, 0xe8, 0x94, - 0xba, 0x66, 0x67, 0x34, 0x76, 0xbc, 0x3e, 0x3b, 0xeb, 0xb6, 0x7d, 0xbd, 0xfa, 0x65, 0x99, 0x7e, - 0xab, 0x63, 0xd3, 0x50, 0x0a, 0x86, 0x1c, 0xaa, 0x7b, 0x50, 0x8e, 0xda, 0xfa, 0x34, 0x40, 0x8c, - 0x21, 0x4a, 0x03, 0x04, 0xab, 0x93, 0x34, 0x20, 0x20, 0x11, 0x69, 0x51, 0xb1, 0xe1, 0x1d, 0xf5, - 0x59, 0x12, 0x0a, 0xed, 0x13, 0xb9, 0x1e, 0x31, 0xc5, 0x82, 0xb1, 0x69, 0x2a, 0x7c, 0x35, 0x16, - 0xd5, 0x87, 0x74, 0x50, 0xd3, 0xf8, 0x20, 0xd8, 0x71, 0x99, 0x45, 0x6f, 0x40, 0x7e, 0x71, 0x47, - 0x66, 0xd9, 0xfb, 0xa0, 0x04, 0x98, 0xc9, 0xd8, 0xa9, 0x6e, 0x18, 0x2e, 0xf1, 0x3c, 0xb9, 0xef, - 0xfd, 0x2e, 0xaf, 0x3d, 0xd9, 0x4f, 0xe5, 0xe5, 0x3b, 0x8d, 0x45, 0x47, 0x35, 0x60, 0x79, 0x02, - 0x70, 0xd1, 0xfb, 0x90, 0x77, 0x46, 0x1d, 0xcd, 0x0f, 0xcf, 0xc4, 0x5b, 0x83, 0xcf, 0x7b, 0x46, - 0x9d, 0x81, 0xd9, 0x7d, 0x40, 0x4e, 0xfd, 0xc1, 0x38, 0xa3, 0xce, 0x03, 0x11, 0x45, 0xf1, 0x2b, - 0xa9, 0xf0, 0xaf, 0x1c, 0x43, 0xc1, 0xdf, 0x14, 0xe8, 0x87, 0xa0, 0x04, 0x58, 0x1e, 0x94, 0x24, - 0x63, 0x0f, 0x01, 0xe9, 0x7e, 0x6c, 0xc2, 0x48, 0xb4, 0x67, 0xf6, 0x2c, 0x62, 0x68, 0x63, 0x7e, - 0xcc, 0x7f, 0xad, 0x80, 0x97, 0xc5, 0x87, 0x5d, 0x9f, 0x1c, 0xab, 0xff, 0x4e, 0x42, 0xc1, 0x2f, - 0x3d, 0xa1, 0x77, 0x43, 0xfb, 0xae, 0x3c, 0xe3, 0xa2, 0xee, 0x2b, 0x8e, 0xcb, 0x47, 0xd1, 0xb1, - 0xa6, 0xce, 0x3f, 0xd6, 0xb8, 0x3a, 0xa0, 0x5f, 0x91, 0xcd, 0x9c, 0xbb, 0x22, 0xfb, 0x36, 0x20, - 0x6a, 0x53, 0x7d, 0xa0, 0x1d, 0xdb, 0xd4, 0xb4, 0x7a, 0x9a, 0x08, 0xb6, 0xe0, 0x02, 0x15, 0xfe, - 0xe5, 0x11, 0xff, 0x70, 0xc0, 0xe3, 0xfe, 0xcb, 0x24, 0x14, 0x02, 0x50, 0x3f, 0x6f, 0x35, 0xe8, - 0x22, 0xe4, 0x24, 0x6e, 0x89, 0x72, 0x90, 0xec, 0x05, 0x85, 0xc9, 0x4c, 0xa8, 0x30, 0x59, 0x83, - 0xc2, 0x90, 0x50, 0x9d, 0x9f, 0x6c, 0xe2, 0x8a, 0x12, 0xf4, 0x6f, 0xbe, 0x07, 0xc5, 0x50, 0x61, - 0x8e, 0x65, 0xde, 0x5e, 0xf3, 0xa3, 0x4a, 0xa2, 0x96, 0x7f, 0xf6, 0xe5, 0xd5, 0xf4, 0x1e, 0x79, - 0xca, 0xf6, 0x2c, 0x6e, 0x36, 0x5a, 0xcd, 0xc6, 0x83, 0x4a, 0xb2, 0x56, 0x7c, 0xf6, 0xe5, 0xd5, - 0x3c, 0x26, 0xbc, 0x48, 0x70, 0xb3, 0x05, 0x4b, 0xe1, 0x55, 0x89, 0x42, 0x1f, 0x82, 0xf2, 0xbd, - 0x87, 0x07, 0xbb, 0x3b, 0x8d, 0xed, 0x76, 0x53, 0x7b, 0xb4, 0xdf, 0x6e, 0x56, 0x92, 0xe8, 0x55, - 0xb8, 0xb0, 0xbb, 0xf3, 0xe3, 0x56, 0x5b, 0x6b, 0xec, 0xee, 0x34, 0xf7, 0xda, 0xda, 0x76, 0xbb, - 0xbd, 0xdd, 0x78, 0x50, 0x49, 0x6d, 0xfd, 0x5e, 0x81, 0xe5, 0xed, 0x7a, 0x63, 0x87, 0xc1, 0xb6, - 0xd9, 0xd5, 0xf9, 0xfd, 0xb1, 0x01, 0x19, 0x7e, 0x43, 0x3c, 0xf3, 0xd9, 0xae, 0x76, 0x76, 0xf9, - 0x08, 0xdd, 0x87, 0x2c, 0xbf, 0x3c, 0xa2, 0xb3, 0xdf, 0xf1, 0x6a, 0x73, 0xea, 0x49, 0x6c, 0x30, - 0x3c, 0x3d, 0xce, 0x7c, 0xd8, 0xab, 0x9d, 0x5d, 0x5e, 0x42, 0x18, 0x94, 0x31, 0xf9, 0x9c, 0xff, - 0xd0, 0x55, 0x5b, 0x00, 0x6c, 0xd0, 0x2e, 0xe4, 0xfd, 0xfb, 0xc2, 0xbc, 0xa7, 0xb7, 0xda, 0xdc, - 0xfa, 0x0f, 0x0b, 0x97, 0xb8, 0xd7, 0x9d, 0xfd, 0x8e, 0x58, 0x9b, 0x53, 0xcc, 0x42, 0x3b, 0x90, - 0x93, 0x84, 0x6a, 0xce, 0x73, 0x5a, 0x6d, 0x5e, 0x3d, 0x87, 0x05, 0x6d, 0x7c, 0x63, 0x9e, 0xff, - 0x3a, 0x5a, 0x5b, 0xa0, 0x4e, 0x87, 0x1e, 0x02, 0x84, 0x6e, 0x71, 0x0b, 0x3c, 0x7b, 0xd6, 0x16, - 0xa9, 0xbf, 0xa1, 0x7d, 0x28, 0x04, 0xa4, 0x7a, 0xee, 0x23, 0x64, 0x6d, 0x7e, 0x21, 0x0c, 0x3d, - 0x86, 0x52, 0x94, 0x4c, 0x2e, 0xf6, 0xb4, 0x58, 0x5b, 0xb0, 0xc2, 0xc5, 0xfc, 0x47, 0x99, 0xe5, - 0x62, 0x4f, 0x8d, 0xb5, 0x05, 0x0b, 0x5e, 0xe8, 0x33, 0x58, 0x99, 0x66, 0x7e, 0x8b, 0xbf, 0x3c, - 0xd6, 0xce, 0x51, 0x02, 0x43, 0x43, 0x40, 0x33, 0x18, 0xe3, 0x39, 0x1e, 0x22, 0x6b, 0xe7, 0xa9, - 0x88, 0xd5, 0x9b, 0x5f, 0xbd, 0x58, 0x4b, 0x7e, 0xfd, 0x62, 0x2d, 0xf9, 0x8f, 0x17, 0x6b, 0xc9, - 0xe7, 0x2f, 0xd7, 0x12, 0x5f, 0xbf, 0x5c, 0x4b, 0xfc, 0xf5, 0xe5, 0x5a, 0xe2, 0x67, 0x6f, 0xf5, - 0x4c, 0xda, 0x1f, 0x75, 0x36, 0xba, 0xf6, 0x70, 0x33, 0xfc, 0x0f, 0x87, 0x59, 0xff, 0xba, 0xe8, - 0xe4, 0xf8, 0xa1, 0x72, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x92, 0xa5, 0x39, 0xcc, 0x95, - 0x21, 0x00, 0x00, + // 2712 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5, + 0x15, 0xd7, 0xa7, 0x25, 0x3d, 0x7d, 0x58, 0xdb, 0xbb, 0x2c, 0x62, 0x58, 0xec, 0x65, 0x28, 0xc8, + 0xb2, 0x80, 0x1d, 0x4c, 0xb1, 0x81, 0x22, 0x1f, 0x58, 0x42, 0x1b, 0x99, 0x35, 0x96, 0xd3, 0xd6, + 0x2e, 0x45, 0x12, 0x76, 0x18, 0x69, 0xda, 0xd2, 0xb0, 0xd2, 0xcc, 0x30, 0xd3, 0x32, 0x36, 0xc7, + 0x54, 0x72, 0xa1, 0x52, 0x15, 0x8e, 0xb9, 0xf0, 0x7f, 0xe4, 0x94, 0x53, 0x0e, 0x1c, 0x72, 0xe0, + 0x98, 0x43, 0x8a, 0xa4, 0xd8, 0x5b, 0x6e, 0x39, 0xe5, 0x94, 0xaa, 0x54, 0x7f, 0xcc, 0x97, 0xa4, + 0x91, 0xe4, 0x90, 0x5b, 0x6e, 0xdd, 0x6f, 0xde, 0x7b, 0xea, 0x7e, 0xdd, 0xfd, 0x7b, 0xbf, 0x7e, + 0x2d, 0x78, 0x9a, 0x12, 0xcb, 0x20, 0xee, 0xc4, 0xb4, 0xe8, 0xae, 0xde, 0x1f, 0x98, 0xbb, 0xf4, + 0xc2, 0x21, 0xde, 0x8e, 0xe3, 0xda, 0xd4, 0x46, 0x9b, 0xe1, 0xc7, 0x1d, 0xf6, 0x51, 0x79, 0x26, + 0xa2, 0x3d, 0x70, 0x2f, 0x1c, 0x6a, 0xef, 0x3a, 0xae, 0x6d, 0x9f, 0x0a, 0x7d, 0xe5, 0x46, 0xe4, + 0x33, 0xf7, 0x13, 0xf5, 0x16, 0xfb, 0x2a, 0x8d, 0x1f, 0x91, 0x0b, 0xff, 0xeb, 0x33, 0x73, 0xb6, + 0x8e, 0xee, 0xea, 0x13, 0xff, 0xf3, 0xf6, 0xd0, 0xb6, 0x87, 0x63, 0xb2, 0xcb, 0x7b, 0xfd, 0xe9, + 0xe9, 0x2e, 0x35, 0x27, 0xc4, 0xa3, 0xfa, 0xc4, 0x91, 0x0a, 0xd7, 0x86, 0xf6, 0xd0, 0xe6, 0xcd, + 0x5d, 0xd6, 0x12, 0x52, 0xf5, 0xcb, 0x22, 0x14, 0x30, 0xf9, 0x64, 0x4a, 0x3c, 0x8a, 0xf6, 0x20, + 0x47, 0x06, 0x23, 0xbb, 0x91, 0xbe, 0x99, 0xbe, 0x55, 0xde, 0xbb, 0xb1, 0x33, 0x33, 0xb9, 0x1d, + 0xa9, 0xd7, 0x1e, 0x8c, 0xec, 0x4e, 0x0a, 0x73, 0x5d, 0xf4, 0x3a, 0xe4, 0x4f, 0xc7, 0x53, 0x6f, + 0xd4, 0xc8, 0x70, 0xa3, 0x67, 0x92, 0x8c, 0xee, 0x32, 0xa5, 0x4e, 0x0a, 0x0b, 0x6d, 0xf6, 0x53, + 0xa6, 0x75, 0x6a, 0x37, 0xb2, 0xcb, 0x7f, 0xea, 0xc0, 0x3a, 0xe5, 0x3f, 0xc5, 0x74, 0x51, 0x13, + 0xc0, 0xb4, 0x4c, 0xaa, 0x0d, 0x46, 0xba, 0x69, 0x35, 0x72, 0xdc, 0xf2, 0xd9, 0x64, 0x4b, 0x93, + 0xb6, 0x98, 0x62, 0x27, 0x85, 0x4b, 0xa6, 0xdf, 0x61, 0xc3, 0xfd, 0x64, 0x4a, 0xdc, 0x8b, 0x46, + 0x7e, 0xf9, 0x70, 0x7f, 0xc6, 0x94, 0xd8, 0x70, 0xb9, 0x36, 0x6a, 0x43, 0xb9, 0x4f, 0x86, 0xa6, + 0xa5, 0xf5, 0xc7, 0xf6, 0xe0, 0x51, 0x63, 0x83, 0x1b, 0xab, 0x49, 0xc6, 0x4d, 0xa6, 0xda, 0x64, + 0x9a, 0x9d, 0x14, 0x86, 0x7e, 0xd0, 0x43, 0x3f, 0x84, 0xe2, 0x60, 0x44, 0x06, 0x8f, 0x34, 0x7a, + 0xde, 0x28, 0x70, 0x1f, 0xdb, 0x49, 0x3e, 0x5a, 0x4c, 0xaf, 0x77, 0xde, 0x49, 0xe1, 0xc2, 0x40, + 0x34, 0xd9, 0xfc, 0x0d, 0x32, 0x36, 0xcf, 0x88, 0xcb, 0xec, 0x8b, 0xcb, 0xe7, 0xff, 0x8e, 0xd0, + 0xe4, 0x1e, 0x4a, 0x86, 0xdf, 0x41, 0x3f, 0x81, 0x12, 0xb1, 0x0c, 0x39, 0x8d, 0x12, 0x77, 0x71, + 0x33, 0x71, 0x9d, 0x2d, 0xc3, 0x9f, 0x44, 0x91, 0xc8, 0x36, 0x7a, 0x03, 0x36, 0x06, 0xf6, 0x64, + 0x62, 0xd2, 0x06, 0x70, 0xeb, 0xad, 0xc4, 0x09, 0x70, 0xad, 0x4e, 0x0a, 0x4b, 0x7d, 0x74, 0x04, + 0xb5, 0xb1, 0xe9, 0x51, 0xcd, 0xb3, 0x74, 0xc7, 0x1b, 0xd9, 0xd4, 0x6b, 0x94, 0xb9, 0x87, 0xe7, + 0x93, 0x3c, 0x1c, 0x9a, 0x1e, 0x3d, 0xf1, 0x95, 0x3b, 0x29, 0x5c, 0x1d, 0x47, 0x05, 0xcc, 0x9f, + 0x7d, 0x7a, 0x4a, 0xdc, 0xc0, 0x61, 0xa3, 0xb2, 0xdc, 0x5f, 0x97, 0x69, 0xfb, 0xf6, 0xcc, 0x9f, + 0x1d, 0x15, 0xa0, 0x5f, 0xc0, 0xd5, 0xb1, 0xad, 0x1b, 0x81, 0x3b, 0x6d, 0x30, 0x9a, 0x5a, 0x8f, + 0x1a, 0x55, 0xee, 0xf4, 0xc5, 0xc4, 0x41, 0xda, 0xba, 0xe1, 0xbb, 0x68, 0x31, 0x83, 0x4e, 0x0a, + 0x5f, 0x19, 0xcf, 0x0a, 0xd1, 0x43, 0xb8, 0xa6, 0x3b, 0xce, 0xf8, 0x62, 0xd6, 0x7b, 0x8d, 0x7b, + 0xbf, 0x9d, 0xe4, 0x7d, 0x9f, 0xd9, 0xcc, 0xba, 0x47, 0xfa, 0x9c, 0x94, 0x05, 0xc3, 0x71, 0x89, + 0xe3, 0xda, 0x03, 0xe2, 0x79, 0x1a, 0x3d, 0xf7, 0x1a, 0x9b, 0xcb, 0x83, 0x71, 0x1c, 0x68, 0xf7, + 0xce, 0x79, 0x70, 0x9d, 0xa8, 0xa0, 0x59, 0x80, 0xfc, 0x99, 0x3e, 0x9e, 0x12, 0xf5, 0x7b, 0x50, + 0x8e, 0x1c, 0x7b, 0xd4, 0x80, 0xc2, 0x84, 0x78, 0x9e, 0x3e, 0x24, 0x1c, 0x25, 0x4a, 0xd8, 0xef, + 0xaa, 0x35, 0xa8, 0x44, 0x8f, 0xba, 0xfa, 0x45, 0x3a, 0xb0, 0x64, 0xa7, 0x98, 0x59, 0x9e, 0x11, + 0xd7, 0x33, 0x6d, 0xcb, 0xb7, 0x94, 0x5d, 0xf4, 0x1c, 0x54, 0xf9, 0x7e, 0xd4, 0xfc, 0xef, 0x0c, + 0x4a, 0x72, 0xb8, 0xc2, 0x85, 0x0f, 0xa4, 0xd2, 0x36, 0x94, 0x9d, 0x3d, 0x27, 0x50, 0xc9, 0x72, + 0x15, 0x70, 0xf6, 0x1c, 0x5f, 0xe1, 0x59, 0xa8, 0xb0, 0xf9, 0x05, 0x1a, 0x39, 0xfe, 0x23, 0x65, + 0x26, 0x93, 0x2a, 0xea, 0x9f, 0x33, 0x50, 0x9f, 0x85, 0x07, 0xf4, 0x06, 0xe4, 0x18, 0x52, 0x4a, + 0xd0, 0x53, 0x76, 0x04, 0x8c, 0xee, 0xf8, 0x30, 0xba, 0xd3, 0xf3, 0x61, 0xb4, 0x59, 0xfc, 0xea, + 0x9b, 0xed, 0xd4, 0x17, 0x7f, 0xdb, 0x4e, 0x63, 0x6e, 0x81, 0x9e, 0x62, 0xa7, 0x59, 0x37, 0x2d, + 0xcd, 0x34, 0xf8, 0x90, 0x4b, 0xec, 0xa8, 0xea, 0xa6, 0x75, 0x60, 0xa0, 0x43, 0xa8, 0x0f, 0x6c, + 0xcb, 0x23, 0x96, 0x37, 0xf5, 0x34, 0x01, 0xd3, 0x12, 0xea, 0x62, 0x07, 0x56, 0x80, 0x7f, 0xcb, + 0xd7, 0x3c, 0xe6, 0x8a, 0x78, 0x73, 0x10, 0x17, 0xa0, 0xbb, 0x00, 0x67, 0xfa, 0xd8, 0x34, 0x74, + 0x6a, 0xbb, 0x5e, 0x23, 0x77, 0x33, 0xbb, 0xf0, 0xd4, 0x3e, 0xf0, 0x55, 0xee, 0x3b, 0x86, 0x4e, + 0x49, 0x33, 0xc7, 0x86, 0x8b, 0x23, 0x96, 0xe8, 0x05, 0xd8, 0xd4, 0x1d, 0x47, 0xf3, 0xa8, 0x4e, + 0x89, 0xd6, 0xbf, 0xa0, 0xc4, 0xe3, 0x30, 0x58, 0xc1, 0x55, 0xdd, 0x71, 0x4e, 0x98, 0xb4, 0xc9, + 0x84, 0xe8, 0x79, 0xa8, 0x31, 0xc4, 0x34, 0xf5, 0xb1, 0x36, 0x22, 0xe6, 0x70, 0x44, 0x39, 0xe0, + 0x65, 0x71, 0x55, 0x4a, 0x3b, 0x5c, 0xa8, 0x1a, 0xc1, 0x8a, 0x73, 0xb4, 0x44, 0x08, 0x72, 0x86, + 0x4e, 0x75, 0x1e, 0xc9, 0x0a, 0xe6, 0x6d, 0x26, 0x73, 0x74, 0x3a, 0x92, 0xf1, 0xe1, 0x6d, 0x74, + 0x1d, 0x36, 0xa4, 0xdb, 0x2c, 0x77, 0x2b, 0x7b, 0xe8, 0x1a, 0xe4, 0x1d, 0xd7, 0x3e, 0x23, 0x7c, + 0xe9, 0x8a, 0x58, 0x74, 0xd4, 0x5f, 0x67, 0xe0, 0xca, 0x1c, 0xae, 0x32, 0xbf, 0x23, 0xdd, 0x1b, + 0xf9, 0xbf, 0xc5, 0xda, 0xe8, 0x0e, 0xf3, 0xab, 0x1b, 0xc4, 0x95, 0xb9, 0xa8, 0x31, 0x1f, 0xea, + 0x0e, 0xff, 0x2e, 0x43, 0x23, 0xb5, 0x51, 0x17, 0xea, 0x63, 0xdd, 0xa3, 0x9a, 0xc0, 0x29, 0x2d, + 0x92, 0x97, 0xe6, 0xd1, 0xf9, 0x50, 0xf7, 0x91, 0x8d, 0x6d, 0x6a, 0xe9, 0xa8, 0x36, 0x8e, 0x49, + 0x11, 0x86, 0x6b, 0xfd, 0x8b, 0xcf, 0x74, 0x8b, 0x9a, 0x16, 0xd1, 0xe6, 0x56, 0xee, 0xa9, 0x39, + 0xa7, 0xed, 0x33, 0xd3, 0x20, 0xd6, 0xc0, 0x5f, 0xb2, 0xab, 0x81, 0x71, 0xb0, 0xa4, 0x9e, 0x8a, + 0xa1, 0x16, 0xcf, 0x0c, 0xa8, 0x06, 0x19, 0x7a, 0x2e, 0x03, 0x90, 0xa1, 0xe7, 0xe8, 0xfb, 0x90, + 0x63, 0x93, 0xe4, 0x93, 0xaf, 0x2d, 0x48, 0xa9, 0xd2, 0xae, 0x77, 0xe1, 0x10, 0xcc, 0x35, 0x55, + 0x35, 0x38, 0x0e, 0x41, 0xb6, 0x98, 0xf5, 0xaa, 0xbe, 0x08, 0x9b, 0x33, 0xe9, 0x20, 0xb2, 0x7e, + 0xe9, 0xe8, 0xfa, 0xa9, 0x9b, 0x50, 0x8d, 0x61, 0xbf, 0x7a, 0x1d, 0xae, 0x2d, 0x82, 0x72, 0x75, + 0x14, 0xc8, 0x63, 0x90, 0x8c, 0x5e, 0x87, 0x62, 0x80, 0xe5, 0xe2, 0x38, 0xce, 0xc7, 0xca, 0x57, + 0xc6, 0x81, 0x2a, 0x3b, 0x87, 0x6c, 0x5b, 0xf3, 0xfd, 0x90, 0xe1, 0x03, 0x2f, 0xe8, 0x8e, 0xd3, + 0xd1, 0xbd, 0x91, 0xfa, 0x11, 0x34, 0x92, 0x70, 0x7a, 0x66, 0x1a, 0xb9, 0x60, 0x1b, 0x5e, 0x87, + 0x8d, 0x53, 0xdb, 0x9d, 0xe8, 0x94, 0x3b, 0xab, 0x62, 0xd9, 0x63, 0xdb, 0x53, 0x60, 0x76, 0x96, + 0x8b, 0x45, 0x47, 0xd5, 0xe0, 0xa9, 0x44, 0xac, 0x66, 0x26, 0xa6, 0x65, 0x10, 0x11, 0xcf, 0x2a, + 0x16, 0x9d, 0xd0, 0x91, 0x18, 0xac, 0xe8, 0xb0, 0x9f, 0xf5, 0xf8, 0x5c, 0xb9, 0xff, 0x12, 0x96, + 0x3d, 0xf5, 0x56, 0x10, 0xac, 0x18, 0x64, 0xa3, 0x3a, 0x64, 0x19, 0xcc, 0xa7, 0x6f, 0x66, 0x6f, + 0x55, 0x30, 0x6b, 0xaa, 0xff, 0x2c, 0x42, 0x11, 0x13, 0xcf, 0x61, 0xe8, 0x81, 0x9a, 0x50, 0x22, + 0xe7, 0x03, 0xe2, 0x50, 0x1f, 0x70, 0x17, 0xf3, 0x15, 0xa1, 0xdd, 0xf6, 0x35, 0x19, 0x59, 0x08, + 0xcc, 0xd0, 0x6b, 0x92, 0x0f, 0x26, 0x53, 0x3b, 0x69, 0x1e, 0x25, 0x84, 0x77, 0x7c, 0x42, 0x98, + 0x4d, 0xe4, 0x07, 0xc2, 0x6a, 0x86, 0x11, 0xbe, 0x26, 0x19, 0x61, 0x6e, 0xc5, 0x8f, 0xc5, 0x28, + 0x61, 0x2b, 0x46, 0x09, 0xf3, 0x2b, 0xa6, 0x99, 0xc0, 0x09, 0xef, 0xf8, 0x9c, 0x70, 0x63, 0xc5, + 0x88, 0x67, 0x48, 0xe1, 0xdd, 0x38, 0x29, 0x14, 0x84, 0xee, 0xb9, 0x44, 0xeb, 0x44, 0x56, 0xf8, + 0xa3, 0x08, 0x2b, 0x2c, 0x26, 0x52, 0x32, 0xe1, 0x64, 0x01, 0x2d, 0x6c, 0xc5, 0x68, 0x61, 0x69, + 0x45, 0x0c, 0x12, 0x78, 0xe1, 0xdb, 0x51, 0x5e, 0x08, 0x89, 0xd4, 0x52, 0xae, 0xf7, 0x22, 0x62, + 0xf8, 0x66, 0x40, 0x0c, 0xcb, 0x89, 0xcc, 0x56, 0xce, 0x61, 0x96, 0x19, 0x76, 0xe7, 0x98, 0xa1, + 0x60, 0x72, 0x2f, 0x24, 0xba, 0x58, 0x41, 0x0d, 0xbb, 0x73, 0xd4, 0xb0, 0xba, 0xc2, 0xe1, 0x0a, + 0x6e, 0xf8, 0xcb, 0xc5, 0xdc, 0x30, 0x99, 0xbd, 0xc9, 0x61, 0xae, 0x47, 0x0e, 0xb5, 0x04, 0x72, + 0x28, 0x28, 0xdc, 0x4b, 0x89, 0xee, 0xd7, 0x66, 0x87, 0xdd, 0x39, 0x76, 0x58, 0x5f, 0x11, 0x8f, + 0x75, 0xe9, 0xe1, 0x8b, 0x2c, 0x39, 0xcf, 0x80, 0x08, 0x03, 0x38, 0xe2, 0xba, 0xb6, 0x2b, 0x89, + 0x9e, 0xe8, 0xa8, 0xb7, 0x18, 0x5d, 0x08, 0x01, 0x63, 0x09, 0x95, 0xe4, 0x89, 0x24, 0x02, 0x12, + 0xea, 0x1f, 0xd2, 0xa1, 0x2d, 0xcf, 0xb0, 0x51, 0xaa, 0x51, 0x92, 0x54, 0x23, 0x42, 0x30, 0x33, + 0x71, 0x82, 0xb9, 0x0d, 0x65, 0x96, 0x20, 0x66, 0xb8, 0xa3, 0xee, 0x04, 0xdc, 0xf1, 0x36, 0x5c, + 0xe1, 0x0c, 0x40, 0xd0, 0x50, 0x99, 0x15, 0x72, 0x3c, 0xb9, 0x6d, 0xb2, 0x0f, 0x62, 0xb7, 0x8b, + 0xf4, 0xf0, 0x0a, 0x5c, 0x8d, 0xe8, 0x06, 0x89, 0x47, 0x10, 0xa9, 0x7a, 0xa0, 0xbd, 0x2f, 0x33, + 0xd0, 0x9f, 0xd2, 0x61, 0x84, 0x42, 0xd2, 0xb9, 0x88, 0x1f, 0xa6, 0xff, 0x47, 0xfc, 0x30, 0xf3, + 0x5f, 0xf3, 0xc3, 0x68, 0x22, 0xcd, 0xc6, 0x13, 0xe9, 0xbf, 0xd2, 0xe1, 0x9a, 0x04, 0x6c, 0x6f, + 0x60, 0x1b, 0x44, 0xa6, 0x36, 0xde, 0x66, 0x39, 0x69, 0x6c, 0x0f, 0x65, 0x02, 0x63, 0x4d, 0xa6, + 0x15, 0xa0, 0x7a, 0x49, 0x82, 0x76, 0x90, 0x15, 0xf3, 0x3c, 0xc2, 0x32, 0x2b, 0xd6, 0x21, 0xfb, + 0x88, 0x08, 0x0c, 0xae, 0x60, 0xd6, 0x64, 0x7a, 0x7c, 0x93, 0x71, 0x64, 0xad, 0x60, 0xd1, 0x41, + 0x6f, 0x40, 0x89, 0x57, 0x54, 0x34, 0xdb, 0xf1, 0x24, 0x5c, 0x3e, 0x1d, 0x9d, 0xab, 0x28, 0x9c, + 0xec, 0x1c, 0x33, 0x9d, 0xae, 0xe3, 0xe1, 0xa2, 0x23, 0x5b, 0x91, 0x84, 0x5f, 0x8a, 0xf1, 0xce, + 0x1b, 0x50, 0x62, 0xa3, 0xf7, 0x1c, 0x7d, 0x40, 0x38, 0xf6, 0x95, 0x70, 0x28, 0x50, 0x1f, 0x02, + 0x9a, 0x47, 0x70, 0xd4, 0x81, 0x0d, 0x72, 0x46, 0x2c, 0x2a, 0x12, 0x70, 0x79, 0xef, 0xfa, 0x02, + 0x52, 0x47, 0x2c, 0xda, 0x6c, 0xb0, 0x20, 0xff, 0xe3, 0x9b, 0xed, 0xba, 0xd0, 0x7e, 0xd9, 0x9e, + 0x98, 0x94, 0x4c, 0x1c, 0x7a, 0x81, 0xa5, 0xbd, 0xfa, 0xd7, 0x0c, 0x63, 0x58, 0x31, 0x74, 0x5f, + 0x18, 0x5b, 0x7f, 0xcb, 0x67, 0x22, 0xec, 0x7a, 0xbd, 0x78, 0x6f, 0x01, 0x0c, 0x75, 0x4f, 0xfb, + 0x54, 0xb7, 0x28, 0x31, 0x64, 0xd0, 0x23, 0x12, 0xa4, 0x40, 0x91, 0xf5, 0xa6, 0x1e, 0x31, 0x24, + 0xd1, 0x0f, 0xfa, 0x91, 0x79, 0x16, 0xbe, 0xdb, 0x3c, 0xe3, 0x51, 0x2e, 0xce, 0x44, 0x39, 0xc2, + 0x7e, 0x4a, 0x51, 0xf6, 0xc3, 0xc6, 0xe6, 0xb8, 0xa6, 0xed, 0x9a, 0xf4, 0x82, 0x2f, 0x4d, 0x16, + 0x07, 0x7d, 0x76, 0x6f, 0x9c, 0x90, 0x89, 0x63, 0xdb, 0x63, 0x4d, 0xc0, 0x4d, 0x99, 0x9b, 0x56, + 0xa4, 0xb0, 0xcd, 0x51, 0xe7, 0x37, 0x99, 0xf0, 0xfc, 0x85, 0x2c, 0xf7, 0xff, 0x2e, 0xc0, 0xea, + 0x6f, 0xf9, 0xdd, 0x37, 0x9e, 0xbf, 0xd1, 0x09, 0x5c, 0x09, 0x8e, 0xbf, 0x36, 0xe5, 0xb0, 0xe0, + 0x6f, 0xe8, 0x75, 0xf1, 0xa3, 0x7e, 0x16, 0x17, 0x7b, 0xe8, 0x03, 0x78, 0x72, 0x06, 0xdb, 0x02, + 0xd7, 0x99, 0x75, 0x21, 0xee, 0x89, 0x38, 0xc4, 0xf9, 0xae, 0xc3, 0x60, 0x65, 0xbf, 0xe3, 0xa9, + 0x3b, 0x60, 0xd7, 0xa9, 0x28, 0x1d, 0x59, 0xb8, 0xfc, 0xcf, 0x41, 0xd5, 0x25, 0x94, 0x5d, 0xf1, + 0x63, 0x17, 0xd6, 0x8a, 0x10, 0xca, 0x6b, 0xf0, 0x31, 0x3c, 0xb1, 0x90, 0x96, 0xa0, 0x1f, 0x40, + 0x29, 0x64, 0x34, 0xe9, 0x84, 0xbb, 0x5f, 0x70, 0x9f, 0x09, 0x75, 0xd5, 0x3f, 0xa6, 0x43, 0x97, + 0xf1, 0x1b, 0x52, 0x1b, 0x36, 0x5c, 0xe2, 0x4d, 0xc7, 0xe2, 0xce, 0x52, 0xdb, 0x7b, 0x65, 0x3d, + 0x42, 0xc3, 0xa4, 0xd3, 0x31, 0xc5, 0xd2, 0x58, 0x7d, 0x08, 0x1b, 0x42, 0x82, 0xca, 0x50, 0xb8, + 0x7f, 0x74, 0xef, 0xa8, 0xfb, 0xfe, 0x51, 0x3d, 0x85, 0x00, 0x36, 0xf6, 0x5b, 0xad, 0xf6, 0x71, + 0xaf, 0x9e, 0x46, 0x25, 0xc8, 0xef, 0x37, 0xbb, 0xb8, 0x57, 0xcf, 0x30, 0x31, 0x6e, 0xbf, 0xdb, + 0x6e, 0xf5, 0xea, 0x59, 0x74, 0x05, 0xaa, 0xa2, 0xad, 0xdd, 0xed, 0xe2, 0xf7, 0xf6, 0x7b, 0xf5, + 0x5c, 0x44, 0x74, 0xd2, 0x3e, 0x7a, 0xa7, 0x8d, 0xeb, 0x79, 0xf5, 0x55, 0x76, 0x29, 0x4a, 0xa0, + 0x40, 0xe1, 0xf5, 0x27, 0x1d, 0xb9, 0xfe, 0xa8, 0xbf, 0xcf, 0x80, 0x92, 0xcc, 0x6b, 0xd0, 0xbb, + 0x33, 0x13, 0xdf, 0xbb, 0x04, 0x29, 0x9a, 0x99, 0x3d, 0x7a, 0x1e, 0x6a, 0x2e, 0x39, 0x25, 0x74, + 0x30, 0x12, 0x3c, 0x4b, 0xa4, 0xcc, 0x2a, 0xae, 0x4a, 0x29, 0x37, 0xf2, 0x84, 0xda, 0xc7, 0x64, + 0x40, 0x35, 0x81, 0x45, 0x62, 0xd3, 0x95, 0x98, 0x1a, 0x93, 0x9e, 0x08, 0xa1, 0xfa, 0xd1, 0xa5, + 0x62, 0x59, 0x82, 0x3c, 0x6e, 0xf7, 0xf0, 0x07, 0xf5, 0x2c, 0x42, 0x50, 0xe3, 0x4d, 0xed, 0xe4, + 0x68, 0xff, 0xf8, 0xa4, 0xd3, 0x65, 0xb1, 0xbc, 0x0a, 0x9b, 0x7e, 0x2c, 0x7d, 0x61, 0x5e, 0xd5, + 0xc3, 0xdd, 0xb0, 0xe2, 0x0a, 0x88, 0xee, 0x40, 0x51, 0x92, 0x28, 0xff, 0xb0, 0x29, 0xf3, 0x87, + 0xed, 0x3d, 0xa9, 0x81, 0x03, 0x5d, 0xf5, 0x43, 0xa8, 0xc5, 0x2b, 0x1b, 0x6c, 0x95, 0x5c, 0x7b, + 0x6a, 0x19, 0x3c, 0xde, 0x79, 0x2c, 0x3a, 0xe8, 0x75, 0xc8, 0x9f, 0xd9, 0xe2, 0x24, 0x2f, 0xde, + 0xce, 0x0f, 0x6c, 0x4a, 0x22, 0x95, 0x11, 0xa1, 0xad, 0x7e, 0x06, 0x79, 0x7e, 0x30, 0xd9, 0x21, + 0xe3, 0x35, 0x0a, 0xc9, 0xdb, 0x58, 0x1b, 0x7d, 0x08, 0xa0, 0x53, 0xea, 0x9a, 0xfd, 0x69, 0xe8, + 0x78, 0x7b, 0xf1, 0xc1, 0xde, 0xf7, 0xf5, 0x9a, 0x37, 0xe4, 0x09, 0xbf, 0x16, 0x9a, 0x46, 0x4e, + 0x79, 0xc4, 0xa1, 0x7a, 0x04, 0xb5, 0xb8, 0xad, 0xcf, 0x34, 0xc4, 0x18, 0xe2, 0x4c, 0x43, 0x10, + 0x47, 0xc9, 0x34, 0x02, 0x9e, 0x92, 0x15, 0xf5, 0x28, 0xde, 0x51, 0x3f, 0x4f, 0x43, 0xb1, 0x77, + 0x2e, 0x97, 0x3c, 0xa1, 0x14, 0x12, 0x9a, 0x66, 0xa2, 0x17, 0x7f, 0x51, 0x5b, 0xc9, 0x06, 0x15, + 0x9b, 0xb7, 0x83, 0x4d, 0x9d, 0x5b, 0xf7, 0xd6, 0xe6, 0x97, 0xae, 0xe4, 0x41, 0x7e, 0x0b, 0x4a, + 0x01, 0x2c, 0x33, 0x02, 0xac, 0x1b, 0x86, 0x4b, 0x3c, 0x4f, 0x1e, 0x2d, 0xbf, 0xcb, 0x2b, 0x6b, + 0xf6, 0xa7, 0xb2, 0xb4, 0x90, 0xc5, 0xa2, 0xa3, 0x1a, 0xb0, 0x39, 0x83, 0xe9, 0xe8, 0x2d, 0x28, + 0x38, 0xd3, 0xbe, 0xe6, 0x87, 0x67, 0xe6, 0x65, 0xc6, 0xa7, 0x56, 0xd3, 0xfe, 0xd8, 0x1c, 0xdc, + 0x23, 0x17, 0xfe, 0x60, 0x9c, 0x69, 0xff, 0x9e, 0x88, 0xa2, 0xf8, 0x95, 0x4c, 0xf4, 0x57, 0xce, + 0xa0, 0xe8, 0x6f, 0x0a, 0xf4, 0x63, 0x28, 0x05, 0xe9, 0x22, 0x28, 0xb8, 0x26, 0xe6, 0x19, 0xe9, + 0x3e, 0x34, 0x61, 0x3c, 0xdd, 0x33, 0x87, 0x16, 0x31, 0xb4, 0x90, 0x82, 0xf3, 0x5f, 0x2b, 0xe2, + 0x4d, 0xf1, 0xe1, 0xd0, 0xe7, 0xdf, 0xea, 0xbf, 0xd3, 0x50, 0xf4, 0x0b, 0x6b, 0xe8, 0xd5, 0xc8, + 0xbe, 0xab, 0x2d, 0x28, 0x2e, 0xf8, 0x8a, 0x61, 0x71, 0x2c, 0x3e, 0xd6, 0xcc, 0xe5, 0xc7, 0x9a, + 0x54, 0xe5, 0xf4, 0xeb, 0xcd, 0xb9, 0x4b, 0xd7, 0x9b, 0x5f, 0x06, 0x44, 0x6d, 0xaa, 0x8f, 0xb5, + 0x33, 0x9b, 0x9a, 0xd6, 0x50, 0x13, 0xc1, 0x16, 0x74, 0xa3, 0xce, 0xbf, 0x3c, 0xe0, 0x1f, 0x8e, + 0x79, 0xdc, 0x7f, 0x95, 0x86, 0x62, 0x90, 0x37, 0x2e, 0x5b, 0xeb, 0xba, 0x0e, 0x1b, 0x12, 0x1a, + 0x45, 0xb1, 0x4b, 0xf6, 0x82, 0xb2, 0x6b, 0x2e, 0x52, 0x76, 0x55, 0x18, 0xe6, 0x50, 0x9d, 0x27, + 0x4f, 0x71, 0x0b, 0x0a, 0xfa, 0xb7, 0xdf, 0x84, 0x72, 0xa4, 0xec, 0xc8, 0x4e, 0xde, 0x51, 0xfb, + 0xfd, 0x7a, 0x4a, 0x29, 0x7c, 0xfe, 0xe5, 0xcd, 0xec, 0x11, 0xf9, 0x94, 0xed, 0x59, 0xdc, 0x6e, + 0x75, 0xda, 0xad, 0x7b, 0xf5, 0xb4, 0x52, 0xfe, 0xfc, 0xcb, 0x9b, 0x05, 0x4c, 0x78, 0x61, 0xe3, + 0x76, 0x07, 0x2a, 0xd1, 0x55, 0x89, 0xa3, 0x2b, 0x82, 0xda, 0x3b, 0xf7, 0x8f, 0x0f, 0x0f, 0x5a, + 0xfb, 0xbd, 0xb6, 0xf6, 0xa0, 0xdb, 0x6b, 0xd7, 0xd3, 0xe8, 0x49, 0xb8, 0x7a, 0x78, 0xf0, 0xd3, + 0x4e, 0x4f, 0x6b, 0x1d, 0x1e, 0xb4, 0x8f, 0x7a, 0xda, 0x7e, 0xaf, 0xb7, 0xdf, 0xba, 0x57, 0xcf, + 0xec, 0xfd, 0x0e, 0x60, 0x73, 0xbf, 0xd9, 0x3a, 0x60, 0x99, 0xc1, 0x1c, 0xe8, 0xfc, 0x8a, 0xda, + 0x82, 0x1c, 0xbf, 0x84, 0x2e, 0x7d, 0xe4, 0x54, 0x96, 0x97, 0xbc, 0xd0, 0x5d, 0xc8, 0xf3, 0xfb, + 0x29, 0x5a, 0xfe, 0xea, 0xa9, 0xac, 0xa8, 0x81, 0xb1, 0xc1, 0xf0, 0xe3, 0xb1, 0xf4, 0x19, 0x54, + 0x59, 0x5e, 0x12, 0x43, 0x18, 0x4a, 0x21, 0xbf, 0x5d, 0xfd, 0x2c, 0xa8, 0xac, 0x01, 0x36, 0xe8, + 0x10, 0x0a, 0xfe, 0x95, 0x64, 0xd5, 0x43, 0xa5, 0xb2, 0xb2, 0x66, 0xc5, 0xc2, 0x25, 0xae, 0x8e, + 0xcb, 0x5f, 0x5d, 0x95, 0x15, 0x05, 0x38, 0x74, 0x00, 0x1b, 0x92, 0xb3, 0xad, 0x78, 0x7c, 0x54, + 0x56, 0xd5, 0xa0, 0x58, 0xd0, 0xc2, 0x4b, 0xf9, 0xea, 0xb7, 0x64, 0x65, 0x8d, 0xda, 0x22, 0xba, + 0x0f, 0x10, 0xb9, 0x28, 0xae, 0xf1, 0x48, 0xac, 0xac, 0x53, 0x33, 0x44, 0x5d, 0x28, 0x06, 0xbc, + 0x7d, 0xe5, 0x93, 0xad, 0xb2, 0xba, 0x78, 0x87, 0x1e, 0x42, 0x35, 0xce, 0x57, 0xd7, 0x7b, 0x88, + 0x55, 0xd6, 0xac, 0xca, 0x31, 0xff, 0x71, 0xf2, 0xba, 0xde, 0xc3, 0xac, 0xb2, 0x66, 0x91, 0x0e, + 0x7d, 0x0c, 0x57, 0xe6, 0xc9, 0xe5, 0xfa, 0xef, 0xb4, 0xca, 0x25, 0xca, 0x76, 0x68, 0x02, 0x68, + 0x01, 0x29, 0xbd, 0xc4, 0xb3, 0xad, 0x72, 0x99, 0x2a, 0x1e, 0x0b, 0x5d, 0x9c, 0xe9, 0xad, 0xf7, + 0x8c, 0xab, 0xac, 0x59, 0xcf, 0x6b, 0xb6, 0xbf, 0xfa, 0x76, 0x2b, 0xfd, 0xf5, 0xb7, 0x5b, 0xe9, + 0xbf, 0x7f, 0xbb, 0x95, 0xfe, 0xe2, 0xf1, 0x56, 0xea, 0xeb, 0xc7, 0x5b, 0xa9, 0xbf, 0x3c, 0xde, + 0x4a, 0xfd, 0xfc, 0xa5, 0xa1, 0x49, 0x47, 0xd3, 0xfe, 0xce, 0xc0, 0x9e, 0xec, 0x46, 0xff, 0x6f, + 0xb2, 0xe8, 0x3f, 0x30, 0xfd, 0x0d, 0x9e, 0xb4, 0x5e, 0xfb, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x4a, 0xe7, 0x9d, 0x11, 0x23, 0x23, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3158,6 +3287,7 @@ type ABCIApplicationClient interface { OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) + PreprocessTxs(ctx context.Context, in *RequestPreprocessTxs, opts ...grpc.CallOption) (*ResponsePreprocessTxs, error) } type aBCIApplicationClient struct { @@ -3294,6 +3424,15 @@ func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *Requ return out, nil } +func (c *aBCIApplicationClient) PreprocessTxs(ctx context.Context, in *RequestPreprocessTxs, opts ...grpc.CallOption) (*ResponsePreprocessTxs, error) { + out := new(ResponsePreprocessTxs) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/PreprocessTxs", 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) @@ -3310,6 +3449,7 @@ type ABCIApplicationServer interface { OfferSnapshot(context.Context, *RequestOfferSnapshot) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(context.Context, *RequestLoadSnapshotChunk) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(context.Context, *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) + PreprocessTxs(context.Context, *RequestPreprocessTxs) (*ResponsePreprocessTxs, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3358,6 +3498,9 @@ func (*UnimplementedABCIApplicationServer) LoadSnapshotChunk(ctx context.Context func (*UnimplementedABCIApplicationServer) ApplySnapshotChunk(ctx context.Context, req *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) { return nil, status.Errorf(codes.Unimplemented, "method ApplySnapshotChunk not implemented") } +func (*UnimplementedABCIApplicationServer) PreprocessTxs(ctx context.Context, req *RequestPreprocessTxs) (*ResponsePreprocessTxs, error) { + return nil, status.Errorf(codes.Unimplemented, "method PreprocessTxs not implemented") +} func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { s.RegisterService(&_ABCIApplication_serviceDesc, srv) @@ -3615,6 +3758,24 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +func _ABCIApplication_PreprocessTxs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestPreprocessTxs) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).PreprocessTxs(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/PreprocessTxs", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).PreprocessTxs(ctx, req.(*RequestPreprocessTxs)) + } + return interceptor(ctx, in, info, handler) +} + var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ ServiceName: "tendermint.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), @@ -3675,6 +3836,10 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "ApplySnapshotChunk", Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, + { + MethodName: "PreprocessTxs", + Handler: _ABCIApplication_PreprocessTxs_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "tendermint/abci/types.proto", @@ -4006,6 +4171,27 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } +func (m *Request_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.PreprocessTxs != nil { + { + size, err := m.PreprocessTxs.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x7a + } + return len(dAtA) - i, nil +} func (m *RequestEcho) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4171,12 +4357,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n16, err16 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err16 != nil { - return 0, err16 + 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 } - i -= n16 - i = encodeVarintTypes(dAtA, i, uint64(n16)) + i -= n17 + i = encodeVarintTypes(dAtA, i, uint64(n17)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4559,6 +4745,38 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } +func (m *RequestPreprocessTxs) 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 *RequestPreprocessTxs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestPreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Txs) > 0 { + for iNdEx := len(m.Txs) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Txs[iNdEx]) + copy(dAtA[i:], m.Txs[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Txs[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *Response) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4906,6 +5124,29 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } +func (m *Response_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.PreprocessTxs != nil { + { + size, err := m.PreprocessTxs.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 *ResponseException) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5623,20 +5864,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA39 := make([]byte, len(m.RefetchChunks)*10) - var j38 int + dAtA41 := make([]byte, len(m.RefetchChunks)*10) + var j40 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA39[j38] = uint8(uint64(num)&0x7f | 0x80) + dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j38++ + j40++ } - dAtA39[j38] = uint8(num) - j38++ + dAtA41[j40] = uint8(num) + j40++ } - i -= j38 - copy(dAtA[i:], dAtA39[:j38]) - i = encodeVarintTypes(dAtA, i, uint64(j38)) + i -= j40 + copy(dAtA[i:], dAtA41[:j40]) + i = encodeVarintTypes(dAtA, i, uint64(j40)) i-- dAtA[i] = 0x12 } @@ -5648,6 +5889,50 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *ResponsePreprocessTxs) 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 *ResponsePreprocessTxs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponsePreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Messages != nil { + { + size, err := m.Messages.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.Txs) > 0 { + for iNdEx := len(m.Txs) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Txs[iNdEx]) + copy(dAtA[i:], m.Txs[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Txs[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *LastCommitInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5972,12 +6257,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n43, err43 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err43 != nil { - return 0, err43 + n46, err46 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err46 != nil { + return 0, err46 } - i -= n43 - i = encodeVarintTypes(dAtA, i, uint64(n43)) + i -= n46 + i = encodeVarintTypes(dAtA, i, uint64(n46)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6246,6 +6531,18 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { } return n } +func (m *Request_PreprocessTxs) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PreprocessTxs != nil { + l = m.PreprocessTxs.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} func (m *RequestEcho) Size() (n int) { if m == nil { return 0 @@ -6483,6 +6780,21 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } +func (m *RequestPreprocessTxs) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Txs) > 0 { + for _, b := range m.Txs { + l = len(b) + n += 1 + l + sovTypes(uint64(l)) + } + } + return n +} + func (m *Response) Size() (n int) { if m == nil { return 0 @@ -6675,19 +6987,31 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { } return n } -func (m *ResponseException) Size() (n int) { +func (m *Response_PreprocessTxs) 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.PreprocessTxs != nil { + l = m.PreprocessTxs.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 @@ -7014,6 +7338,25 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } +func (m *ResponsePreprocessTxs) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Txs) > 0 { + for _, b := range m.Txs { + l = len(b) + n += 1 + l + sovTypes(uint64(l)) + } + } + if m.Messages != nil { + l = m.Messages.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *LastCommitInfo) Size() (n int) { if m == nil { return 0 @@ -7709,6 +8052,41 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_ApplySnapshotChunk{v} iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", 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 := &RequestPreprocessTxs{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_PreprocessTxs{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -9309,6 +9687,88 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *RequestPreprocessTxs) 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: RequestPreprocessTxs: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestPreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Txs", 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.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], 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 *Response) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9863,6 +10323,41 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_ApplySnapshotChunk{v} iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", 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 := &ResponsePreprocessTxs{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_PreprocessTxs{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -12125,6 +12620,124 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *ResponsePreprocessTxs) 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: ResponsePreprocessTxs: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponsePreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Txs", 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.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Messages", 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.Messages == nil { + m.Messages = &types1.Messages{} + } + if err := m.Messages.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 *LastCommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/internal/consensus/mempool_test.go b/internal/consensus/mempool_test.go index 5edec248a1..69a7cf1c9a 100644 --- a/internal/consensus/mempool_test.go +++ b/internal/consensus/mempool_test.go @@ -270,3 +270,8 @@ func (app *CounterApplication) Commit() abci.ResponseCommit { binary.BigEndian.PutUint64(hash, uint64(app.txCount)) return abci.ResponseCommit{Data: hash} } + +func (app *CounterApplication) PreprocessTxs( + req abci.RequestPreprocessTxs) abci.ResponsePreprocessTxs { + return abci.ResponsePreprocessTxs{Txs: req.Txs} +} diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go index 36d83231a1..51cc0254bb 100644 --- a/pkg/consts/consts.go +++ b/pkg/consts/consts.go @@ -30,10 +30,16 @@ const ( // Corresponds to AVAILABLE_DATA_ORIGINAL_SQUARE_MAX in the spec. // 128*128*256 = 4 Megabytes // TODO(ismail): settle on a proper max square + // if the square size is larger than this, the block producer will panic MaxSquareSize = 128 + // MaxShareCount is the maximum number of shares allowed in the original data square. + // if there are more shares than this, the block producer will panic. + MaxShareCount = MaxSquareSize * MaxSquareSize - // MinSquareSize depicts the smallest original square width. + // MinSquareSize depicts the smallest original square width. A square size smaller than this will + // cause block producer to panic MinSquareSize = 1 + // MinshareCount is the minimum shares required in an original data square. MinSharecount = MinSquareSize * MinSquareSize ) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 7126488d0a..9c66b1e434 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -35,6 +35,7 @@ message Request { RequestOfferSnapshot offer_snapshot = 12; RequestLoadSnapshotChunk load_snapshot_chunk = 13; RequestApplySnapshotChunk apply_snapshot_chunk = 14; + RequestPreprocessTxs preprocess_txs = 15; } } @@ -117,6 +118,10 @@ message RequestApplySnapshotChunk { string sender = 3; } +message RequestPreprocessTxs { + repeated bytes txs = 1; +} + //---------------------------------------- // Response types @@ -137,6 +142,7 @@ message Response { ResponseOfferSnapshot offer_snapshot = 13; ResponseLoadSnapshotChunk load_snapshot_chunk = 14; ResponseApplySnapshotChunk apply_snapshot_chunk = 15; + ResponsePreprocessTxs preprocess_txs = 16; } } @@ -262,6 +268,11 @@ message ResponseApplySnapshotChunk { } } +message ResponsePreprocessTxs { + repeated bytes txs = 1; + tendermint.types.Messages messages = 2; +} + //---------------------------------------- // Misc. @@ -366,4 +377,5 @@ service ABCIApplication { rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); + rpc PreprocessTxs(RequestPreprocessTxs) returns (ResponsePreprocessTxs); } diff --git a/proto/tendermint/blocksync/message_test.go b/proto/tendermint/blocksync/message_test.go index 4485ab4e31..232e2d3fb3 100644 --- a/proto/tendermint/blocksync/message_test.go +++ b/proto/tendermint/blocksync/message_test.go @@ -103,7 +103,7 @@ func TestBlockchainMessageVectors(t *testing.T) { BlockRequest: &bcproto.BlockRequest{Height: math.MaxInt64}}}, "0a0a08ffffffffffffffff7f"}, {"BlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_BlockResponse{ - BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a740a720a5b0a02080b1803220b088092b8c398feffffff012a0212003a20c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf96a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85512130a0b48656c6c6f20576f726c6412001a002200"}, + BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a740a720a5b0a02080b1803220b088092b8c398feffffff012a0212003a20269ece38583f42aaf53fdd3abe1f570ab9b0d08284d080900966040a29df504c6a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85512130a0b48656c6c6f20576f726c6412001a002200"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ NoBlockResponse: &bcproto.NoBlockResponse{Height: 1}}}, "12020801"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index cc74784f44..033a0ba114 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -132,7 +132,7 @@ message Messages { message Message { bytes namespace_id = 1; - bytes data = 2; + bytes data = 2; } // DataAvailabilityHeader contains the row and column roots of the erasure diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 8eb90daf39..12b4e3aae9 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -22,6 +22,8 @@ type AppConnConsensus interface { DeliverTxAsync(context.Context, types.RequestDeliverTx) (*abcicli.ReqRes, error) EndBlockSync(context.Context, types.RequestEndBlock) (*types.ResponseEndBlock, error) CommitSync(context.Context) (*types.ResponseCommit, error) + + PreprocessTxsSync(context.Context, types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) } type AppConnMempool interface { @@ -102,6 +104,13 @@ func (app *appConnConsensus) CommitSync(ctx context.Context) (*types.ResponseCom return app.appConn.CommitSync(ctx) } +func (app *appConnConsensus) PreprocessTxsSync( + ctx context.Context, + req types.RequestPreprocessTxs, +) (*types.ResponsePreprocessTxs, error) { + return app.appConn.PreprocessTxsSync(ctx, req) +} + //------------------------------------------------ // Implements AppConnMempool (subset of abcicli.Client) diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 03207706e0..8f629e6b21 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -146,6 +146,29 @@ func (_m *AppConnConsensus) InitChainSync(_a0 context.Context, _a1 types.Request return r0, r1 } +// PreprocessTxsSync provides a mock function with given fields: _a0, _a1 +func (_m *AppConnConsensus) PreprocessTxsSync(_a0 context.Context, _a1 types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponsePreprocessTxs + if rf, ok := ret.Get(0).(func(context.Context, types.RequestPreprocessTxs) *types.ResponsePreprocessTxs); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponsePreprocessTxs) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestPreprocessTxs) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // SetResponseCallback provides a mock function with given fields: _a0 func (_m *AppConnConsensus) SetResponseCallback(_a0 abcicli.Callback) { _m.Called(_a0) diff --git a/state/execution.go b/state/execution.go index 842ea134f0..b78c580334 100644 --- a/state/execution.go +++ b/state/execution.go @@ -120,6 +120,12 @@ func (blockExec *BlockExecutor) CreateProposalBlock( // Tx -> Txs, Message // https://github.com/tendermint/tendermint/issues/77 txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas) + l := len(txs) + bzs := make([][]byte, l) + for i := 0; i < l; i++ { + bzs[i] = txs[i] + } + // TODO(ismail): // 1. get those intermediate state roots & messages either from the // mempool or from the abci-app @@ -127,7 +133,33 @@ func (blockExec *BlockExecutor) CreateProposalBlock( // https://github.com/celestiaorg/celestia-specs/blob/53e5f350838f1e0785ad670704bf91dac2f4f5a3/specs/block_proposer.md#deciding-on-a-block-size // Here, we instead assume a fixed (max) square size instead. // 2. feed them into MakeBlock below: - return state.MakeBlock(height, txs, evidence, nil, nil, commit, proposerAddr) + processedBlockTxs, err := blockExec.proxyApp.PreprocessTxsSync(context.TODO(), abci.RequestPreprocessTxs{Txs: bzs}) + if err != nil { + // The App MUST ensure that only valid (and hence 'processable') + // Tx enter the mempool. Hence, at this point, we can't have any non-processable + // transaction causing an error. Also, the App can simply skip any Tx that could cause any + // kind of trouble. + // Either way, we can not recover in a meaningful way, unless we skip proposing + // this block, repair what caused the error and try again. + // Hence we panic on purpose for now. + panic(err) + } + + ppt := processedBlockTxs.GetTxs() + + pbmessages := processedBlockTxs.GetMessages() + + lp := len(ppt) + processedTxs := make(types.Txs, lp) + if lp > 0 { + for i := 0; i < l; i++ { + processedTxs[i] = ppt[i] + } + } + + messages := types.MessagesFromProto(pbmessages) + + return state.MakeBlock(height, processedTxs, evidence, nil, messages.MessagesList, commit, proposerAddr) } // ValidateBlock validates the given block against the given state. diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 26b10d32a9..69cffdbf9d 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -204,6 +204,12 @@ func (app *Application) ApplySnapshotChunk(req abci.RequestApplySnapshotChunk) a return abci.ResponseApplySnapshotChunk{Result: abci.ResponseApplySnapshotChunk_ACCEPT} } +// PreprocessTxs implements ABCI +func (app *Application) PreprocessTxs( + req abci.RequestPreprocessTxs) abci.ResponsePreprocessTxs { + return abci.ResponsePreprocessTxs{Txs: req.Txs} +} + // validatorUpdates generates a validator set update. func (app *Application) validatorUpdates(height uint64) (abci.ValidatorUpdates, error) { updates := app.cfg.ValidatorUpdates[fmt.Sprintf("%v", height)] diff --git a/types/block.go b/types/block.go index 7bfa26ee1a..c55957254c 100644 --- a/types/block.go +++ b/types/block.go @@ -21,6 +21,7 @@ import ( tmbytes "github.com/tendermint/tendermint/libs/bytes" tmmath "github.com/tendermint/tendermint/libs/math" "github.com/tendermint/tendermint/pkg/consts" + "github.com/tendermint/tendermint/pkg/da" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/version" ) @@ -1104,12 +1105,26 @@ type Data struct { // Hash returns the hash of the data func (data *Data) Hash() tmbytes.HexBytes { - if data == nil { - return (Txs{}).Hash() + if data.hash != nil { + return data.hash } - if data.hash == nil { - data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs + + // compute the data availability header + // todo(evan): add the non redundant shares back into the header + shares, _ := data.ComputeShares() + rawShares := shares.RawShares() + + squareSize := uint64(math.Sqrt(float64(len(shares)))) + + eds, err := da.ExtendShares(squareSize, rawShares) + if err != nil { + panic(err) } + + dah := da.NewDataAvailabilityHeader(eds) + + data.hash = dah.Hash() + return data.hash } @@ -1129,6 +1144,10 @@ func (data *Data) ComputeShares() (NamespacedShares, int) { msgShares := data.Messages.SplitIntoShares() curLen := len(txShares) + len(intermRootsShares) + len(evidenceShares) + len(msgShares) + if curLen > consts.MaxShareCount { + panic(fmt.Sprintf("Block data exceeds the max square size. Number of shares required: %d\n", curLen)) + } + // find the number of shares needed to create a square that has a power of // two width wantLen := paddedLen(curLen) @@ -1222,6 +1241,49 @@ type Message struct { Data []byte } +var ( + MessageEmpty = Message{} + MessagesEmpty = Messages{} +) + +func MessageFromProto(p *tmproto.Message) Message { + if p == nil { + return MessageEmpty + } + return Message{ + NamespaceID: p.NamespaceId, + Data: p.Data, + } +} + +func (msg Message) ToProto() *tmproto.Message { + return &tmproto.Message{ + NamespaceId: msg.NamespaceID, + Data: msg.Data, + } +} + +func MessagesFromProto(p *tmproto.Messages) Messages { + if p == nil { + return MessagesEmpty + } + + msgs := make([]Message, 0, len(p.MessagesList)) + + for i := 0; i < len(p.MessagesList); i++ { + msgs = append(msgs, MessageFromProto(p.MessagesList[i])) + } + return Messages{MessagesList: msgs} +} + +func (msgs Messages) ToProto() *tmproto.Messages { + pMsgList := make([]*tmproto.Message, len(msgs.MessagesList)) + for i, msg := range msgs.MessagesList { + pMsgList[i] = msg.ToProto() + } + return &tmproto.Messages{MessagesList: pMsgList} +} + // StringIndented returns an indented string representation of the transactions. func (data *Data) StringIndented(indent string) string { if data == nil { @@ -1268,6 +1330,10 @@ func (data *Data) ToProto() tmproto.Data { } tp.Evidence = *pevd + pmsgs := data.Messages.ToProto() + + tp.Messages = *pmsgs + return *tp } diff --git a/types/block_test.go b/types/block_test.go index d02f374d71..858d9890ce 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -639,13 +639,11 @@ func TestBlockProtoBuf(t *testing.T) { b1 := MakeBlock(h, []Tx{Tx([]byte{1})}, []Evidence{}, nil, nil, &Commit{Signatures: []CommitSig{}}) b1.ProposerAddress = tmrand.Bytes(crypto.AddressSize) - b2 := MakeBlock(h, []Tx{Tx([]byte{1})}, []Evidence{}, nil, nil, c1) - b2.ProposerAddress = tmrand.Bytes(crypto.AddressSize) evidenceTime := time.Date(2019, 1, 1, 0, 0, 0, 0, time.UTC) evi := NewMockDuplicateVoteEvidence(h, evidenceTime, "block-test-chain") - b2.Evidence = EvidenceData{Evidence: EvidenceList{evi}} - b2.EvidenceHash = b2.Evidence.Hash() - b2.Evidence.ByteSize() + b2 := MakeBlock(h, []Tx{Tx([]byte{1})}, []Evidence{evi}, nil, nil, c1) + b2.ProposerAddress = tmrand.Bytes(crypto.AddressSize) + b2.Data.Evidence.ByteSize() b3 := MakeBlock(h, []Tx{}, []Evidence{}, nil, nil, c1) b3.ProposerAddress = tmrand.Bytes(crypto.AddressSize) @@ -696,11 +694,14 @@ func TestDataProtoBuf(t *testing.T) { {"success data2", data2, true}, } for _, tc := range testCases { + firstHash := tc.data1.Hash() protoData := tc.data1.ToProto() d, err := DataFromProto(&protoData) if tc.expPass { require.NoError(t, err, tc.msg) + secondHash := d.Hash() require.EqualValues(t, tc.data1, &d, tc.msg) + require.Equal(t, firstHash, secondHash) } else { require.Error(t, err, tc.msg) } diff --git a/types/shares.go b/types/shares.go index 30a191183d..ac0b517009 100644 --- a/types/shares.go +++ b/types/shares.go @@ -46,9 +46,9 @@ func (tx Tx) MarshalDelimited() ([]byte, error) { // MarshalDelimited marshals the raw data (excluding the namespace) of this // message and prefixes it with the length of that encoding. -func (m Message) MarshalDelimited() ([]byte, error) { +func (msg Message) MarshalDelimited() ([]byte, error) { lenBuf := make([]byte, binary.MaxVarintLen64) - length := uint64(len(m.Data)) + length := uint64(len(msg.Data)) n := binary.PutUvarint(lenBuf, length) - return append(lenBuf[:n], m.Data...), nil + return append(lenBuf[:n], msg.Data...), nil }