diff --git a/abci/client/client.go b/abci/client/client.go index 8702b3ee65..59603690fd 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -58,7 +58,8 @@ type Client interface { OfferSnapshotSync(types.RequestOfferSnapshot) (*types.ResponseOfferSnapshot, error) LoadSnapshotChunkSync(types.RequestLoadSnapshotChunk) (*types.ResponseLoadSnapshotChunk, error) ApplySnapshotChunkSync(types.RequestApplySnapshotChunk) (*types.ResponseApplySnapshotChunk, error) - PreprocessTxsSync(types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) + PrepareProposalSync(types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) + ProcessProposalSync(types.RequestProcessProposal) (*types.ResponseProcessProposal, error) } //---------------------------------------- diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 2e956fee6c..dd792b12b9 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -6,7 +6,8 @@ import ( "sync" "time" - "golang.org/x/net/context" + "context" + "google.golang.org/grpc" "github.com/tendermint/tendermint/abci/types" @@ -302,13 +303,43 @@ func (cli *grpcClient) ApplySnapshotChunkAsync(params types.RequestApplySnapshot return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_ApplySnapshotChunk{ApplySnapshotChunk: res}}) } -func (cli *grpcClient) PreprocessTxsAsync(params types.RequestPreprocessTxs) *ReqRes { - req := types.ToRequestPreprocessTxs(params) - res, err := cli.client.PreprocessTxs(context.Background(), req.GetPreprocessTxs(), grpc.WaitForReady(true)) +func (cli *grpcClient) PrepareProposalAsync( + params types.RequestPrepareProposal, +) *ReqRes { + + req := types.ToRequestPrepareProposal(params) + res, err := cli.client.PrepareProposal(context.Background(), req.GetPrepareProposal(), grpc.WaitForReady(true)) if err != nil { - cli.StopForError(err) + return nil } - return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_PreprocessTxs{PreprocessTxs: res}}) + return cli.finishAsyncCall( + req, + &types.Response{ + Value: &types.Response_PrepareProposal{ + PrepareProposal: res, + }, + }, + ) +} + +func (cli *grpcClient) ProcessProposalAsync( + params types.RequestProcessProposal, +) *ReqRes { + + req := types.ToRequestProcessProposal(params) + res, err := cli.client.ProcessProposal(context.Background(), req.GetProcessProposal(), grpc.WaitForReady(true)) + if err != nil { + return nil + } + + return cli.finishAsyncCall( + req, + &types.Response{ + Value: &types.Response_ProcessProposal{ + ProcessProposal: res, + }, + }, + ) } // finishAsyncCall creates a ReqRes for an async call, and immediately populates it @@ -427,9 +458,17 @@ func (cli *grpcClient) ApplySnapshotChunkSync( return cli.finishSyncCall(reqres).GetApplySnapshotChunk(), cli.Error() } -func (cli *grpcClient) PreprocessTxsSync( - params types.RequestPreprocessTxs, -) (*types.ResponsePreprocessTxs, error) { - reqres := cli.PreprocessTxsAsync(params) - return reqres.Response.GetPreprocessTxs(), cli.Error() +func (cli *grpcClient) PrepareProposalSync( + params types.RequestPrepareProposal, +) (*types.ResponsePrepareProposal, error) { + + reqres := cli.PrepareProposalAsync(params) + return cli.finishSyncCall(reqres).GetPrepareProposal(), cli.Error() +} + +func (cli *grpcClient) ProcessProposalSync( + params types.RequestProcessProposal, +) (*types.ResponseProcessProposal, error) { + reqres := cli.ProcessProposalAsync(params) + return cli.finishSyncCall(reqres).GetProcessProposal(), cli.Error() } diff --git a/abci/client/local_client.go b/abci/client/local_client.go index ef85379ecd..8d55de8c75 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -207,15 +207,30 @@ func (app *localClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotCh ) } -func (app *localClient) PreprocessTxsAsync(req types.RequestPreprocessTxs) (*ReqRes, error) { +func (app *localClient) PrepareProposalAsync( + req types.RequestPrepareProposal, +) *ReqRes { app.mtx.Lock() defer app.mtx.Unlock() - res := app.Application.PreprocessTxs(req) + res := app.Application.PrepareProposal(req) return app.callback( - types.ToRequestPreprocessTxs(req), - types.ToResponsePreprocessTx(res), - ), nil + types.ToRequestPrepareProposal(req), + types.ToResponsePrepareProposal(res), + ) +} + +func (app *localClient) ProcessProposalAsync( + req types.RequestProcessProposal, +) *ReqRes { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.ProcessProposal(req) + return app.callback( + types.ToRequestProcessProposal(req), + types.ToResponseProcessProposal(res), + ) } //------------------------------------------------------- @@ -334,13 +349,24 @@ func (app *localClient) ApplySnapshotChunkSync( return &res, nil } -func (app *localClient) PreprocessTxsSync( - req types.RequestPreprocessTxs, -) (*types.ResponsePreprocessTxs, error) { +func (app *localClient) PrepareProposalSync( + req types.RequestPrepareProposal, +) (*types.ResponsePrepareProposal, error) { + + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.PrepareProposal(req) + return &res, nil +} + +func (app *localClient) ProcessProposalSync( + req types.RequestProcessProposal, +) (*types.ResponseProcessProposal, error) { app.mtx.Lock() defer app.mtx.Unlock() - res := app.Application.PreprocessTxs(req) + res := app.Application.ProcessProposal(req) return &res, nil } diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index ed0f1a95da..6240eb9c55 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -575,21 +575,44 @@ func (_m *Client) OnStop() { _m.Called() } -// PreprocessTxsSync provides a mock function with given fields: _a0 -func (_m *Client) PreprocessTxsSync(_a0 types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) { +// PrepareProposalSync provides a mock function with given fields: _a0 +func (_m *Client) PrepareProposalSync(_a0 types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) { ret := _m.Called(_a0) - var r0 *types.ResponsePreprocessTxs - if rf, ok := ret.Get(0).(func(types.RequestPreprocessTxs) *types.ResponsePreprocessTxs); ok { + var r0 *types.ResponsePrepareProposal + if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) *types.ResponsePrepareProposal); ok { r0 = rf(_a0) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*types.ResponsePreprocessTxs) + r0 = ret.Get(0).(*types.ResponsePrepareProposal) } } var r1 error - if rf, ok := ret.Get(1).(func(types.RequestPreprocessTxs) error); ok { + if rf, ok := ret.Get(1).(func(types.RequestPrepareProposal) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ProcessProposalSync provides a mock function with given fields: _a0 +func (_m *Client) ProcessProposalSync(_a0 types.RequestProcessProposal) (*types.ResponseProcessProposal, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseProcessProposal + if rf, ok := ret.Get(0).(func(types.RequestProcessProposal) *types.ResponseProcessProposal); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseProcessProposal) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestProcessProposal) error); ok { r1 = rf(_a0) } else { r1 = ret.Error(1) diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 19abc71af7..0dad1cea6b 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -15,7 +15,6 @@ import ( "github.com/tendermint/tendermint/libs/service" tmsync "github.com/tendermint/tendermint/libs/sync" "github.com/tendermint/tendermint/libs/timer" - "golang.org/x/net/context" ) const ( @@ -280,11 +279,17 @@ func (cli *socketClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotC return cli.queueRequest(types.ToRequestApplySnapshotChunk(req)) } -func (cli *socketClient) PreprocessTxsAsync(ctx context.Context, req types.RequestPreprocessTxs) *ReqRes { - return cli.queueRequest(types.ToRequestPreprocessTxs(req)) +func (cli *socketClient) PrepareProposalAsync( + req types.RequestPrepareProposal, +) *ReqRes { + return cli.queueRequest(types.ToRequestPrepareProposal(req)) } -//---------------------------------------- +func (cli *socketClient) ProcessProposalAsync( + req types.RequestProcessProposal, +) *ReqRes { + return cli.queueRequest(types.ToRequestProcessProposal(req)) +} func (cli *socketClient) FlushSync() error { reqRes := cli.queueRequest(types.ToRequestFlush()) @@ -422,14 +427,21 @@ func (cli *socketClient) ApplySnapshotChunkSync( return reqres.Response.GetApplySnapshotChunk(), cli.Error() } -func (cli *socketClient) PreprocessTxsSync( - req types.RequestPreprocessTxs, -) (*types.ResponsePreprocessTxs, error) { - reqres := cli.queueRequest(types.ToRequestPreprocessTxs(req)) - if err := cli.FlushSync(); err != nil { - return nil, err - } - return reqres.Response.GetPreprocessTxs(), nil +func (cli *socketClient) PrepareProposalSync( + req types.RequestPrepareProposal, +) (*types.ResponsePrepareProposal, error) { + + reqres := cli.queueRequest(types.ToRequestPrepareProposal(req)) + return reqres.Response.GetPrepareProposal(), nil +} + +func (cli *socketClient) ProcessProposalSync( + req types.RequestProcessProposal, +) (*types.ResponseProcessProposal, error) { + + reqres := cli.queueRequest(types.ToRequestProcessProposal(req)) + + return reqres.Response.GetProcessProposal(), nil } //---------------------------------------- @@ -507,8 +519,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) + case *types.Request_PrepareProposal: + _, ok = res.Value.(*types.Response_PrepareProposal) } return ok } diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 5b2538f817..937b2992f5 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -171,7 +171,17 @@ 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} +func (app *Application) PrepareProposal(req types.RequestPrepareProposal) types.ResponsePrepareProposal { + return types.ResponsePrepareProposal{ + BlockData: req.BlockData, + } +} + +func (app *Application) ProcessProposal(req types.RequestProcessProposal) types.ResponseProcessProposal { + for _, tx := range req.BlockData.Txs { + if len(tx) == 0 { + return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_REJECT} + } + } + return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_ACCEPT} } diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index ed2231d3d5..0456202e6c 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -170,9 +170,19 @@ 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} +func (app *PersistentKVStoreApplication) PrepareProposal( + req types.RequestPrepareProposal) types.ResponsePrepareProposal { + return types.ResponsePrepareProposal{BlockData: req.BlockData} +} + +func (app *PersistentKVStoreApplication) ProcessProposal( + req types.RequestProcessProposal) types.ResponseProcessProposal { + for _, tx := range req.BlockData.Txs { + if len(tx) == 0 { + return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_REJECT} + } + } + return types.ResponseProcessProposal{Result: types.ResponseProcessProposal_ACCEPT} } //--------------------------------------------- diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 700e810669..d816aa40cf 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -230,15 +230,15 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types case *types.Request_OfferSnapshot: res := s.app.OfferSnapshot(*r.OfferSnapshot) responses <- types.ToResponseOfferSnapshot(res) + case *types.Request_PrepareProposal: + res := s.app.PrepareProposal(*r.PrepareProposal) + responses <- types.ToResponsePrepareProposal(res) case *types.Request_LoadSnapshotChunk: res := s.app.LoadSnapshotChunk(*r.LoadSnapshotChunk) responses <- types.ToResponseLoadSnapshotChunk(res) 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 7f1517c872..870cd9d5a1 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -8,7 +8,6 @@ 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 @@ -19,12 +18,13 @@ 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 - PreprocessTxs(RequestPreprocessTxs) ResponsePreprocessTxs // State machine preprocessing of txs + InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore + PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal + ProcessProposal(RequestProcessProposal) ResponseProcessProposal + 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 // State Sync Connection ListSnapshots(RequestListSnapshots) ResponseListSnapshots // List available snapshots @@ -97,8 +97,12 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons return ResponseApplySnapshotChunk{} } -func (BaseApplication) PreprocessTxs(req RequestPreprocessTxs) ResponsePreprocessTxs { - return ResponsePreprocessTxs{Txs: req.Txs} +func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal { + return ResponsePrepareProposal{BlockData: req.BlockData} +} + +func (BaseApplication) ProcessProposal(req RequestProcessProposal) ResponseProcessProposal { + return ResponseProcessProposal{Result: ResponseProcessProposal_ACCEPT} } //------------------------------------------------------- @@ -189,8 +193,14 @@ func (app *GRPCApplication) ApplySnapshotChunk( return &res, nil } -func (app *GRPCApplication) PreprocessTxs( - ctx context.Context, req *RequestPreprocessTxs) (*ResponsePreprocessTxs, error) { - res := app.app.PreprocessTxs(*req) +func (app *GRPCApplication) PrepareProposal( + ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { + res := app.app.PrepareProposal(*req) + return &res, nil +} + +func (app *GRPCApplication) ProcessProposal( + ctx context.Context, req *RequestProcessProposal) (*ResponseProcessProposal, error) { + res := app.app.ProcessProposal(*req) return &res, nil } diff --git a/abci/types/messages.go b/abci/types/messages.go index 06754be814..4314b5bfc6 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -159,9 +159,15 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request { } } -func ToRequestPreprocessTxs(res RequestPreprocessTxs) *Request { +func ToRequestPrepareProposal(req RequestPrepareProposal) *Request { return &Request{ - Value: &Request_PreprocessTxs{&res}, + Value: &Request_PrepareProposal{&req}, + } +} + +func ToRequestProcessProposal(req RequestProcessProposal) *Request { + return &Request{ + Value: &Request_ProcessProposal{&req}, } } @@ -263,8 +269,14 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response { } } -func ToResponsePreprocessTx(res ResponsePreprocessTxs) *Response { +func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response { + return &Response{ + Value: &Response_PrepareProposal{&res}, + } +} + +func ToResponseProcessProposal(res ResponseProcessProposal) *Response { return &Response{ - Value: &Response_PreprocessTxs{&res}, + Value: &Response_ProcessProposal{&res}, } } diff --git a/abci/types/result.go b/abci/types/result.go index e8916960f4..c14f68c3dc 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -41,6 +41,21 @@ func (r ResponseQuery) IsErr() bool { return r.Code != CodeTypeOK } +// IsUnknown returns true if Code is Unknown +func (r ResponseProcessProposal) IsUnknown() bool { + return r.Result == ResponseProcessProposal_UNKNOWN +} + +// IsOK returns true if Code is OK +func (r ResponseProcessProposal) IsOK() bool { + return r.Result == ResponseProcessProposal_ACCEPT +} + +// IsErr returns true if Code is something other than OK. +func (r ResponseProcessProposal) IsErr() bool { + return r.Result != ResponseProcessProposal_ACCEPT +} + //--------------------------------------------------------------------------- // override JSON marshalling so we emit defaults (ie. disable omitempty) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 7215e34d94..32a7cc12b7 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{31, 0} + return fileDescriptor_252557cfdd89a31a, []int{32, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,35 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33, 0} + return fileDescriptor_252557cfdd89a31a, []int{34, 0} +} + +type ResponseProcessProposal_Result int32 + +const ( + ResponseProcessProposal_UNKNOWN ResponseProcessProposal_Result = 0 + ResponseProcessProposal_ACCEPT ResponseProcessProposal_Result = 1 + ResponseProcessProposal_REJECT ResponseProcessProposal_Result = 2 +) + +var ResponseProcessProposal_Result_name = map[int32]string{ + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "REJECT", +} + +var ResponseProcessProposal_Result_value = map[string]int32{ + "UNKNOWN": 0, + "ACCEPT": 1, + "REJECT": 2, +} + +func (x ResponseProcessProposal_Result) String() string { + return proto.EnumName(ResponseProcessProposal_Result_name, int32(x)) +} + +func (ResponseProcessProposal_Result) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36, 0} } type Request struct { @@ -177,7 +205,8 @@ type Request struct { // *Request_OfferSnapshot // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk - // *Request_PreprocessTxs + // *Request_PrepareProposal + // *Request_ProcessProposal Value isRequest_Value `protobuf_oneof:"value"` } @@ -265,8 +294,11 @@ type Request_LoadSnapshotChunk struct { type Request_ApplySnapshotChunk struct { ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } -type Request_PreprocessTxs struct { - PreprocessTxs *RequestPreprocessTxs `protobuf:"bytes,16,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +type Request_PrepareProposal struct { + PrepareProposal *RequestPrepareProposal `protobuf:"bytes,16,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} +type Request_ProcessProposal struct { + ProcessProposal *RequestProcessProposal `protobuf:"bytes,17,opt,name=process_proposal,json=processProposal,proto3,oneof" json:"process_proposal,omitempty"` } func (*Request_Echo) isRequest_Value() {} @@ -284,7 +316,8 @@ 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 (*Request_PrepareProposal) isRequest_Value() {} +func (*Request_ProcessProposal) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -398,9 +431,16 @@ func (m *Request) GetApplySnapshotChunk() *RequestApplySnapshotChunk { return nil } -func (m *Request) GetPreprocessTxs() *RequestPreprocessTxs { - if x, ok := m.GetValue().(*Request_PreprocessTxs); ok { - return x.PreprocessTxs +func (m *Request) GetPrepareProposal() *RequestPrepareProposal { + if x, ok := m.GetValue().(*Request_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + +func (m *Request) GetProcessProposal() *RequestProcessProposal { + if x, ok := m.GetValue().(*Request_ProcessProposal); ok { + return x.ProcessProposal } return nil } @@ -423,7 +463,8 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_OfferSnapshot)(nil), (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), - (*Request_PreprocessTxs)(nil), + (*Request_PrepareProposal)(nil), + (*Request_ProcessProposal)(nil), } } @@ -1228,22 +1269,79 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } -type RequestPreprocessTxs struct { - Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` +type RequestPrepareProposal struct { + // block_data is an array of transactions that will be included in a block, + // sent to the app for possible modifications. + // applications can not exceed the size of the data passed to it. + BlockData *types1.Data `protobuf:"bytes,1,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + // If an application decides to populate block_data with extra information, they can not exceed this value. + BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` } -func (m *RequestPreprocessTxs) Reset() { *m = RequestPreprocessTxs{} } -func (m *RequestPreprocessTxs) String() string { return proto.CompactTextString(m) } -func (*RequestPreprocessTxs) ProtoMessage() {} -func (*RequestPreprocessTxs) Descriptor() ([]byte, []int) { +func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } +func (m *RequestPrepareProposal) String() string { return proto.CompactTextString(m) } +func (*RequestPrepareProposal) ProtoMessage() {} +func (*RequestPrepareProposal) Descriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{16} } -func (m *RequestPreprocessTxs) XXX_Unmarshal(b []byte) error { +func (m *RequestPrepareProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestPrepareProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestPrepareProposal.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 *RequestPrepareProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestPrepareProposal.Merge(m, src) +} +func (m *RequestPrepareProposal) XXX_Size() int { + return m.Size() +} +func (m *RequestPrepareProposal) XXX_DiscardUnknown() { + xxx_messageInfo_RequestPrepareProposal.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestPrepareProposal proto.InternalMessageInfo + +func (m *RequestPrepareProposal) GetBlockData() *types1.Data { + if m != nil { + return m.BlockData + } + return nil +} + +func (m *RequestPrepareProposal) GetBlockDataSize() int64 { + if m != nil { + return m.BlockDataSize + } + return 0 +} + +type RequestProcessProposal struct { + Header types1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` + BlockData *types1.Data `protobuf:"bytes,2,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` +} + +func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } +func (m *RequestProcessProposal) String() string { return proto.CompactTextString(m) } +func (*RequestProcessProposal) ProtoMessage() {} +func (*RequestProcessProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{17} +} +func (m *RequestProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *RequestPreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *RequestProcessProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_RequestPreprocessTxs.Marshal(b, m, deterministic) + return xxx_messageInfo_RequestProcessProposal.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1253,21 +1351,28 @@ func (m *RequestPreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *RequestPreprocessTxs) XXX_Merge(src proto.Message) { - xxx_messageInfo_RequestPreprocessTxs.Merge(m, src) +func (m *RequestProcessProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestProcessProposal.Merge(m, src) } -func (m *RequestPreprocessTxs) XXX_Size() int { +func (m *RequestProcessProposal) XXX_Size() int { return m.Size() } -func (m *RequestPreprocessTxs) XXX_DiscardUnknown() { - xxx_messageInfo_RequestPreprocessTxs.DiscardUnknown(m) +func (m *RequestProcessProposal) XXX_DiscardUnknown() { + xxx_messageInfo_RequestProcessProposal.DiscardUnknown(m) } -var xxx_messageInfo_RequestPreprocessTxs proto.InternalMessageInfo +var xxx_messageInfo_RequestProcessProposal proto.InternalMessageInfo + +func (m *RequestProcessProposal) GetHeader() types1.Header { + if m != nil { + return m.Header + } + return types1.Header{} +} -func (m *RequestPreprocessTxs) GetTxs() [][]byte { +func (m *RequestProcessProposal) GetBlockData() *types1.Data { if m != nil { - return m.Txs + return m.BlockData } return nil } @@ -1290,7 +1395,8 @@ type Response struct { // *Response_OfferSnapshot // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk - // *Response_PreprocessTxs + // *Response_PrepareProposal + // *Response_ProcessProposal Value isResponse_Value `protobuf_oneof:"value"` } @@ -1298,7 +1404,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{17} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1381,8 +1487,11 @@ type Response_LoadSnapshotChunk struct { type Response_ApplySnapshotChunk struct { ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,16,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } -type Response_PreprocessTxs struct { - PreprocessTxs *ResponsePreprocessTxs `protobuf:"bytes,17,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +type Response_PrepareProposal struct { + PrepareProposal *ResponsePrepareProposal `protobuf:"bytes,17,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} +type Response_ProcessProposal struct { + ProcessProposal *ResponseProcessProposal `protobuf:"bytes,18,opt,name=process_proposal,json=processProposal,proto3,oneof" json:"process_proposal,omitempty"` } func (*Response_Exception) isResponse_Value() {} @@ -1401,7 +1510,8 @@ 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 (*Response_PrepareProposal) isResponse_Value() {} +func (*Response_ProcessProposal) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1522,9 +1632,16 @@ func (m *Response) GetApplySnapshotChunk() *ResponseApplySnapshotChunk { return nil } -func (m *Response) GetPreprocessTxs() *ResponsePreprocessTxs { - if x, ok := m.GetValue().(*Response_PreprocessTxs); ok { - return x.PreprocessTxs +func (m *Response) GetPrepareProposal() *ResponsePrepareProposal { + if x, ok := m.GetValue().(*Response_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + +func (m *Response) GetProcessProposal() *ResponseProcessProposal { + if x, ok := m.GetValue().(*Response_ProcessProposal); ok { + return x.ProcessProposal } return nil } @@ -1548,7 +1665,8 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_OfferSnapshot)(nil), (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), - (*Response_PreprocessTxs)(nil), + (*Response_PrepareProposal)(nil), + (*Response_ProcessProposal)(nil), } } @@ -1561,7 +1679,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{18} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1605,7 +1723,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{19} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1648,7 +1766,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{20} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1689,7 +1807,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{21} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1765,7 +1883,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1825,7 +1943,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{23} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1892,7 +2010,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{24} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1992,7 +2110,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{25} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2043,7 +2161,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{26} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2143,7 +2261,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{27} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2238,7 +2356,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{28} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2298,7 +2416,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{29} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2349,7 +2467,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{30} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2393,7 +2511,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{31} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2437,7 +2555,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{32} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2483,7 +2601,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{33} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2533,23 +2651,22 @@ 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"` +type ResponsePrepareProposal struct { + BlockData *types1.Data `protobuf:"bytes,1,opt,name=block_data,json=blockData,proto3" json:"block_data,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{34} +func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal{} } +func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } +func (*ResponsePrepareProposal) ProtoMessage() {} +func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{35} } -func (m *ResponsePreprocessTxs) XXX_Unmarshal(b []byte) error { +func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ResponsePreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *ResponsePrepareProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ResponsePreprocessTxs.Marshal(b, m, deterministic) + return xxx_messageInfo_ResponsePrepareProposal.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2559,28 +2676,73 @@ func (m *ResponsePreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *ResponsePreprocessTxs) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResponsePreprocessTxs.Merge(m, src) +func (m *ResponsePrepareProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponsePrepareProposal.Merge(m, src) } -func (m *ResponsePreprocessTxs) XXX_Size() int { +func (m *ResponsePrepareProposal) XXX_Size() int { return m.Size() } -func (m *ResponsePreprocessTxs) XXX_DiscardUnknown() { - xxx_messageInfo_ResponsePreprocessTxs.DiscardUnknown(m) +func (m *ResponsePrepareProposal) XXX_DiscardUnknown() { + xxx_messageInfo_ResponsePrepareProposal.DiscardUnknown(m) } -var xxx_messageInfo_ResponsePreprocessTxs proto.InternalMessageInfo +var xxx_messageInfo_ResponsePrepareProposal proto.InternalMessageInfo -func (m *ResponsePreprocessTxs) GetTxs() [][]byte { +func (m *ResponsePrepareProposal) GetBlockData() *types1.Data { if m != nil { - return m.Txs + return m.BlockData } return nil } -func (m *ResponsePreprocessTxs) GetMessages() *types1.Messages { +type ResponseProcessProposal struct { + Result ResponseProcessProposal_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseProcessProposal_Result" json:"result,omitempty"` + Evidence [][]byte `protobuf:"bytes,2,rep,name=evidence,proto3" json:"evidence,omitempty"` +} + +func (m *ResponseProcessProposal) Reset() { *m = ResponseProcessProposal{} } +func (m *ResponseProcessProposal) String() string { return proto.CompactTextString(m) } +func (*ResponseProcessProposal) ProtoMessage() {} +func (*ResponseProcessProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36} +} +func (m *ResponseProcessProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseProcessProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseProcessProposal.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 *ResponseProcessProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseProcessProposal.Merge(m, src) +} +func (m *ResponseProcessProposal) XXX_Size() int { + return m.Size() +} +func (m *ResponseProcessProposal) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseProcessProposal.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseProcessProposal proto.InternalMessageInfo + +func (m *ResponseProcessProposal) GetResult() ResponseProcessProposal_Result { + if m != nil { + return m.Result + } + return ResponseProcessProposal_UNKNOWN +} + +func (m *ResponseProcessProposal) GetEvidence() [][]byte { if m != nil { - return m.Messages + return m.Evidence } return nil } @@ -2598,7 +2760,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2667,7 +2829,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2719,7 +2881,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{37} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2774,7 +2936,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{38} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2828,7 +2990,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{39} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2893,7 +3055,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{40} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2968,7 +3130,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{41} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3021,7 +3183,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{42} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3074,7 +3236,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{43} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3135,7 +3297,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{44} + return fileDescriptor_252557cfdd89a31a, []int{46} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3211,7 +3373,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{45} + return fileDescriptor_252557cfdd89a31a, []int{47} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3280,6 +3442,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseProcessProposal_Result", ResponseProcessProposal_Result_name, ResponseProcessProposal_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3296,7 +3459,8 @@ 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((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") + proto.RegisterType((*RequestProcessProposal)(nil), "tendermint.abci.RequestProcessProposal") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") @@ -3314,7 +3478,8 @@ 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((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") + proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") @@ -3331,186 +3496,193 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2850 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0xf5, 0xd7, 0xfb, 0x71, 0x6d, 0x3d, 0x5c, 0x33, 0x0c, 0xa2, 0x19, 0xec, 0xa1, 0xe7, 0xc0, 0x7f, - 0x18, 0xc0, 0xfe, 0x63, 0x0e, 0x13, 0x08, 0x24, 0x60, 0x09, 0x0d, 0x32, 0x36, 0x96, 0xd3, 0xd6, - 0x0c, 0x79, 0x31, 0x4d, 0x49, 0x2a, 0x4b, 0xcd, 0x48, 0xdd, 0x4d, 0x77, 0xc9, 0xd8, 0x2c, 0xf3, - 0xd8, 0x90, 0x0d, 0xcb, 0x6c, 0xf8, 0x0c, 0xd9, 0xe5, 0x64, 0x95, 0x4d, 0x36, 0x9c, 0x93, 0x0d, - 0xcb, 0xac, 0x48, 0xc2, 0xec, 0xf2, 0x05, 0xb2, 0xca, 0x49, 0x4e, 0x3d, 0xfa, 0x25, 0xa9, 0x25, - 0x19, 0xb2, 0xcb, 0xae, 0xea, 0xf6, 0xbd, 0xb7, 0x55, 0xb7, 0xab, 0x7e, 0xf7, 0x77, 0x6f, 0x09, - 0x9e, 0xa4, 0xc4, 0xec, 0x13, 0x67, 0x6c, 0x98, 0x74, 0x07, 0x77, 0x7b, 0xc6, 0x0e, 0xbd, 0xb0, - 0x89, 0xbb, 0x6d, 0x3b, 0x16, 0xb5, 0x50, 0x25, 0x78, 0xb8, 0xcd, 0x1e, 0x2a, 0x4f, 0x85, 0xb4, - 0x7b, 0xce, 0x85, 0x4d, 0xad, 0x1d, 0xdb, 0xb1, 0xac, 0x53, 0xa1, 0xaf, 0x5c, 0x0f, 0x3d, 0xe6, - 0x7e, 0xc2, 0xde, 0x22, 0x4f, 0xa5, 0xf1, 0x43, 0x72, 0xe1, 0x3d, 0x7d, 0x6a, 0xc6, 0xd6, 0xc6, - 0x0e, 0x1e, 0x7b, 0x8f, 0xb7, 0x06, 0x96, 0x35, 0x18, 0x91, 0x1d, 0x3e, 0xeb, 0x4e, 0x4e, 0x77, - 0xa8, 0x31, 0x26, 0x2e, 0xc5, 0x63, 0x5b, 0x2a, 0x5c, 0x1d, 0x58, 0x03, 0x8b, 0x0f, 0x77, 0xd8, - 0x48, 0x48, 0xd5, 0xbf, 0x17, 0x20, 0xaf, 0x91, 0x8f, 0x27, 0xc4, 0xa5, 0x68, 0x17, 0x32, 0xa4, - 0x37, 0xb4, 0x6a, 0xc9, 0x1b, 0xc9, 0x5b, 0x6b, 0xbb, 0xd7, 0xb7, 0xa7, 0x16, 0xb7, 0x2d, 0xf5, - 0x9a, 0xbd, 0xa1, 0xd5, 0x4a, 0x68, 0x5c, 0x17, 0xbd, 0x02, 0xd9, 0xd3, 0xd1, 0xc4, 0x1d, 0xd6, - 0x52, 0xdc, 0xe8, 0xa9, 0x38, 0xa3, 0xbb, 0x4c, 0xa9, 0x95, 0xd0, 0x84, 0x36, 0x7b, 0x95, 0x61, - 0x9e, 0x5a, 0xb5, 0xf4, 0xe2, 0x57, 0xed, 0x9b, 0xa7, 0xfc, 0x55, 0x4c, 0x17, 0xd5, 0x01, 0x5c, - 0x42, 0x75, 0xcb, 0xa6, 0x86, 0x65, 0xd6, 0x32, 0xdc, 0xf2, 0xe9, 0x38, 0xcb, 0x13, 0x42, 0xdb, - 0x5c, 0xb1, 0x95, 0xd0, 0x8a, 0xae, 0x37, 0x61, 0x3e, 0x0c, 0xd3, 0xa0, 0x7a, 0x6f, 0x88, 0x0d, - 0xb3, 0x96, 0x5d, 0xec, 0x63, 0xdf, 0x34, 0x68, 0x83, 0x29, 0x32, 0x1f, 0x86, 0x37, 0x61, 0x4b, - 0xfe, 0x78, 0x42, 0x9c, 0x8b, 0x5a, 0x6e, 0xf1, 0x92, 0x7f, 0xc4, 0x94, 0xd8, 0x92, 0xb9, 0x36, - 0x6a, 0xc2, 0x5a, 0x97, 0x0c, 0x0c, 0x53, 0xef, 0x8e, 0xac, 0xde, 0xc3, 0x5a, 0x9e, 0x1b, 0xab, - 0x71, 0xc6, 0x75, 0xa6, 0x5a, 0x67, 0x9a, 0xad, 0x84, 0x06, 0x5d, 0x7f, 0x86, 0xde, 0x80, 0x42, - 0x6f, 0x48, 0x7a, 0x0f, 0x75, 0x7a, 0x5e, 0x2b, 0x70, 0x1f, 0x5b, 0x71, 0x3e, 0x1a, 0x4c, 0xaf, - 0x73, 0xde, 0x4a, 0x68, 0xf9, 0x9e, 0x18, 0xb2, 0xf5, 0xf7, 0xc9, 0xc8, 0x38, 0x23, 0x0e, 0xb3, - 0x2f, 0x2e, 0x5e, 0xff, 0xdb, 0x42, 0x93, 0x7b, 0x28, 0xf6, 0xbd, 0x09, 0x7a, 0x13, 0x8a, 0xc4, - 0xec, 0xcb, 0x65, 0x00, 0x77, 0x71, 0x23, 0x76, 0xaf, 0x98, 0x7d, 0x6f, 0x11, 0x05, 0x22, 0xc7, - 0xe8, 0x55, 0xc8, 0xf5, 0xac, 0xf1, 0xd8, 0xa0, 0xb5, 0x35, 0x6e, 0xbd, 0x19, 0xbb, 0x00, 0xae, - 0xd5, 0x4a, 0x68, 0x52, 0x1f, 0x1d, 0x41, 0x79, 0x64, 0xb8, 0x54, 0x77, 0x4d, 0x6c, 0xbb, 0x43, - 0x8b, 0xba, 0xb5, 0x75, 0xee, 0xe1, 0x99, 0x38, 0x0f, 0x87, 0x86, 0x4b, 0x4f, 0x3c, 0xe5, 0x56, - 0x42, 0x2b, 0x8d, 0xc2, 0x02, 0xe6, 0xcf, 0x3a, 0x3d, 0x25, 0x8e, 0xef, 0xb0, 0x56, 0x5a, 0xec, - 0xaf, 0xcd, 0xb4, 0x3d, 0x7b, 0xe6, 0xcf, 0x0a, 0x0b, 0xd0, 0xcf, 0xe0, 0xca, 0xc8, 0xc2, 0x7d, - 0xdf, 0x9d, 0xde, 0x1b, 0x4e, 0xcc, 0x87, 0xb5, 0x32, 0x77, 0xfa, 0x5c, 0xec, 0x8f, 0xb4, 0x70, - 0xdf, 0x73, 0xd1, 0x60, 0x06, 0xad, 0x84, 0xb6, 0x31, 0x9a, 0x16, 0xa2, 0x07, 0x70, 0x15, 0xdb, - 0xf6, 0xe8, 0x62, 0xda, 0x7b, 0x85, 0x7b, 0xbf, 0x1d, 0xe7, 0x7d, 0x8f, 0xd9, 0x4c, 0xbb, 0x47, - 0x78, 0x46, 0xca, 0x82, 0x61, 0x3b, 0xc4, 0x76, 0xac, 0x1e, 0x71, 0x5d, 0x9d, 0x9e, 0xbb, 0xb5, - 0xea, 0xe2, 0x60, 0x1c, 0xfb, 0xda, 0x9d, 0x73, 0x1e, 0x5c, 0x3b, 0x2c, 0xa8, 0xe7, 0x21, 0x7b, - 0x86, 0x47, 0x13, 0xa2, 0xfe, 0x1f, 0xac, 0x85, 0xa0, 0x03, 0xd5, 0x20, 0x3f, 0x26, 0xae, 0x8b, - 0x07, 0x84, 0x23, 0x4d, 0x51, 0xf3, 0xa6, 0x6a, 0x19, 0xd6, 0xc3, 0x70, 0xa1, 0x8e, 0x7d, 0x43, - 0x06, 0x04, 0xcc, 0xf0, 0x8c, 0x38, 0x2e, 0x3b, 0xfd, 0xd2, 0x50, 0x4e, 0xd1, 0x4d, 0x28, 0xf1, - 0xed, 0xa8, 0x7b, 0xcf, 0x19, 0x1a, 0x65, 0xb4, 0x75, 0x2e, 0xbc, 0x2f, 0x95, 0xb6, 0x60, 0xcd, - 0xde, 0xb5, 0x7d, 0x95, 0x34, 0x57, 0x01, 0x7b, 0xd7, 0x96, 0x0a, 0xea, 0xf7, 0xa1, 0x3a, 0x8d, - 0x1e, 0xa8, 0x0a, 0xe9, 0x87, 0xe4, 0x42, 0xbe, 0x8f, 0x0d, 0xd1, 0x55, 0xb9, 0x2c, 0xfe, 0x8e, - 0xa2, 0x26, 0xd7, 0xf8, 0xe7, 0x94, 0x6f, 0xec, 0xc3, 0x06, 0x7a, 0x15, 0x32, 0x0c, 0x85, 0x25, - 0xa0, 0x2a, 0xdb, 0x02, 0xa2, 0xb7, 0x3d, 0x88, 0xde, 0xee, 0x78, 0x10, 0x5d, 0x2f, 0x7c, 0xf9, - 0xf5, 0x56, 0xe2, 0xf3, 0xbf, 0x6e, 0x25, 0x35, 0x6e, 0x81, 0x9e, 0x60, 0xa7, 0x1c, 0x1b, 0xa6, - 0x6e, 0xf4, 0xe5, 0x7b, 0xf2, 0x7c, 0xbe, 0xdf, 0x47, 0x07, 0x50, 0xed, 0x59, 0xa6, 0x4b, 0x4c, - 0x77, 0xe2, 0xea, 0x22, 0x05, 0x48, 0x18, 0x9d, 0x3d, 0x85, 0x0d, 0x4f, 0xf1, 0x98, 0xeb, 0x69, - 0x95, 0x5e, 0x54, 0x80, 0xee, 0x02, 0x9c, 0xe1, 0x91, 0xd1, 0xc7, 0xd4, 0x72, 0xdc, 0x5a, 0xe6, - 0x46, 0x7a, 0xae, 0x9b, 0xfb, 0x9e, 0xca, 0x3d, 0xbb, 0x8f, 0x29, 0xa9, 0x67, 0xd8, 0xaf, 0xd5, - 0x42, 0x96, 0xe8, 0x59, 0xa8, 0x60, 0xdb, 0xd6, 0x5d, 0x8a, 0x29, 0xd1, 0xbb, 0x17, 0x94, 0xb8, - 0x1c, 0x5c, 0xd7, 0xb5, 0x12, 0xb6, 0xed, 0x13, 0x26, 0xad, 0x33, 0x21, 0x7a, 0x06, 0xca, 0x0c, - 0x48, 0x0d, 0x3c, 0xd2, 0x87, 0xc4, 0x18, 0x0c, 0x29, 0x07, 0xd1, 0xb4, 0x56, 0x92, 0xd2, 0x16, - 0x17, 0xaa, 0x7d, 0x7f, 0x23, 0x70, 0x10, 0x45, 0x08, 0x32, 0x7d, 0x4c, 0x31, 0x0f, 0xe4, 0xba, - 0xc6, 0xc7, 0x4c, 0x66, 0x63, 0x3a, 0x94, 0xe1, 0xe1, 0x63, 0x74, 0x0d, 0x72, 0xd2, 0x6d, 0x9a, - 0xbb, 0x95, 0x33, 0xf6, 0xcd, 0x6c, 0xc7, 0x3a, 0x23, 0x3c, 0x6b, 0x14, 0x34, 0x31, 0x51, 0x7f, - 0x95, 0x82, 0x8d, 0x19, 0xb8, 0x65, 0x7e, 0x87, 0xd8, 0x1d, 0x7a, 0xef, 0x62, 0x63, 0x74, 0x87, - 0xf9, 0xc5, 0x7d, 0xe2, 0xc8, 0x34, 0x57, 0x0b, 0x87, 0x48, 0xa4, 0xf0, 0x16, 0x7f, 0x2e, 0x43, - 0x23, 0xb5, 0x51, 0x1b, 0xaa, 0x23, 0xec, 0x52, 0x5d, 0xc0, 0x97, 0x1e, 0x4a, 0x79, 0xb3, 0xa0, - 0x7d, 0x88, 0x3d, 0xc0, 0x63, 0x9b, 0x5d, 0x3a, 0x2a, 0x8f, 0x22, 0x52, 0xa4, 0xc1, 0xd5, 0xee, - 0xc5, 0xa7, 0xd8, 0xa4, 0x86, 0x49, 0xf4, 0x99, 0x2f, 0xf7, 0xc4, 0x8c, 0xd3, 0xe6, 0x99, 0xd1, - 0x27, 0x66, 0xcf, 0xfb, 0x64, 0x57, 0x7c, 0x63, 0xff, 0x93, 0xba, 0xaa, 0x06, 0xe5, 0x68, 0xc2, - 0x40, 0x65, 0x48, 0xd1, 0x73, 0x19, 0x80, 0x14, 0x3d, 0x47, 0xff, 0x0f, 0x19, 0xb6, 0x48, 0xbe, - 0xf8, 0xf2, 0x9c, 0x6c, 0x2d, 0xed, 0x3a, 0x17, 0x36, 0xd1, 0xb8, 0xa6, 0xaa, 0xfa, 0xa7, 0xc1, - 0x4f, 0x22, 0xd3, 0x5e, 0xd5, 0xe7, 0xa0, 0x32, 0x95, 0x25, 0x42, 0xdf, 0x2f, 0x19, 0xfe, 0x7e, - 0x6a, 0x05, 0x4a, 0x91, 0x94, 0xa0, 0x5e, 0x83, 0xab, 0xf3, 0x10, 0x5e, 0x1d, 0xfa, 0xf2, 0x08, - 0x52, 0xa3, 0x57, 0xa0, 0xe0, 0x43, 0xbc, 0x38, 0x8d, 0xb3, 0xb1, 0xf2, 0x94, 0x35, 0x5f, 0x95, - 0x1d, 0x43, 0xb6, 0xad, 0xf9, 0x7e, 0x48, 0xf1, 0x1f, 0x9e, 0xc7, 0xb6, 0xdd, 0xc2, 0xee, 0x50, - 0xfd, 0x10, 0x6a, 0x71, 0xf0, 0x3d, 0xb5, 0x8c, 0x8c, 0xbf, 0x0d, 0xaf, 0x41, 0xee, 0xd4, 0x72, - 0xc6, 0x98, 0x72, 0x67, 0x25, 0x4d, 0xce, 0xd8, 0xf6, 0x14, 0x50, 0x9e, 0xe6, 0x62, 0x31, 0x51, - 0x75, 0x78, 0x22, 0x16, 0xc2, 0x99, 0x89, 0x61, 0xf6, 0x89, 0x88, 0x67, 0x49, 0x13, 0x93, 0xc0, - 0x91, 0xf8, 0xb1, 0x62, 0xc2, 0x5e, 0xeb, 0xf2, 0xb5, 0x72, 0xff, 0x45, 0x4d, 0xce, 0xd4, 0x5b, - 0x7e, 0xb0, 0x22, 0x48, 0xce, 0x30, 0x8f, 0xa1, 0x7f, 0xf2, 0x46, 0xfa, 0xd6, 0xba, 0xc6, 0x86, - 0xea, 0xef, 0x8b, 0x50, 0xd0, 0x88, 0x6b, 0x33, 0xf4, 0x40, 0x75, 0x28, 0x92, 0xf3, 0x1e, 0x11, - 0x34, 0x2c, 0x19, 0x4b, 0x63, 0x84, 0x76, 0xd3, 0xd3, 0x64, 0x1c, 0xc2, 0x37, 0x43, 0x2f, 0x4b, - 0xaa, 0x19, 0xcf, 0x1a, 0xa5, 0x79, 0x98, 0x6b, 0xde, 0xf1, 0xb8, 0x66, 0x3a, 0x96, 0x36, 0x08, - 0xab, 0x29, 0xb2, 0xf9, 0xb2, 0x24, 0x9b, 0x99, 0x25, 0x2f, 0x8b, 0xb0, 0xcd, 0x46, 0x84, 0x6d, - 0x66, 0x97, 0x2c, 0x33, 0x86, 0x6e, 0x36, 0x22, 0x74, 0x33, 0xb7, 0xc4, 0x49, 0x0c, 0xdf, 0xbc, - 0xe3, 0xf1, 0xcd, 0xfc, 0x92, 0x65, 0x4f, 0x11, 0xce, 0xbb, 0x51, 0xc2, 0x29, 0xc8, 0xe2, 0xcd, - 0x58, 0xeb, 0x58, 0xc6, 0xf9, 0x83, 0x10, 0xe3, 0x2c, 0xc6, 0xd2, 0x3d, 0xe1, 0x64, 0x0e, 0xe5, - 0x6c, 0x44, 0x28, 0x27, 0x2c, 0x89, 0x41, 0x0c, 0xe7, 0x7c, 0x2b, 0xcc, 0x39, 0xd7, 0x62, 0x69, - 0xab, 0xdc, 0x34, 0xf3, 0x48, 0xe7, 0x6b, 0x3e, 0xe9, 0x5c, 0x8f, 0x65, 0xcd, 0x72, 0x0d, 0xd3, - 0xac, 0xb3, 0x3d, 0xc3, 0x3a, 0x05, 0x4b, 0x7c, 0x36, 0xd6, 0xc5, 0x12, 0xda, 0xd9, 0x9e, 0xa1, - 0x9d, 0xe5, 0x25, 0x0e, 0x97, 0xf0, 0xce, 0x9f, 0xcf, 0xe7, 0x9d, 0xf1, 0xcc, 0x50, 0xfe, 0xcc, - 0xd5, 0x88, 0xa7, 0x1e, 0x43, 0x3c, 0x05, 0x3d, 0x7c, 0x3e, 0xd6, 0xfd, 0xca, 0xcc, 0xb3, 0x3d, - 0xc3, 0x3c, 0x37, 0x96, 0xc4, 0x63, 0x55, 0xea, 0xf9, 0x1c, 0xcb, 0xf0, 0x53, 0x48, 0xc4, 0x50, - 0x92, 0x38, 0x8e, 0xe5, 0x48, 0x56, 0x27, 0x26, 0xea, 0x2d, 0xc6, 0x39, 0x02, 0xd4, 0x59, 0x40, - 0x53, 0x79, 0x36, 0x0a, 0x21, 0x8d, 0xfa, 0x87, 0x64, 0x60, 0xcb, 0xd3, 0x74, 0x98, 0xaf, 0x14, - 0x25, 0x5f, 0x09, 0xb1, 0xd7, 0x54, 0x94, 0xbd, 0x6e, 0xc1, 0x1a, 0xcb, 0x32, 0x53, 0xc4, 0x14, - 0xdb, 0x1e, 0x31, 0x45, 0xb7, 0x61, 0x83, 0xd3, 0x08, 0xc1, 0x71, 0x65, 0x6a, 0xc9, 0xf0, 0x0c, - 0x59, 0x61, 0x0f, 0xc4, 0x6e, 0x17, 0x39, 0xe6, 0x45, 0xb8, 0x12, 0xd2, 0xf5, 0xb3, 0x97, 0x60, - 0x63, 0x55, 0x5f, 0x7b, 0x4f, 0xa6, 0xb1, 0xf7, 0x82, 0x00, 0x05, 0xa4, 0x17, 0x41, 0xa6, 0x67, - 0xf5, 0x89, 0xcc, 0x2d, 0x7c, 0xcc, 0x92, 0xc2, 0xc8, 0x1a, 0xc8, 0x0c, 0xc2, 0x86, 0x4c, 0xcb, - 0x87, 0xd5, 0xa2, 0x40, 0x4d, 0xf5, 0x4f, 0xc9, 0xc0, 0x5f, 0xc0, 0x83, 0xe7, 0x51, 0xd6, 0xe4, - 0x7f, 0x87, 0xb2, 0xa6, 0xbe, 0x35, 0x65, 0x0d, 0xe7, 0xf6, 0x74, 0x34, 0xb7, 0xff, 0x33, 0x19, - 0x7c, 0x61, 0x9f, 0x80, 0x7e, 0xbb, 0x88, 0x04, 0x89, 0x3a, 0xcb, 0xbf, 0x97, 0x4c, 0xd4, 0xb2, - 0xac, 0xc8, 0xf1, 0xf7, 0x46, 0xcb, 0x8a, 0xbc, 0x48, 0xdd, 0x7c, 0x82, 0x5e, 0x85, 0x22, 0xef, - 0x1f, 0xe9, 0x96, 0xed, 0x4a, 0x04, 0x7f, 0x32, 0xbc, 0x56, 0xd1, 0x26, 0xda, 0x3e, 0x66, 0x3a, - 0x6d, 0xdb, 0xd5, 0x0a, 0xb6, 0x1c, 0x85, 0x38, 0x48, 0x31, 0x42, 0x85, 0xaf, 0x43, 0x91, 0xfd, - 0x7a, 0xd7, 0xc6, 0x3d, 0xc2, 0xd1, 0xb8, 0xa8, 0x05, 0x02, 0xf5, 0x01, 0xa0, 0xd9, 0x7c, 0x80, - 0x5a, 0x90, 0x23, 0x67, 0xc4, 0xa4, 0x82, 0x13, 0xac, 0xed, 0x5e, 0x9b, 0xc3, 0x33, 0x89, 0x49, - 0xeb, 0x35, 0x16, 0xe4, 0x7f, 0x7c, 0xbd, 0x55, 0x15, 0xda, 0x2f, 0x58, 0x63, 0x83, 0x92, 0xb1, - 0x4d, 0x2f, 0x34, 0x69, 0xaf, 0xfe, 0x32, 0xc5, 0x48, 0x5f, 0x24, 0x57, 0xcc, 0x8d, 0xad, 0x77, - 0x80, 0x52, 0x21, 0xc2, 0xbf, 0x5a, 0xbc, 0x37, 0x01, 0x06, 0xd8, 0xd5, 0x3f, 0xc1, 0x26, 0x25, - 0x7d, 0x19, 0xf4, 0x90, 0x04, 0x29, 0x50, 0x60, 0xb3, 0x89, 0x4b, 0xfa, 0xb2, 0xf6, 0xf0, 0xe7, - 0xa1, 0x75, 0xe6, 0xbf, 0xdb, 0x3a, 0xa3, 0x51, 0x2e, 0x4c, 0x47, 0xf9, 0xd7, 0xa9, 0xe0, 0x94, - 0x04, 0xfc, 0xf8, 0x7f, 0x2f, 0x0e, 0xbf, 0xe1, 0x45, 0x73, 0x34, 0x69, 0xa3, 0x13, 0xd8, 0xf0, - 0x4f, 0xa9, 0x3e, 0xe1, 0xa7, 0xd7, 0xdb, 0x77, 0xab, 0x1e, 0xf3, 0xea, 0x59, 0x54, 0xec, 0xa2, - 0x1f, 0xc3, 0xe3, 0x53, 0x08, 0xe4, 0xbb, 0x4e, 0xad, 0x08, 0x44, 0x8f, 0x45, 0x81, 0xc8, 0xf3, - 0x1c, 0xc4, 0x2a, 0xfd, 0x1d, 0xcf, 0xc6, 0x3e, 0xab, 0xc3, 0xc2, 0x14, 0x64, 0xee, 0xd7, 0xbf, - 0x09, 0x25, 0x87, 0x50, 0x6c, 0x98, 0x7a, 0xa4, 0xd2, 0x5d, 0x17, 0x42, 0x59, 0x3f, 0x1f, 0xc3, - 0x63, 0x73, 0xa9, 0x08, 0xfa, 0x1e, 0x14, 0x03, 0x16, 0x93, 0x8c, 0x29, 0x1a, 0xfd, 0x42, 0x28, - 0xd0, 0x55, 0xff, 0x98, 0x0c, 0x5c, 0x46, 0x4b, 0xab, 0x26, 0xe4, 0x1c, 0xe2, 0x4e, 0x46, 0xa2, - 0xd8, 0x29, 0xef, 0xbe, 0xb8, 0x1a, 0x89, 0x61, 0xd2, 0xc9, 0x88, 0x6a, 0xd2, 0x58, 0x7d, 0x00, - 0x39, 0x21, 0x41, 0x6b, 0x90, 0xbf, 0x77, 0x74, 0x70, 0xd4, 0x7e, 0xff, 0xa8, 0x9a, 0x40, 0x00, - 0xb9, 0xbd, 0x46, 0xa3, 0x79, 0xdc, 0xa9, 0x26, 0x51, 0x11, 0xb2, 0x7b, 0xf5, 0xb6, 0xd6, 0xa9, - 0xa6, 0x98, 0x58, 0x6b, 0xbe, 0xdb, 0x6c, 0x74, 0xaa, 0x69, 0xb4, 0x01, 0x25, 0x31, 0xd6, 0xef, - 0xb6, 0xb5, 0xf7, 0xf6, 0x3a, 0xd5, 0x4c, 0x48, 0x74, 0xd2, 0x3c, 0x7a, 0xbb, 0xa9, 0x55, 0xb3, - 0xea, 0x4b, 0xac, 0x9a, 0x8a, 0xa1, 0x3d, 0x41, 0xdd, 0x94, 0x0c, 0xd5, 0x4d, 0xea, 0x6f, 0x53, - 0xa0, 0xc4, 0x73, 0x19, 0xf4, 0xee, 0xd4, 0xc2, 0x77, 0x2f, 0x41, 0x84, 0xa6, 0x56, 0x8f, 0x9e, - 0x81, 0xb2, 0x43, 0x4e, 0x09, 0xed, 0x0d, 0x05, 0xb7, 0x12, 0x89, 0xad, 0xa4, 0x95, 0xa4, 0x94, - 0x1b, 0xb9, 0x42, 0xed, 0x23, 0xd2, 0xa3, 0xba, 0x28, 0xe1, 0xc4, 0xa6, 0x2b, 0x32, 0x35, 0x26, - 0x3d, 0x11, 0x42, 0xf5, 0xc3, 0x4b, 0xc5, 0xb2, 0x08, 0x59, 0xad, 0xd9, 0xd1, 0x7e, 0x52, 0x4d, - 0x23, 0x04, 0x65, 0x3e, 0xd4, 0x4f, 0x8e, 0xf6, 0x8e, 0x4f, 0x5a, 0x6d, 0x16, 0xcb, 0x2b, 0x50, - 0xf1, 0x62, 0xe9, 0x09, 0xb3, 0x2a, 0x0e, 0x76, 0xc3, 0x92, 0xda, 0x11, 0xdd, 0x81, 0x82, 0x24, - 0x4e, 0xde, 0x59, 0x53, 0x66, 0xbb, 0x27, 0xef, 0x49, 0x0d, 0xcd, 0xd7, 0x55, 0xff, 0x9d, 0x84, - 0xca, 0xd4, 0x19, 0x44, 0xbb, 0x90, 0x15, 0x25, 0x40, 0xdc, 0x15, 0x05, 0x87, 0x10, 0x79, 0x60, - 0x85, 0x2a, 0x7a, 0x03, 0x0a, 0x44, 0x76, 0x41, 0xe6, 0x9d, 0x75, 0xf1, 0x7e, 0xaf, 0x4f, 0x22, - 0x4d, 0x7d, 0x0b, 0xf4, 0x26, 0x14, 0x7d, 0x30, 0x91, 0x75, 0xe7, 0xd3, 0xb3, 0xe6, 0x3e, 0x0c, - 0x49, 0xfb, 0xc0, 0x06, 0xbd, 0x16, 0xd0, 0xbe, 0xcc, 0x6c, 0xe1, 0x21, 0xcd, 0x85, 0x82, 0x34, - 0xf6, 0xf4, 0xd5, 0x06, 0xac, 0x85, 0xd6, 0x83, 0x9e, 0x84, 0xe2, 0x18, 0x9f, 0xcb, 0xee, 0x9a, - 0xe8, 0x8f, 0x14, 0xc6, 0xf8, 0x5c, 0x34, 0xd6, 0x1e, 0x87, 0x3c, 0x7b, 0x38, 0xc0, 0x22, 0xc8, - 0x69, 0x2d, 0x37, 0xc6, 0xe7, 0xef, 0x60, 0x57, 0xfd, 0x00, 0xca, 0xd1, 0xce, 0x12, 0xdb, 0xec, - 0x8e, 0x35, 0x31, 0xfb, 0xdc, 0x47, 0x56, 0x13, 0x13, 0xf4, 0x0a, 0x64, 0xcf, 0x2c, 0x81, 0x87, - 0xf3, 0x51, 0xe1, 0xbe, 0x45, 0x49, 0xa8, 0x33, 0x25, 0xb4, 0xd5, 0x4f, 0x21, 0xcb, 0xf1, 0x8d, - 0x61, 0x15, 0xef, 0x11, 0x49, 0xca, 0xcb, 0xc6, 0xe8, 0x03, 0x00, 0x4c, 0xa9, 0x63, 0x74, 0x27, - 0x81, 0xe3, 0xad, 0xf9, 0xf8, 0xb8, 0xe7, 0xe9, 0xd5, 0xaf, 0x4b, 0xa0, 0xbc, 0x1a, 0x98, 0x86, - 0xc0, 0x32, 0xe4, 0x50, 0x3d, 0x82, 0x72, 0xd4, 0x36, 0xdc, 0xad, 0x5d, 0x9f, 0xd3, 0xad, 0xf5, - 0x69, 0x95, 0x4f, 0xca, 0xd2, 0xa2, 0x1f, 0xc8, 0x27, 0xea, 0xef, 0x92, 0x50, 0xe8, 0x9c, 0xcb, - 0x93, 0x13, 0xd3, 0x8a, 0x0a, 0x4c, 0x53, 0xe1, 0xc6, 0x8b, 0xe8, 0x6d, 0xa5, 0xfd, 0x8e, 0xd9, - 0x5b, 0x3e, 0x36, 0x64, 0x56, 0x2d, 0x78, 0xbd, 0xd6, 0xa1, 0x44, 0x84, 0x9b, 0x50, 0xb2, 0x1c, - 0x63, 0x60, 0x98, 0x78, 0x14, 0x66, 0xf0, 0xeb, 0x9e, 0x90, 0x13, 0xd5, 0xd7, 0xa1, 0xe8, 0x6f, - 0x3d, 0x56, 0x60, 0xe0, 0x7e, 0xdf, 0x21, 0xae, 0x2b, 0x03, 0xe0, 0x4d, 0x79, 0xfb, 0xd3, 0xfa, - 0x44, 0xf6, 0x7f, 0xd2, 0x9a, 0x98, 0xa8, 0x7d, 0xa8, 0x4c, 0xa5, 0x4f, 0xf4, 0x3a, 0xe4, 0xed, - 0x49, 0x57, 0xf7, 0x62, 0x38, 0x75, 0xc2, 0x3c, 0xb2, 0x39, 0xe9, 0x8e, 0x8c, 0xde, 0x01, 0xb9, - 0xf0, 0x7e, 0xb1, 0x3d, 0xe9, 0x1e, 0x88, 0x50, 0x8b, 0xb7, 0xa4, 0xc2, 0x6f, 0x39, 0x83, 0x82, - 0xb7, 0x73, 0xd0, 0x0f, 0xc3, 0x87, 0x29, 0x39, 0x8b, 0x05, 0xd1, 0x94, 0x2e, 0xdd, 0x87, 0xce, - 0xd2, 0x6d, 0xd8, 0x70, 0x8d, 0x81, 0x49, 0xfa, 0x7a, 0x50, 0xe2, 0xf0, 0xb7, 0x15, 0xb4, 0x8a, - 0x78, 0x70, 0xe8, 0xd5, 0x37, 0xea, 0xbf, 0x92, 0x50, 0xf0, 0x4e, 0x35, 0x7a, 0x29, 0xb4, 0x39, - 0xcb, 0x73, 0x3a, 0x40, 0x9e, 0x62, 0xd0, 0xc1, 0x8c, 0xfe, 0xd6, 0xd4, 0xe5, 0x7f, 0x6b, 0x5c, - 0x2b, 0xda, 0xbb, 0x13, 0xc8, 0x5c, 0xfa, 0x4e, 0xe0, 0x05, 0x40, 0xd4, 0xa2, 0x78, 0xa4, 0x9f, - 0x59, 0xd4, 0x30, 0x07, 0xba, 0x08, 0xb6, 0x60, 0x76, 0x55, 0xfe, 0xe4, 0x3e, 0x7f, 0x70, 0xcc, - 0xe3, 0xfe, 0x8b, 0x24, 0x14, 0xfc, 0x1c, 0x7d, 0xd9, 0x86, 0xe4, 0x35, 0xc8, 0xc9, 0x34, 0x24, - 0x3a, 0x92, 0x72, 0xe6, 0xf7, 0xc6, 0x33, 0xa1, 0xde, 0xb8, 0xc2, 0xf0, 0x9d, 0x62, 0x4e, 0x54, - 0xc4, 0x1e, 0xf5, 0xe7, 0xb7, 0x5f, 0x83, 0xb5, 0x50, 0x6f, 0x98, 0x1d, 0xcf, 0xa3, 0xe6, 0xfb, - 0xd5, 0x84, 0x92, 0xff, 0xec, 0x8b, 0x1b, 0xe9, 0x23, 0xf2, 0x09, 0xdb, 0xb3, 0x5a, 0xb3, 0xd1, - 0x6a, 0x36, 0x0e, 0xaa, 0x49, 0x65, 0xed, 0xb3, 0x2f, 0x6e, 0xe4, 0x35, 0xc2, 0x1b, 0x47, 0xb7, - 0x5b, 0xb0, 0x1e, 0xfe, 0x2a, 0xd1, 0x4c, 0x86, 0xa0, 0xfc, 0xf6, 0xbd, 0xe3, 0xc3, 0xfd, 0xc6, - 0x5e, 0xa7, 0xa9, 0xdf, 0x6f, 0x77, 0x9a, 0xd5, 0x24, 0x7a, 0x1c, 0xae, 0x1c, 0xee, 0xbf, 0xd3, - 0xea, 0xe8, 0x8d, 0xc3, 0xfd, 0xe6, 0x51, 0x47, 0xdf, 0xeb, 0x74, 0xf6, 0x1a, 0x07, 0xd5, 0xd4, - 0xee, 0x23, 0x80, 0xca, 0x5e, 0xbd, 0xb1, 0xcf, 0xb2, 0xb0, 0xd1, 0xc3, 0xb2, 0x31, 0x97, 0xe1, - 0x45, 0xfe, 0xc2, 0x4b, 0x6e, 0x65, 0x71, 0x5f, 0x12, 0xdd, 0x85, 0x2c, 0xaf, 0xff, 0xd1, 0xe2, - 0x5b, 0x6f, 0x65, 0x49, 0xa3, 0x92, 0xfd, 0x18, 0x7e, 0x3c, 0x16, 0x5e, 0x83, 0x2b, 0x8b, 0xfb, - 0x96, 0x48, 0x83, 0x62, 0x50, 0xc0, 0x2f, 0xbf, 0x16, 0x57, 0x56, 0xe8, 0x65, 0x32, 0x9f, 0x41, - 0x79, 0xb2, 0xfc, 0x9a, 0x58, 0x59, 0x01, 0xe5, 0xd0, 0x21, 0xe4, 0xbd, 0xc2, 0x6f, 0xd9, 0xc5, - 0xb5, 0xb2, 0xb4, 0xcf, 0xc8, 0x3e, 0x81, 0x28, 0xd0, 0x17, 0xdf, 0xc2, 0x2b, 0x4b, 0x9a, 0xa6, - 0x68, 0x1f, 0x72, 0x92, 0x73, 0x2f, 0xb9, 0x8c, 0x56, 0x96, 0xf5, 0x0d, 0x59, 0xd0, 0x82, 0xce, - 0xc7, 0xf2, 0xff, 0x16, 0x28, 0x2b, 0xf4, 0x83, 0xd1, 0x3d, 0x80, 0x50, 0x39, 0xbe, 0xc2, 0x9f, - 0x06, 0x94, 0x55, 0xfa, 0xbc, 0xa8, 0x0d, 0x05, 0xbf, 0xec, 0x5a, 0x7a, 0x85, 0xaf, 0x2c, 0x6f, - 0xb8, 0xa2, 0x07, 0x50, 0x8a, 0xd6, 0x1b, 0xab, 0x5d, 0xcc, 0x2b, 0x2b, 0x76, 0x52, 0x99, 0xff, - 0x68, 0xf1, 0xb1, 0xda, 0x45, 0xbd, 0xb2, 0x62, 0x63, 0x15, 0x7d, 0x04, 0x1b, 0xb3, 0xc5, 0xc1, - 0xea, 0xf7, 0xf6, 0xca, 0x25, 0x5a, 0xad, 0x68, 0x0c, 0x68, 0x4e, 0x51, 0x71, 0x89, 0x6b, 0x7c, - 0xe5, 0x32, 0x9d, 0x57, 0x16, 0xba, 0x28, 0x53, 0x5f, 0xed, 0x5a, 0x5f, 0x59, 0xb1, 0x07, 0x5b, - 0x6f, 0x7e, 0xf9, 0xcd, 0x66, 0xf2, 0xab, 0x6f, 0x36, 0x93, 0x7f, 0xfb, 0x66, 0x33, 0xf9, 0xf9, - 0xa3, 0xcd, 0xc4, 0x57, 0x8f, 0x36, 0x13, 0x7f, 0x79, 0xb4, 0x99, 0xf8, 0xe9, 0xf3, 0x03, 0x83, - 0x0e, 0x27, 0xdd, 0xed, 0x9e, 0x35, 0xde, 0x09, 0xff, 0x87, 0x69, 0xde, 0xff, 0xaa, 0xba, 0x39, - 0x9e, 0x08, 0x5f, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x89, 0x25, 0x0e, 0x77, 0x25, - 0x00, 0x00, + // 2972 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0xe3, 0xc6, + 0xf1, 0xe7, 0xfb, 0xd1, 0x14, 0x1f, 0x9a, 0x5d, 0xef, 0xd2, 0xf0, 0x5a, 0x5a, 0x63, 0xcb, 0xaf, + 0xb5, 0x2d, 0xfd, 0x2d, 0xd7, 0xfa, 0x6f, 0xc7, 0x4e, 0x6c, 0x91, 0xcb, 0x35, 0xe5, 0x95, 0x25, + 0x05, 0xa2, 0xd6, 0x79, 0x79, 0xe1, 0x21, 0x31, 0x22, 0xe1, 0x25, 0x01, 0x18, 0x00, 0xb5, 0xd2, + 0x1e, 0xf3, 0xa8, 0x54, 0x39, 0x17, 0x57, 0xe5, 0x92, 0x8b, 0x3f, 0x42, 0x2a, 0xd7, 0x5c, 0x92, + 0x4b, 0x2e, 0xae, 0xca, 0x21, 0x3e, 0xe6, 0xe4, 0xa4, 0xec, 0x5b, 0xbe, 0x40, 0x4e, 0xa9, 0xa4, + 0xe6, 0x81, 0x17, 0x49, 0x88, 0x90, 0x9d, 0x5b, 0x6e, 0x98, 0x46, 0xf7, 0x0f, 0x98, 0xc6, 0x4c, + 0xf7, 0xaf, 0x1b, 0x03, 0x4f, 0xb8, 0xc4, 0xd0, 0x88, 0x3d, 0xd1, 0x0d, 0x77, 0x13, 0xf7, 0x07, + 0xfa, 0xa6, 0x7b, 0x66, 0x11, 0x67, 0xc3, 0xb2, 0x4d, 0xd7, 0x44, 0xf5, 0xe0, 0xe6, 0x06, 0xbd, + 0x29, 0x3d, 0x19, 0xd2, 0x1e, 0xd8, 0x67, 0x96, 0x6b, 0x6e, 0x5a, 0xb6, 0x69, 0x1e, 0x73, 0x7d, + 0xe9, 0x5a, 0xe8, 0x36, 0xc3, 0x09, 0xa3, 0x45, 0xee, 0x0a, 0xe3, 0x07, 0xe4, 0xcc, 0xbb, 0xfb, + 0xe4, 0x9c, 0xad, 0x85, 0x6d, 0x3c, 0xf1, 0x6e, 0xaf, 0x0f, 0x4d, 0x73, 0x38, 0x26, 0x9b, 0x6c, + 0xd4, 0x9f, 0x1e, 0x6f, 0xba, 0xfa, 0x84, 0x38, 0x2e, 0x9e, 0x58, 0x42, 0xe1, 0xf2, 0xd0, 0x1c, + 0x9a, 0xec, 0x72, 0x93, 0x5e, 0x71, 0xa9, 0xfc, 0x87, 0x32, 0x14, 0x15, 0xf2, 0xf1, 0x94, 0x38, + 0x2e, 0xda, 0x82, 0x1c, 0x19, 0x8c, 0xcc, 0x66, 0xfa, 0x7a, 0xfa, 0xb9, 0xca, 0xd6, 0xb5, 0x8d, + 0x99, 0xc9, 0x6d, 0x08, 0xbd, 0xce, 0x60, 0x64, 0x76, 0x53, 0x0a, 0xd3, 0x45, 0xb7, 0x20, 0x7f, + 0x3c, 0x9e, 0x3a, 0xa3, 0x66, 0x86, 0x19, 0x3d, 0x19, 0x67, 0x74, 0x87, 0x2a, 0x75, 0x53, 0x0a, + 0xd7, 0xa6, 0x8f, 0xd2, 0x8d, 0x63, 0xb3, 0x99, 0x3d, 0xff, 0x51, 0x3b, 0xc6, 0x31, 0x7b, 0x14, + 0xd5, 0x45, 0x2d, 0x00, 0x87, 0xb8, 0xaa, 0x69, 0xb9, 0xba, 0x69, 0x34, 0x73, 0xcc, 0xf2, 0xa9, + 0x38, 0xcb, 0x43, 0xe2, 0xee, 0x33, 0xc5, 0x6e, 0x4a, 0x29, 0x3b, 0xde, 0x80, 0x62, 0xe8, 0x86, + 0xee, 0xaa, 0x83, 0x11, 0xd6, 0x8d, 0x66, 0xfe, 0x7c, 0x8c, 0x1d, 0x43, 0x77, 0xdb, 0x54, 0x91, + 0x62, 0xe8, 0xde, 0x80, 0x4e, 0xf9, 0xe3, 0x29, 0xb1, 0xcf, 0x9a, 0x85, 0xf3, 0xa7, 0xfc, 0x7d, + 0xaa, 0x44, 0xa7, 0xcc, 0xb4, 0x51, 0x07, 0x2a, 0x7d, 0x32, 0xd4, 0x0d, 0xb5, 0x3f, 0x36, 0x07, + 0x0f, 0x9a, 0x45, 0x66, 0x2c, 0xc7, 0x19, 0xb7, 0xa8, 0x6a, 0x8b, 0x6a, 0x76, 0x53, 0x0a, 0xf4, + 0xfd, 0x11, 0x7a, 0x13, 0x4a, 0x83, 0x11, 0x19, 0x3c, 0x50, 0xdd, 0xd3, 0x66, 0x89, 0x61, 0xac, + 0xc7, 0x61, 0xb4, 0xa9, 0x5e, 0xef, 0xb4, 0x9b, 0x52, 0x8a, 0x03, 0x7e, 0x49, 0xe7, 0xaf, 0x91, + 0xb1, 0x7e, 0x42, 0x6c, 0x6a, 0x5f, 0x3e, 0x7f, 0xfe, 0xb7, 0xb9, 0x26, 0x43, 0x28, 0x6b, 0xde, + 0x00, 0xbd, 0x05, 0x65, 0x62, 0x68, 0x62, 0x1a, 0xc0, 0x20, 0xae, 0xc7, 0xae, 0x15, 0x43, 0xf3, + 0x26, 0x51, 0x22, 0xe2, 0x1a, 0xbd, 0x06, 0x85, 0x81, 0x39, 0x99, 0xe8, 0x6e, 0xb3, 0xc2, 0xac, + 0xd7, 0x62, 0x27, 0xc0, 0xb4, 0xba, 0x29, 0x45, 0xe8, 0xa3, 0x3d, 0xa8, 0x8d, 0x75, 0xc7, 0x55, + 0x1d, 0x03, 0x5b, 0xce, 0xc8, 0x74, 0x9d, 0xe6, 0x0a, 0x43, 0x78, 0x3a, 0x0e, 0x61, 0x57, 0x77, + 0xdc, 0x43, 0x4f, 0xb9, 0x9b, 0x52, 0xaa, 0xe3, 0xb0, 0x80, 0xe2, 0x99, 0xc7, 0xc7, 0xc4, 0xf6, + 0x01, 0x9b, 0xd5, 0xf3, 0xf1, 0xf6, 0xa9, 0xb6, 0x67, 0x4f, 0xf1, 0xcc, 0xb0, 0x00, 0xfd, 0x18, + 0x2e, 0x8d, 0x4d, 0xac, 0xf9, 0x70, 0xea, 0x60, 0x34, 0x35, 0x1e, 0x34, 0x6b, 0x0c, 0xf4, 0xf9, + 0xd8, 0x97, 0x34, 0xb1, 0xe6, 0x41, 0xb4, 0xa9, 0x41, 0x37, 0xa5, 0xac, 0x8e, 0x67, 0x85, 0xe8, + 0x3e, 0x5c, 0xc6, 0x96, 0x35, 0x3e, 0x9b, 0x45, 0xaf, 0x33, 0xf4, 0x9b, 0x71, 0xe8, 0xdb, 0xd4, + 0x66, 0x16, 0x1e, 0xe1, 0x39, 0x29, 0xea, 0x41, 0xc3, 0xb2, 0x89, 0x85, 0x6d, 0xa2, 0x5a, 0xb6, + 0x69, 0x99, 0x0e, 0x1e, 0x37, 0x1b, 0x0c, 0xfb, 0xd9, 0x38, 0xec, 0x03, 0xae, 0x7f, 0x20, 0xd4, + 0xbb, 0x29, 0xa5, 0x6e, 0x45, 0x45, 0x1c, 0xd5, 0x1c, 0x10, 0xc7, 0x09, 0x50, 0x57, 0x97, 0xa1, + 0x32, 0xfd, 0x28, 0x6a, 0x44, 0xd4, 0x2a, 0x42, 0xfe, 0x04, 0x8f, 0xa7, 0x44, 0x7e, 0x16, 0x2a, + 0xa1, 0xb0, 0x84, 0x9a, 0x50, 0x9c, 0x10, 0xc7, 0xc1, 0x43, 0xc2, 0xa2, 0x58, 0x59, 0xf1, 0x86, + 0x72, 0x0d, 0x56, 0xc2, 0xa1, 0x48, 0x9e, 0xf8, 0x86, 0x34, 0xc8, 0x50, 0xc3, 0x13, 0x62, 0x3b, + 0x34, 0xb2, 0x08, 0x43, 0x31, 0x44, 0x37, 0xa0, 0xca, 0x96, 0xba, 0xea, 0xdd, 0xa7, 0x91, 0x2e, + 0xa7, 0xac, 0x30, 0xe1, 0x3d, 0xa1, 0xb4, 0x0e, 0x15, 0x6b, 0xcb, 0xf2, 0x55, 0xb2, 0x4c, 0x05, + 0xac, 0x2d, 0x4b, 0x28, 0xc8, 0xdf, 0x81, 0xc6, 0x6c, 0x64, 0x42, 0x0d, 0xc8, 0x3e, 0x20, 0x67, + 0xe2, 0x79, 0xf4, 0x12, 0x5d, 0x16, 0xd3, 0x62, 0xcf, 0x28, 0x2b, 0x62, 0x8e, 0x7f, 0xce, 0xf8, + 0xc6, 0x7e, 0x48, 0x42, 0xaf, 0x41, 0x8e, 0x46, 0x78, 0x11, 0xac, 0xa5, 0x0d, 0x1e, 0xfe, 0x37, + 0xbc, 0xf0, 0xbf, 0xd1, 0xf3, 0xc2, 0x7f, 0xab, 0xf4, 0xf9, 0x97, 0xeb, 0xa9, 0x4f, 0xff, 0xb6, + 0x9e, 0x56, 0x98, 0x05, 0x7a, 0x9c, 0x46, 0x10, 0xac, 0x1b, 0xaa, 0xae, 0x89, 0xe7, 0x14, 0xd9, + 0x78, 0x47, 0x43, 0x77, 0xa1, 0x31, 0x30, 0x0d, 0x87, 0x18, 0xce, 0xd4, 0x51, 0x79, 0x7a, 0x11, + 0x21, 0x7a, 0x7e, 0x87, 0xb7, 0x3d, 0xc5, 0x03, 0xa6, 0xa7, 0xd4, 0x07, 0x51, 0x01, 0xba, 0x03, + 0x70, 0x82, 0xc7, 0xba, 0x86, 0x5d, 0xd3, 0x76, 0x9a, 0xb9, 0xeb, 0xd9, 0x85, 0x30, 0xf7, 0x3c, + 0x95, 0x23, 0x4b, 0xc3, 0x2e, 0x69, 0xe5, 0xe8, 0xdb, 0x2a, 0x21, 0x4b, 0xf4, 0x0c, 0xd4, 0xb1, + 0x65, 0xa9, 0x8e, 0x8b, 0x5d, 0xa2, 0xf6, 0xcf, 0x5c, 0xe2, 0xb0, 0xc0, 0xbd, 0xa2, 0x54, 0xb1, + 0x65, 0x1d, 0x52, 0x69, 0x8b, 0x0a, 0xd1, 0xd3, 0x50, 0xa3, 0x41, 0x5a, 0xc7, 0x63, 0x75, 0x44, + 0xf4, 0xe1, 0xc8, 0x65, 0x01, 0x3a, 0xab, 0x54, 0x85, 0xb4, 0xcb, 0x84, 0xb2, 0xe6, 0x2f, 0x04, + 0x16, 0xa0, 0x11, 0x82, 0x9c, 0x86, 0x5d, 0xcc, 0x1c, 0xb9, 0xa2, 0xb0, 0x6b, 0x2a, 0xb3, 0xb0, + 0x3b, 0x12, 0xee, 0x61, 0xd7, 0xe8, 0x0a, 0x14, 0x04, 0x6c, 0x96, 0xc1, 0x8a, 0x11, 0xfd, 0x66, + 0x96, 0x6d, 0x9e, 0x10, 0x96, 0x91, 0x4a, 0x0a, 0x1f, 0xc8, 0x3f, 0xcf, 0xc0, 0xea, 0x5c, 0x28, + 0xa7, 0xb8, 0x23, 0xec, 0x8c, 0xbc, 0x67, 0xd1, 0x6b, 0xf4, 0x2a, 0xc5, 0xc5, 0x1a, 0xb1, 0x45, + 0x0a, 0x6d, 0x86, 0x5d, 0xc4, 0xe9, 0x41, 0x97, 0xdd, 0x17, 0xae, 0x11, 0xda, 0x68, 0x1f, 0x1a, + 0x63, 0xec, 0xb8, 0x2a, 0x0f, 0x8d, 0x6a, 0x28, 0x9d, 0xce, 0x27, 0x84, 0x5d, 0xec, 0x05, 0x53, + 0xba, 0xd8, 0x05, 0x50, 0x6d, 0x1c, 0x91, 0x22, 0x05, 0x2e, 0xf7, 0xcf, 0x1e, 0x61, 0xc3, 0xd5, + 0x0d, 0xa2, 0xce, 0x7d, 0xb9, 0xc7, 0xe7, 0x40, 0x3b, 0x27, 0xba, 0x46, 0x8c, 0x81, 0xf7, 0xc9, + 0x2e, 0xf9, 0xc6, 0xfe, 0x27, 0x75, 0x64, 0x05, 0x6a, 0xd1, 0x64, 0x84, 0x6a, 0x90, 0x71, 0x4f, + 0x85, 0x03, 0x32, 0xee, 0x29, 0xfa, 0x3f, 0xc8, 0xd1, 0x49, 0xb2, 0xc9, 0xd7, 0x16, 0x30, 0x01, + 0x61, 0xd7, 0x3b, 0xb3, 0x88, 0xc2, 0x34, 0x65, 0xd9, 0xdf, 0x0d, 0x7e, 0x82, 0x9a, 0x45, 0x95, + 0x9f, 0x87, 0xfa, 0x4c, 0x06, 0x0a, 0x7d, 0xbf, 0x74, 0xf8, 0xfb, 0xc9, 0x75, 0xa8, 0x46, 0xd2, + 0x8d, 0x7c, 0x05, 0x2e, 0x2f, 0xca, 0x1e, 0xf2, 0xc8, 0x97, 0x47, 0xb2, 0x00, 0xba, 0x05, 0x25, + 0x3f, 0x7d, 0xf0, 0xdd, 0x38, 0xef, 0x2b, 0x4f, 0x59, 0xf1, 0x55, 0xe9, 0x36, 0xa4, 0xcb, 0x9a, + 0xad, 0x87, 0x0c, 0x7b, 0xf1, 0x22, 0xb6, 0xac, 0x2e, 0x76, 0x46, 0xf2, 0x87, 0xd0, 0x8c, 0x4b, + 0x0d, 0x33, 0xd3, 0xc8, 0xf9, 0xcb, 0xf0, 0x0a, 0x14, 0x8e, 0x4d, 0x7b, 0x82, 0x5d, 0x06, 0x56, + 0x55, 0xc4, 0x88, 0x2e, 0x4f, 0x9e, 0x26, 0xb2, 0x4c, 0xcc, 0x07, 0xb2, 0x0a, 0x8f, 0xc7, 0xa6, + 0x07, 0x6a, 0xa2, 0x1b, 0x1a, 0xe1, 0xfe, 0xac, 0x2a, 0x7c, 0x10, 0x00, 0xf1, 0x97, 0xe5, 0x03, + 0xfa, 0x58, 0x87, 0xcd, 0x95, 0xe1, 0x97, 0x15, 0x31, 0x92, 0x1f, 0xc2, 0x95, 0xc5, 0x39, 0x02, + 0xdd, 0x02, 0xe0, 0xf1, 0xd4, 0xdf, 0x75, 0x95, 0xad, 0x2b, 0xf3, 0x6b, 0xfe, 0x36, 0x76, 0xb1, + 0x52, 0x66, 0x9a, 0xf4, 0x92, 0x46, 0x81, 0xc0, 0x4c, 0x75, 0xf4, 0x47, 0x7c, 0xc9, 0x64, 0x95, + 0xaa, 0xaf, 0x73, 0xa8, 0x3f, 0x22, 0xf2, 0x2f, 0xd3, 0xa1, 0x27, 0x47, 0x92, 0x46, 0x68, 0xa7, + 0xa5, 0x2f, 0xb4, 0xd3, 0xa2, 0x6f, 0x9c, 0x49, 0xf8, 0xc6, 0xf2, 0xaf, 0x01, 0x4a, 0x0a, 0x71, + 0x2c, 0x1a, 0x16, 0x51, 0x0b, 0xca, 0xe4, 0x74, 0x40, 0x38, 0x77, 0x4d, 0xc7, 0x72, 0x3f, 0xae, + 0xdd, 0xf1, 0x34, 0x29, 0xf1, 0xf2, 0xcd, 0xd0, 0x2b, 0x82, 0x9f, 0xc7, 0x53, 0x6d, 0x61, 0x1e, + 0x26, 0xe8, 0xaf, 0x7a, 0x04, 0x3d, 0x1b, 0xcb, 0xb5, 0xb8, 0xd5, 0x0c, 0x43, 0x7f, 0x45, 0x30, + 0xf4, 0xdc, 0x92, 0x87, 0x45, 0x28, 0x7a, 0x3b, 0x42, 0xd1, 0xf3, 0x4b, 0xa6, 0x19, 0xc3, 0xd1, + 0xdb, 0x11, 0x8e, 0x5e, 0x58, 0x02, 0x12, 0x43, 0xd2, 0x5f, 0xf5, 0x48, 0x7a, 0x71, 0xc9, 0xb4, + 0x67, 0x58, 0xfa, 0x9d, 0x28, 0x4b, 0xe7, 0x0c, 0xfb, 0x46, 0xac, 0x75, 0x2c, 0x4d, 0xff, 0x6e, + 0x88, 0xa6, 0x97, 0x63, 0x39, 0x32, 0x07, 0x59, 0xc0, 0xd3, 0xdb, 0x11, 0x9e, 0x0e, 0x4b, 0x7c, + 0x10, 0x43, 0xd4, 0xdf, 0x0e, 0x13, 0xf5, 0x4a, 0x2c, 0xd7, 0x17, 0x8b, 0x66, 0x11, 0x53, 0x7f, + 0xdd, 0x67, 0xea, 0x2b, 0xb1, 0xa5, 0x86, 0x98, 0xc3, 0x2c, 0x55, 0xdf, 0x9f, 0xa3, 0xea, 0x9c, + 0x5a, 0x3f, 0x13, 0x0b, 0xb1, 0x84, 0xab, 0xef, 0xcf, 0x71, 0xf5, 0xda, 0x12, 0xc0, 0x25, 0x64, + 0xfd, 0x27, 0x8b, 0xc9, 0x7a, 0x3c, 0x9d, 0x16, 0xaf, 0x99, 0x8c, 0xad, 0xab, 0x31, 0x6c, 0x9d, + 0x33, 0xea, 0x17, 0x62, 0xe1, 0x13, 0xd3, 0xf5, 0xa3, 0x05, 0x74, 0x9d, 0x13, 0xeb, 0xe7, 0x62, + 0xc1, 0x13, 0xf0, 0xf5, 0xa3, 0x05, 0x7c, 0x1d, 0x2d, 0x85, 0x4d, 0x4e, 0xd8, 0x9f, 0xa7, 0xbc, + 0x68, 0x26, 0xcc, 0xd1, 0xdc, 0x42, 0x6c, 0xdb, 0xb4, 0x05, 0x17, 0xe6, 0x03, 0xf9, 0x39, 0xca, + 0xd4, 0x82, 0x90, 0x76, 0x0e, 0xb9, 0x67, 0x39, 0x3c, 0x14, 0xc6, 0xe4, 0xdf, 0xa7, 0x03, 0x5b, + 0x46, 0x6e, 0xc2, 0x2c, 0xaf, 0x2c, 0x58, 0x5e, 0x88, 0xf3, 0x67, 0xa2, 0x9c, 0x7f, 0x1d, 0x2a, + 0x34, 0x37, 0xcf, 0xd0, 0x79, 0x6c, 0x79, 0x74, 0x1e, 0xdd, 0x84, 0x55, 0x46, 0xbe, 0x78, 0x5e, + 0x10, 0x09, 0x39, 0xc7, 0xf2, 0x51, 0x9d, 0xde, 0xe0, 0x5b, 0x89, 0x67, 0xe6, 0x97, 0xe0, 0x52, + 0x48, 0xd7, 0xcf, 0xf9, 0x9c, 0xc3, 0x36, 0x7c, 0xed, 0x6d, 0x91, 0xfc, 0xdf, 0x0b, 0x1c, 0x14, + 0x94, 0x0a, 0x08, 0x72, 0x03, 0x53, 0x23, 0x22, 0x23, 0xb3, 0x6b, 0x5a, 0x3e, 0x8c, 0xcd, 0xa1, + 0xc8, 0xbb, 0xf4, 0x92, 0x6a, 0xf9, 0x31, 0xbb, 0xcc, 0x43, 0xb2, 0xfc, 0xa7, 0x74, 0x80, 0x17, + 0x54, 0x0f, 0x8b, 0x88, 0x7e, 0xfa, 0xbf, 0x43, 0xf4, 0x33, 0xdf, 0x98, 0xe8, 0x87, 0x19, 0x51, + 0x36, 0xca, 0x88, 0xfe, 0x99, 0x0e, 0xbe, 0xb0, 0x4f, 0xdb, 0xbf, 0x99, 0x47, 0x02, 0x7a, 0x93, + 0x67, 0xdf, 0x4b, 0xd0, 0x1b, 0x51, 0x8c, 0x15, 0xd8, 0x73, 0xa3, 0xc5, 0x58, 0x91, 0x13, 0x1e, + 0x36, 0x40, 0xaf, 0x41, 0x99, 0x75, 0xf4, 0x54, 0xd3, 0x72, 0x44, 0x7a, 0x78, 0x22, 0x3c, 0x57, + 0xde, 0xb8, 0xdb, 0x38, 0xa0, 0x3a, 0xfb, 0x96, 0xa3, 0x94, 0x2c, 0x71, 0x15, 0x62, 0x6e, 0xe5, + 0x48, 0x01, 0x71, 0x0d, 0xca, 0xf4, 0xed, 0x1d, 0x0b, 0x0f, 0x08, 0x0b, 0xf5, 0x65, 0x25, 0x10, + 0xc8, 0xf7, 0x01, 0xcd, 0x27, 0x1b, 0xd4, 0x85, 0x02, 0x39, 0x21, 0x86, 0x4b, 0xbf, 0x5a, 0x76, + 0x96, 0x8e, 0x08, 0x76, 0x4e, 0x0c, 0xb7, 0xd5, 0xa4, 0x4e, 0xfe, 0xc7, 0x97, 0xeb, 0x0d, 0xae, + 0xfd, 0xa2, 0x39, 0xd1, 0x5d, 0x32, 0xb1, 0xdc, 0x33, 0x45, 0xd8, 0xcb, 0x3f, 0xcb, 0x50, 0xaa, + 0x1c, 0x49, 0x44, 0x0b, 0x7d, 0xeb, 0x6d, 0xa0, 0x4c, 0xa8, 0x4c, 0x4a, 0xe6, 0xef, 0x35, 0x80, + 0x21, 0x76, 0xd4, 0x87, 0xd8, 0x70, 0x89, 0x26, 0x9c, 0x1e, 0x92, 0x20, 0x09, 0x4a, 0x74, 0x34, + 0x75, 0x88, 0x26, 0x2a, 0x36, 0x7f, 0x1c, 0x9a, 0x67, 0xf1, 0xdb, 0xcd, 0x33, 0xea, 0xe5, 0xd2, + 0xac, 0x97, 0x7f, 0x91, 0x09, 0x76, 0x49, 0x50, 0x55, 0xfc, 0xef, 0xf9, 0xe1, 0x57, 0xac, 0xd5, + 0x10, 0x65, 0x04, 0xe8, 0x10, 0x56, 0xfd, 0x5d, 0xaa, 0x4e, 0xd9, 0xee, 0xf5, 0xd6, 0x5d, 0xd2, + 0x6d, 0xde, 0x38, 0x89, 0x8a, 0x1d, 0xf4, 0x03, 0xb8, 0x3a, 0x13, 0x81, 0x7c, 0xe8, 0x4c, 0xc2, + 0x40, 0xf4, 0x58, 0x34, 0x10, 0x79, 0xc8, 0x81, 0xaf, 0xb2, 0xdf, 0x72, 0x6f, 0xec, 0xd0, 0xea, + 0x35, 0xcc, 0x6f, 0x16, 0x7e, 0xfd, 0x1b, 0x50, 0xb5, 0x89, 0x8b, 0x75, 0x43, 0x8d, 0xf4, 0x07, + 0x56, 0xb8, 0x50, 0x74, 0x1d, 0x0e, 0xe0, 0xb1, 0x85, 0x3c, 0x07, 0xfd, 0x3f, 0x94, 0x03, 0x8a, + 0x94, 0x8e, 0x29, 0xb5, 0xfd, 0xf2, 0x31, 0xd0, 0x95, 0xff, 0x98, 0x0e, 0x20, 0xa3, 0x05, 0x69, + 0x07, 0x0a, 0x36, 0x71, 0xa6, 0x63, 0x5e, 0x22, 0xd6, 0xb6, 0x5e, 0x4a, 0xc6, 0x90, 0xa8, 0x74, + 0x3a, 0x76, 0x15, 0x61, 0x2c, 0xdf, 0x87, 0x02, 0x97, 0xa0, 0x0a, 0x14, 0x8f, 0xf6, 0xee, 0xee, + 0xed, 0xbf, 0xbf, 0xd7, 0x48, 0x21, 0x80, 0xc2, 0x76, 0xbb, 0xdd, 0x39, 0xe8, 0x35, 0xd2, 0xa8, + 0x0c, 0xf9, 0xed, 0xd6, 0xbe, 0xd2, 0x6b, 0x64, 0xa8, 0x58, 0xe9, 0xbc, 0xdb, 0x69, 0xf7, 0x1a, + 0x59, 0xb4, 0x0a, 0x55, 0x7e, 0xad, 0xde, 0xd9, 0x57, 0xde, 0xdb, 0xee, 0x35, 0x72, 0x21, 0xd1, + 0x61, 0x67, 0xef, 0x76, 0x47, 0x69, 0xe4, 0xe5, 0x97, 0x69, 0x0d, 0x1a, 0xc3, 0xa9, 0x82, 0x6a, + 0x33, 0x1d, 0xaa, 0x36, 0xe5, 0xdf, 0x64, 0x40, 0x8a, 0x27, 0x4a, 0xe8, 0xdd, 0x99, 0x89, 0x6f, + 0x5d, 0x80, 0x65, 0xcd, 0xcc, 0x1e, 0x3d, 0x0d, 0x35, 0x9b, 0x1c, 0x13, 0x77, 0x30, 0xe2, 0xc4, + 0x8d, 0x27, 0xb6, 0xaa, 0x52, 0x15, 0x52, 0x66, 0xe4, 0x70, 0xb5, 0x8f, 0xc8, 0xc0, 0x55, 0x79, + 0xe1, 0xcb, 0x17, 0x5d, 0x99, 0xaa, 0x51, 0xe9, 0x21, 0x17, 0xca, 0x1f, 0x5e, 0xc8, 0x97, 0x65, + 0xc8, 0x2b, 0x9d, 0x9e, 0xf2, 0xc3, 0x46, 0x16, 0x21, 0xa8, 0xb1, 0x4b, 0xf5, 0x70, 0x6f, 0xfb, + 0xe0, 0xb0, 0xbb, 0x4f, 0x7d, 0x79, 0x09, 0xea, 0x9e, 0x2f, 0x3d, 0x61, 0x5e, 0x3e, 0x80, 0xab, + 0x31, 0x2c, 0xef, 0x1b, 0x56, 0xdc, 0xf2, 0x6f, 0xd3, 0x61, 0xc8, 0x68, 0x29, 0xfd, 0xce, 0x8c, + 0xa7, 0x37, 0x93, 0x72, 0xc3, 0x59, 0x37, 0x4b, 0x50, 0x22, 0xa2, 0x8f, 0xc4, 0x1c, 0xbc, 0xa2, + 0xf8, 0x63, 0xf9, 0xa5, 0xe5, 0x4e, 0x0b, 0x56, 0x5d, 0x46, 0xfe, 0x77, 0x1a, 0xea, 0x33, 0x21, + 0x02, 0x6d, 0x41, 0x9e, 0x97, 0x3f, 0x71, 0xff, 0xb4, 0x58, 0x84, 0x13, 0xf1, 0x84, 0xab, 0xa2, + 0x37, 0x23, 0xaf, 0x34, 0x17, 0x8a, 0xb8, 0xb3, 0xbc, 0xe6, 0x97, 0x30, 0xf5, 0x2d, 0xd0, 0x5b, + 0x50, 0xf6, 0x63, 0x9d, 0xa8, 0xb9, 0x9f, 0x9a, 0x37, 0xf7, 0xa3, 0xa4, 0xb0, 0x0f, 0x6c, 0xd0, + 0xeb, 0x01, 0x2b, 0xcd, 0xcd, 0x17, 0x5d, 0xc2, 0x9c, 0x2b, 0x08, 0x63, 0x4f, 0x5f, 0x6e, 0x43, + 0x25, 0x34, 0x1f, 0xf4, 0x04, 0x94, 0x27, 0xf8, 0x54, 0xb4, 0x4c, 0x79, 0xd3, 0xab, 0x34, 0xc1, + 0xa7, 0xbc, 0x5b, 0x7a, 0x15, 0x8a, 0xf4, 0xe6, 0x10, 0x3b, 0xa2, 0x8f, 0x52, 0x98, 0xe0, 0xd3, + 0x77, 0xb0, 0x23, 0x7f, 0x00, 0xb5, 0x68, 0xbb, 0x90, 0xee, 0x45, 0xdb, 0x9c, 0x1a, 0x1a, 0xc3, + 0xc8, 0x2b, 0x7c, 0x80, 0x6e, 0x41, 0xfe, 0xc4, 0xe4, 0xe1, 0x7a, 0x71, 0xd0, 0xba, 0x67, 0xba, + 0x24, 0xd4, 0x6e, 0xe4, 0xda, 0xf2, 0x23, 0xc8, 0xb3, 0xf0, 0x4b, 0x43, 0x29, 0x6b, 0xfc, 0x09, + 0x46, 0x4e, 0xaf, 0xd1, 0x07, 0x00, 0xd8, 0x75, 0x6d, 0xbd, 0x3f, 0x0d, 0x80, 0xd7, 0x17, 0x87, + 0xef, 0x6d, 0x4f, 0xaf, 0x75, 0x4d, 0xc4, 0xf1, 0xcb, 0x81, 0x69, 0x28, 0x96, 0x87, 0x00, 0xe5, + 0x3d, 0xa8, 0x45, 0x6d, 0xc3, 0x2d, 0xf8, 0x95, 0x05, 0x2d, 0x78, 0x9f, 0xf5, 0xf9, 0x9c, 0x31, + 0xcb, 0x9b, 0xbc, 0x6c, 0x20, 0xff, 0x2e, 0x0d, 0xa5, 0xde, 0xa9, 0x58, 0xa3, 0x31, 0xfd, 0xc5, + 0xc0, 0x34, 0x13, 0xee, 0xa6, 0xf1, 0x86, 0x65, 0xd6, 0x6f, 0x83, 0xbe, 0xed, 0x6f, 0xa8, 0x5c, + 0xd2, 0x62, 0xdf, 0xeb, 0x52, 0x89, 0x9d, 0x74, 0x03, 0xaa, 0xa6, 0xad, 0x0f, 0x75, 0x03, 0x8f, + 0xc3, 0x05, 0xc6, 0x8a, 0x27, 0x64, 0x3c, 0xfa, 0x0d, 0x28, 0xfb, 0x4b, 0x8f, 0xd6, 0x3f, 0x58, + 0xd3, 0x6c, 0xe2, 0x38, 0xc2, 0x01, 0xde, 0x90, 0xf5, 0xb4, 0xcd, 0x87, 0xa2, 0xa9, 0x97, 0x55, + 0xf8, 0x40, 0xd6, 0xa0, 0x3e, 0x93, 0xdd, 0xd1, 0x1b, 0x50, 0xb4, 0xa6, 0x7d, 0xd5, 0xf3, 0xe1, + 0xcc, 0x0e, 0xf3, 0xb8, 0xf0, 0xb4, 0x3f, 0xd6, 0x07, 0x77, 0xc9, 0x99, 0xf7, 0xc6, 0xd6, 0xb4, + 0x7f, 0x97, 0xbb, 0x9a, 0x3f, 0x25, 0x13, 0x7e, 0xca, 0x09, 0x94, 0xbc, 0x95, 0x83, 0xbe, 0x17, + 0xde, 0x4c, 0xde, 0x9f, 0x8e, 0x58, 0xc6, 0x21, 0xe0, 0x43, 0x7b, 0xe9, 0x26, 0xac, 0x3a, 0xfa, + 0xd0, 0x20, 0x9a, 0x1a, 0x54, 0x60, 0xec, 0x69, 0x25, 0xa5, 0xce, 0x6f, 0xec, 0x7a, 0xe5, 0x97, + 0xfc, 0xaf, 0x34, 0x94, 0xbc, 0x5d, 0x8d, 0x5e, 0x0e, 0x2d, 0xce, 0xda, 0x82, 0xee, 0x97, 0xa7, + 0x18, 0xb4, 0xa5, 0xa3, 0xef, 0x9a, 0xb9, 0xf8, 0xbb, 0xc6, 0xfd, 0x5f, 0xf0, 0x7e, 0xf4, 0xe4, + 0x2e, 0xfc, 0xa3, 0xe7, 0x45, 0x40, 0xae, 0xe9, 0xe2, 0xb1, 0x7a, 0x62, 0xba, 0xba, 0x31, 0x54, + 0xb9, 0xb3, 0x39, 0xf1, 0x6c, 0xb0, 0x3b, 0xf7, 0xd8, 0x8d, 0x03, 0xe6, 0xf7, 0x9f, 0xa6, 0xa1, + 0xe4, 0x53, 0x88, 0x8b, 0x76, 0x99, 0xaf, 0x40, 0x41, 0x64, 0x49, 0xde, 0x66, 0x16, 0x23, 0xff, + 0x87, 0x47, 0x2e, 0xf4, 0xc3, 0x43, 0x82, 0xd2, 0x84, 0xb8, 0x98, 0x25, 0x23, 0xbe, 0x46, 0xfd, + 0xf1, 0xcd, 0xd7, 0xa1, 0x12, 0x6a, 0xf8, 0xd3, 0xed, 0xb9, 0xd7, 0x79, 0xbf, 0x91, 0x92, 0x8a, + 0x9f, 0x7c, 0x76, 0x3d, 0xbb, 0x47, 0x1e, 0xd2, 0x35, 0xab, 0x74, 0xda, 0xdd, 0x4e, 0xfb, 0x6e, + 0x23, 0x2d, 0x55, 0x3e, 0xf9, 0xec, 0x7a, 0x51, 0x21, 0xac, 0x69, 0x76, 0xb3, 0x0b, 0x2b, 0xe1, + 0xaf, 0x12, 0xcd, 0x19, 0x08, 0x6a, 0xb7, 0x8f, 0x0e, 0x76, 0x77, 0xda, 0xdb, 0xbd, 0x8e, 0x7a, + 0x6f, 0xbf, 0xd7, 0x69, 0xa4, 0xd1, 0x55, 0xb8, 0xb4, 0xbb, 0xf3, 0x4e, 0xb7, 0xa7, 0xb6, 0x77, + 0x77, 0x3a, 0x7b, 0x3d, 0x75, 0xbb, 0xd7, 0xdb, 0x6e, 0xdf, 0x6d, 0x64, 0xb6, 0xfe, 0x52, 0x81, + 0xfa, 0x76, 0xab, 0xbd, 0x43, 0x49, 0x82, 0x3e, 0xc0, 0xa2, 0x29, 0x99, 0x63, 0x3d, 0x88, 0x73, + 0x4f, 0x45, 0x48, 0xe7, 0xf7, 0x64, 0xd1, 0x1d, 0xc8, 0xb3, 0xf6, 0x04, 0x3a, 0xff, 0x98, 0x84, + 0xb4, 0xa4, 0x49, 0x4b, 0x5f, 0x86, 0x6d, 0x8f, 0x73, 0xcf, 0x4d, 0x48, 0xe7, 0xf7, 0x6c, 0x91, + 0x02, 0xe5, 0xa0, 0xbf, 0xb0, 0xfc, 0x1c, 0x85, 0x94, 0xa0, 0x8f, 0x4b, 0x31, 0x83, 0xea, 0x69, + 0xf9, 0xb9, 0x02, 0x29, 0x41, 0x94, 0x43, 0xbb, 0x50, 0xf4, 0xea, 0xd2, 0x65, 0x27, 0x1d, 0xa4, + 0xa5, 0x3d, 0x56, 0xfa, 0x09, 0x78, 0xff, 0xe0, 0xfc, 0x63, 0x1b, 0xd2, 0x92, 0x86, 0x31, 0xda, + 0x81, 0x82, 0x28, 0x09, 0x96, 0x9c, 0x5e, 0x90, 0x96, 0xf5, 0x4c, 0xa9, 0xd3, 0x82, 0xc6, 0xcc, + 0xf2, 0xc3, 0x28, 0x52, 0x82, 0x5e, 0x38, 0x3a, 0x02, 0x08, 0x75, 0x0b, 0x12, 0x9c, 0x32, 0x91, + 0x92, 0xf4, 0xb8, 0xd1, 0x3e, 0x94, 0xfc, 0xaa, 0x70, 0xe9, 0x99, 0x0f, 0x69, 0x79, 0xb3, 0x19, + 0xdd, 0x87, 0x6a, 0xb4, 0x1c, 0x4a, 0x76, 0x92, 0x43, 0x4a, 0xd8, 0x45, 0xa6, 0xf8, 0xd1, 0xda, + 0x28, 0xd9, 0xc9, 0x0e, 0x29, 0x61, 0x53, 0x19, 0x7d, 0x04, 0xab, 0xf3, 0xb5, 0x4b, 0xf2, 0x83, + 0x1e, 0xd2, 0x05, 0xda, 0xcc, 0x68, 0x02, 0x68, 0x41, 0xcd, 0x73, 0x81, 0x73, 0x1f, 0xd2, 0x45, + 0xba, 0xce, 0x48, 0x83, 0xfa, 0x6c, 0x21, 0x91, 0xf4, 0x1c, 0x88, 0x94, 0xb8, 0x03, 0xcd, 0x9f, + 0x12, 0xad, 0x2d, 0x92, 0x9e, 0x0b, 0x91, 0x12, 0x37, 0xa4, 0x5b, 0x9d, 0xcf, 0xbf, 0x5a, 0x4b, + 0x7f, 0xf1, 0xd5, 0x5a, 0xfa, 0xef, 0x5f, 0xad, 0xa5, 0x3f, 0xfd, 0x7a, 0x2d, 0xf5, 0xc5, 0xd7, + 0x6b, 0xa9, 0xbf, 0x7e, 0xbd, 0x96, 0xfa, 0xd1, 0x0b, 0x43, 0xdd, 0x1d, 0x4d, 0xfb, 0x1b, 0x03, + 0x73, 0xb2, 0x19, 0x3e, 0x60, 0xb7, 0xe8, 0xd0, 0x5f, 0xbf, 0xc0, 0x92, 0xee, 0x2b, 0xff, 0x09, + 0x00, 0x00, 0xff, 0xff, 0x16, 0x0c, 0xd3, 0x03, 0x14, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3540,7 +3712,8 @@ 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) + PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) + ProcessProposal(ctx context.Context, in *RequestProcessProposal, opts ...grpc.CallOption) (*ResponseProcessProposal, error) } type aBCIApplicationClient struct { @@ -3686,9 +3859,18 @@ 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...) +func (c *aBCIApplicationClient) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) { + out := new(ResponsePrepareProposal) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/PrepareProposal", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *aBCIApplicationClient) ProcessProposal(ctx context.Context, in *RequestProcessProposal, opts ...grpc.CallOption) (*ResponseProcessProposal, error) { + out := new(ResponseProcessProposal) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ProcessProposal", in, out, opts...) if err != nil { return nil, err } @@ -3712,7 +3894,8 @@ 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) + PrepareProposal(context.Context, *RequestPrepareProposal) (*ResponsePrepareProposal, error) + ProcessProposal(context.Context, *RequestProcessProposal) (*ResponseProcessProposal, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3764,8 +3947,11 @@ 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 (*UnimplementedABCIApplicationServer) PrepareProposal(ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { + return nil, status.Errorf(codes.Unimplemented, "method PrepareProposal not implemented") +} +func (*UnimplementedABCIApplicationServer) ProcessProposal(ctx context.Context, req *RequestProcessProposal) (*ResponseProcessProposal, error) { + return nil, status.Errorf(codes.Unimplemented, "method ProcessProposal not implemented") } func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { @@ -4042,20 +4228,38 @@ 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) +func _ABCIApplication_PrepareProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestPrepareProposal) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).PrepareProposal(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/PrepareProposal", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).PrepareProposal(ctx, req.(*RequestPrepareProposal)) + } + return interceptor(ctx, in, info, handler) +} + +func _ABCIApplication_ProcessProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestProcessProposal) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ABCIApplicationServer).PreprocessTxs(ctx, in) + return srv.(ABCIApplicationServer).ProcessProposal(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/PreprocessTxs", + FullMethod: "/tendermint.abci.ABCIApplication/ProcessProposal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ABCIApplicationServer).PreprocessTxs(ctx, req.(*RequestPreprocessTxs)) + return srv.(ABCIApplicationServer).ProcessProposal(ctx, req.(*RequestProcessProposal)) } return interceptor(ctx, in, info, handler) } @@ -4125,8 +4329,12 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, { - MethodName: "PreprocessTxs", - Handler: _ABCIApplication_PreprocessTxs_Handler, + MethodName: "PrepareProposal", + Handler: _ABCIApplication_PrepareProposal_Handler, + }, + { + MethodName: "ProcessProposal", + Handler: _ABCIApplication_ProcessProposal_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -4480,16 +4688,16 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } -func (m *Request_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *Request_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Request_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Request_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.PreprocessTxs != nil { + if m.PrepareProposal != nil { { - size, err := m.PreprocessTxs.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PrepareProposal.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4503,6 +4711,29 @@ func (m *Request_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } +func (m *Request_ProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_ProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.ProcessProposal != nil { + { + size, err := m.ProcessProposal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} func (m *RequestEcho) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4698,12 +4929,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err18 != nil { - return 0, err18 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err19 != nil { + return 0, err19 } - i -= n18 - i = encodeVarintTypes(dAtA, i, uint64(n18)) + i -= n19 + i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -5086,7 +5317,7 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } -func (m *RequestPreprocessTxs) Marshal() (dAtA []byte, err error) { +func (m *RequestPrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5096,25 +5327,78 @@ func (m *RequestPreprocessTxs) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RequestPreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *RequestPrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestPreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *RequestPrepareProposal) 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 + if m.BlockDataSize != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) + i-- + dAtA[i] = 0x10 + } + if m.BlockData != nil { + { + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *RequestProcessProposal) 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 *RequestProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BlockData != nil { + { + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + { + size, err := m.Header.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -5488,16 +5772,16 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } -func (m *Response_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *Response_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Response_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Response_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.PreprocessTxs != nil { + if m.PrepareProposal != nil { { - size, err := m.PreprocessTxs.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PrepareProposal.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5511,27 +5795,50 @@ func (m *Response_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } -func (m *ResponseException) 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 *ResponseException) MarshalTo(dAtA []byte) (int, error) { +func (m *Response_ProcessProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ResponseException) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Response_ProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Error) > 0 { + if m.ProcessProposal != nil { + { + size, err := m.ProcessProposal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + return len(dAtA) - i, nil +} +func (m *ResponseException) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ResponseException) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseException) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Error) > 0 { i -= len(m.Error) copy(dAtA[i:], m.Error) i = encodeVarintTypes(dAtA, i, uint64(len(m.Error))) @@ -6251,20 +6558,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA43 := make([]byte, len(m.RefetchChunks)*10) - var j42 int + dAtA48 := make([]byte, len(m.RefetchChunks)*10) + var j47 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA43[j42] = uint8(uint64(num)&0x7f | 0x80) + dAtA48[j47] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j42++ + j47++ } - dAtA43[j42] = uint8(num) - j42++ + dAtA48[j47] = uint8(num) + j47++ } - i -= j42 - copy(dAtA[i:], dAtA43[:j42]) - i = encodeVarintTypes(dAtA, i, uint64(j42)) + i -= j47 + copy(dAtA[i:], dAtA48[:j47]) + i = encodeVarintTypes(dAtA, i, uint64(j47)) i-- dAtA[i] = 0x12 } @@ -6276,7 +6583,7 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *ResponsePreprocessTxs) Marshal() (dAtA []byte, err error) { +func (m *ResponsePrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -6286,19 +6593,19 @@ func (m *ResponsePreprocessTxs) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResponsePreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *ResponsePrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ResponsePreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ResponsePrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Messages != nil { + if m.BlockData != nil { { - size, err := m.Messages.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6306,17 +6613,45 @@ func (m *ResponsePreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa } - 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]))) + return len(dAtA) - i, nil +} + +func (m *ResponseProcessProposal) 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 *ResponseProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Evidence) > 0 { + for iNdEx := len(m.Evidence) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Evidence[iNdEx]) + copy(dAtA[i:], m.Evidence[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Evidence[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -6755,12 +7090,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n52, err52 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err52 != nil { - return 0, err52 + n57, err57 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err57 != nil { + return 0, err57 } - i -= n52 - i = encodeVarintTypes(dAtA, i, uint64(n52)) + i -= n57 + i = encodeVarintTypes(dAtA, i, uint64(n57)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7041,14 +7376,26 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { } return n } -func (m *Request_PreprocessTxs) Size() (n int) { +func (m *Request_PrepareProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.PreprocessTxs != nil { - l = m.PreprocessTxs.Size() + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Request_ProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProcessProposal != nil { + l = m.ProcessProposal.Size() n += 2 + l + sovTypes(uint64(l)) } return n @@ -7303,17 +7650,33 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } -func (m *RequestPreprocessTxs) Size() (n int) { +func (m *RequestPrepareProposal) 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.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) + } + if m.BlockDataSize != 0 { + n += 1 + sovTypes(uint64(m.BlockDataSize)) + } + return n +} + +func (m *RequestProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Header.Size() + n += 1 + l + sovTypes(uint64(l)) + if m.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) } return n } @@ -7522,14 +7885,26 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { } return n } -func (m *Response_PreprocessTxs) Size() (n int) { +func (m *Response_PrepareProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.PreprocessTxs != nil { - l = m.PreprocessTxs.Size() + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Response_ProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProcessProposal != nil { + l = m.ProcessProposal.Size() n += 2 + l + sovTypes(uint64(l)) } return n @@ -7882,22 +8257,34 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } -func (m *ResponsePreprocessTxs) Size() (n int) { +func (m *ResponsePrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *ResponseProcessProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Txs) > 0 { - for _, b := range m.Txs { + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + if len(m.Evidence) > 0 { + for _, b := range m.Evidence { 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 } @@ -8677,7 +9064,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 16: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8704,11 +9091,46 @@ func (m *Request) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &RequestPreprocessTxs{} + v := &RequestPrepareProposal{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &Request_PreprocessTxs{v} + m.Value = &Request_PrepareProposal{v} + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProcessProposal", 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 := &RequestProcessProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_ProcessProposal{v} iNdEx = postIndex default: iNdEx = preIndex @@ -10392,7 +10814,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { +func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -10415,17 +10837,17 @@ func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RequestPreprocessTxs: wiretype end group for non-group") + return fmt.Errorf("proto: RequestPrepareProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RequestPreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RequestPrepareProposal: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -10435,23 +10857,165 @@ func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + if m.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + } + m.BlockDataSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockDataSize |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RequestProcessProposal) 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: RequestProcessProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", 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 err := m.Header.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", 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.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -11065,7 +11629,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 17: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11092,11 +11656,46 @@ func (m *Response) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ResponsePreprocessTxs{} + v := &ResponsePrepareProposal{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &Response_PreprocessTxs{v} + m.Value = &Response_PrepareProposal{v} + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProcessProposal", 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 := &ResponseProcessProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_ProcessProposal{v} iNdEx = postIndex default: iNdEx = preIndex @@ -13410,7 +14009,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { +func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -13433,17 +14032,17 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResponsePreprocessTxs: wiretype end group for non-group") + return fmt.Errorf("proto: ResponsePrepareProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResponsePreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResponsePrepareProposal: 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) + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13453,29 +14052,102 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + if m.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.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 *ResponseProcessProposal) 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: ResponseProcessProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= ResponseProcessProposal_Result(b&0x7F) << shift + if b < 0x80 { + break + } + } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Messages", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Evidence", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13485,27 +14157,23 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen 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 - } + m.Evidence = append(m.Evidence, make([]byte, postIndex-iNdEx)) + copy(m.Evidence[len(m.Evidence)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index f5e372ae22..f4c3c9b635 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -202,7 +202,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { // Make proposal propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} - proposal := types.NewProposal(height, round, lazyProposer.ValidRound, propBlockID) + proposal := types.NewProposal(height, round, lazyProposer.TwoThirdPrevoteRound, propBlockID) p := proposal.ToProto() if err := lazyProposer.privValidator.SignProposal(lazyProposer.state.ChainID, p); err == nil { proposal.Signature = p.Signature @@ -441,7 +441,8 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St // Create a new proposal block from state/txs from the mempool. block1, blockParts1 := cs.createProposalBlock() - polRound, propBlockID := cs.ValidRound, types.BlockID{Hash: block1.Hash(), PartSetHeader: blockParts1.Header()} + polRound := cs.TwoThirdPrevoteRound + propBlockID := types.BlockID{Hash: block1.Hash(), PartSetHeader: blockParts1.Header()} proposal1 := types.NewProposal(height, round, polRound, propBlockID) p1 := proposal1.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p1); err != nil { @@ -455,7 +456,8 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St // Create a new proposal block from state/txs from the mempool. block2, blockParts2 := cs.createProposalBlock() - polRound, propBlockID = cs.ValidRound, types.BlockID{Hash: block2.Hash(), PartSetHeader: blockParts2.Header()} + polRound = cs.TwoThirdPrevoteRound + propBlockID = types.BlockID{Hash: block2.Hash(), PartSetHeader: blockParts2.Header()} proposal2 := types.NewProposal(height, round, polRound, propBlockID) p2 := proposal2.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p2); err != nil { diff --git a/consensus/common_test.go b/consensus/common_test.go index 60bb9eed5c..428f4ec5ba 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -206,7 +206,7 @@ func decideProposal( ) (proposal *types.Proposal, block *types.Block) { cs1.mtx.Lock() block, blockParts := cs1.createProposalBlock() - validRound := cs1.ValidRound + validRound := cs1.TwoThirdPrevoteRound chainID := cs1.state.ChainID cs1.mtx.Unlock() if block == nil { diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 2a9930bc2e..a0cdae1dfa 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -257,7 +257,7 @@ func (app *CounterApplication) Commit() abci.ResponseCommit { return abci.ResponseCommit{Data: hash} } -func (app *CounterApplication) PreprocessTxs( - req abci.RequestPreprocessTxs) abci.ResponsePreprocessTxs { - return abci.ResponsePreprocessTxs{Txs: req.Txs} +func (app *CounterApplication) PrepareProposal( + req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { + return abci.ResponsePrepareProposal{BlockData: req.BlockData} } diff --git a/consensus/state.go b/consensus/state.go index ac016c91a1..42f274e139 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -666,9 +666,9 @@ func (cs *State) updateToState(state sm.State) { cs.LockedRound = -1 cs.LockedBlock = nil cs.LockedBlockParts = nil - cs.ValidRound = -1 - cs.ValidBlock = nil - cs.ValidBlockParts = nil + cs.TwoThirdPrevoteRound = -1 + cs.TwoThirdPrevoteBlock = nil + cs.TwoThirdPrevoteBlockParts = nil cs.Votes = cstypes.NewHeightVoteSet(state.ChainID, height, validators) cs.CommitRound = -1 cs.LastValidators = state.LastValidators @@ -1108,9 +1108,9 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { var blockParts *types.PartSet // Decide on block - if cs.ValidBlock != nil { + if cs.TwoThirdPrevoteBlock != nil { // If there is valid block, choose that. - block, blockParts = cs.ValidBlock, cs.ValidBlockParts + block, blockParts = cs.TwoThirdPrevoteBlock, cs.TwoThirdPrevoteBlockParts } else { // Create a new proposal block from state/txs from the mempool. block, blockParts = cs.createProposalBlock() @@ -1127,7 +1127,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { // Make proposal propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} - proposal := types.NewProposal(height, round, cs.ValidRound, propBlockID) + proposal := types.NewProposal(height, round, cs.TwoThirdPrevoteRound, propBlockID) p := proposal.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p); err == nil { proposal.Signature = p.Signature @@ -1258,6 +1258,19 @@ func (cs *State) defaultDoPrevote(height int64, round int32) { return } + stateMachineValidBlock, err := cs.blockExec.ProcessProposal(cs.ProposalBlock) + if err != nil { + cs.Logger.Error("state machine returned an error when trying to process proposal block", "err", err) + } + + // Vote nil if application invalidated the block + if !stateMachineValidBlock { + // Consensus says we must vote nil + logger.Error("prevote step: consensus deems this block to be mustVoteNil", "err", err) + cs.signAddVote(tmproto.PrevoteType, nil, types.PartSetHeader{}) + return + } + // Prevote cs.ProposalBlock // NOTE: the proposal signature is validated when it is received, // and the proposal block parts are validated as they are received (against the merkle hash in the proposal) @@ -1889,7 +1902,7 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID p2p.ID) (add // Update Valid* if we can. prevotes := cs.Votes.Prevotes(cs.Round) blockID, hasTwoThirds := prevotes.TwoThirdsMajority() - if hasTwoThirds && !blockID.IsZero() && (cs.ValidRound < cs.Round) { + if hasTwoThirds && !blockID.IsZero() && (cs.TwoThirdPrevoteRound < cs.Round) { if cs.ProposalBlock.HashesTo(blockID.Hash) { cs.Logger.Debug( "updating valid block to new proposal block", @@ -1897,9 +1910,9 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID p2p.ID) (add "valid_block_hash", cs.ProposalBlock.Hash(), ) - cs.ValidRound = cs.Round - cs.ValidBlock = cs.ProposalBlock - cs.ValidBlockParts = cs.ProposalBlockParts + cs.TwoThirdPrevoteRound = cs.Round + cs.TwoThirdPrevoteBlock = cs.ProposalBlock + cs.TwoThirdPrevoteBlockParts = cs.ProposalBlockParts } // TODO: In case there is +2/3 majority in Prevotes set for some // block and cs.ProposalBlock contains different block, either @@ -2064,12 +2077,18 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error // Update Valid* if we can. // NOTE: our proposal block may be nil or not what received a polka.. - if len(blockID.Hash) != 0 && (cs.ValidRound < vote.Round) && (vote.Round == cs.Round) { + if len(blockID.Hash) != 0 && (cs.TwoThirdPrevoteRound < vote.Round) && (vote.Round == cs.Round) { if cs.ProposalBlock.HashesTo(blockID.Hash) { - cs.Logger.Debug("updating valid block because of POL", "valid_round", cs.ValidRound, "pol_round", vote.Round) - cs.ValidRound = vote.Round - cs.ValidBlock = cs.ProposalBlock - cs.ValidBlockParts = cs.ProposalBlockParts + cs.Logger.Debug( + "updating valid block because of POL", + "valid_round", + cs.TwoThirdPrevoteRound, + "pol_round", + vote.Round, + ) + cs.TwoThirdPrevoteRound = vote.Round + cs.TwoThirdPrevoteBlock = cs.ProposalBlock + cs.TwoThirdPrevoteBlockParts = cs.ProposalBlockParts } else { cs.Logger.Debug( "valid block we do not know about; set ProposalBlock=nil", diff --git a/consensus/state_test.go b/consensus/state_test.go index 1e3887fd97..8403f49506 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -1199,9 +1199,9 @@ func TestProposeValidBlock(t *testing.T) { rs = cs1.GetRoundState() assert.True(t, bytes.Equal(rs.ProposalBlock.Hash(), propBlockHash)) - assert.True(t, bytes.Equal(rs.ProposalBlock.Hash(), rs.ValidBlock.Hash())) - assert.True(t, rs.Proposal.POLRound == rs.ValidRound) - assert.True(t, bytes.Equal(rs.Proposal.BlockID.Hash, rs.ValidBlock.Hash())) + assert.True(t, bytes.Equal(rs.ProposalBlock.Hash(), rs.TwoThirdPrevoteBlock.Hash())) + assert.True(t, rs.Proposal.POLRound == rs.TwoThirdPrevoteRound) + assert.True(t, bytes.Equal(rs.Proposal.BlockID.Hash, rs.TwoThirdPrevoteBlock.Hash())) } // What we want: @@ -1249,9 +1249,9 @@ func TestSetValidBlockOnDelayedPrevote(t *testing.T) { rs = cs1.GetRoundState() - assert.True(t, rs.ValidBlock == nil) - assert.True(t, rs.ValidBlockParts == nil) - assert.True(t, rs.ValidRound == -1) + assert.True(t, rs.TwoThirdPrevoteBlock == nil) + assert.True(t, rs.TwoThirdPrevoteBlockParts == nil) + assert.True(t, rs.TwoThirdPrevoteRound == -1) // vs2 send (delayed) prevote for propBlock signAddVotes(cs1, tmproto.PrevoteType, propBlockHash, propBlockParts.Header(), vs4) @@ -1260,9 +1260,9 @@ func TestSetValidBlockOnDelayedPrevote(t *testing.T) { rs = cs1.GetRoundState() - assert.True(t, bytes.Equal(rs.ValidBlock.Hash(), propBlockHash)) - assert.True(t, rs.ValidBlockParts.Header().Equals(propBlockParts.Header())) - assert.True(t, rs.ValidRound == round) + assert.True(t, bytes.Equal(rs.TwoThirdPrevoteBlock.Hash(), propBlockHash)) + assert.True(t, rs.TwoThirdPrevoteBlockParts.Header().Equals(propBlockParts.Header())) + assert.True(t, rs.TwoThirdPrevoteRound == round) } // What we want: @@ -1316,9 +1316,9 @@ func TestSetValidBlockOnDelayedProposal(t *testing.T) { ensureNewProposal(proposalCh, height, round) rs := cs1.GetRoundState() - assert.True(t, bytes.Equal(rs.ValidBlock.Hash(), propBlockHash)) - assert.True(t, rs.ValidBlockParts.Header().Equals(propBlockParts.Header())) - assert.True(t, rs.ValidRound == round) + assert.True(t, bytes.Equal(rs.TwoThirdPrevoteBlock.Hash(), propBlockHash)) + assert.True(t, rs.TwoThirdPrevoteBlockParts.Header().Equals(propBlockParts.Header())) + assert.True(t, rs.TwoThirdPrevoteRound == round) } // 4 vals, 3 Nil Precommits at P0 diff --git a/consensus/types/round_state.go b/consensus/types/round_state.go index 9e67b76c07..3b11c2e174 100644 --- a/consensus/types/round_state.go +++ b/consensus/types/round_state.go @@ -81,11 +81,11 @@ type RoundState struct { LockedBlockParts *types.PartSet `json:"locked_block_parts"` // Last known round with POL for non-nil valid block. - ValidRound int32 `json:"valid_round"` - ValidBlock *types.Block `json:"valid_block"` // Last known block of POL mentioned above. + TwoThirdPrevoteRound int32 `json:"valid_round"` + TwoThirdPrevoteBlock *types.Block `json:"valid_block"` // Last known block of POL mentioned above. // Last known block parts of POL mentioned above. - ValidBlockParts *types.PartSet `json:"valid_block_parts"` + TwoThirdPrevoteBlockParts *types.PartSet `json:"valid_block_parts"` Votes *HeightVoteSet `json:"votes"` CommitRound int32 `json:"commit_round"` // LastCommit *types.VoteSet `json:"last_commit"` // Last precommits at Height-1 @@ -119,7 +119,7 @@ func (rs *RoundState) RoundStateSimple() RoundStateSimple { StartTime: rs.StartTime, ProposalBlockHash: rs.ProposalBlock.Hash(), LockedBlockHash: rs.LockedBlock.Hash(), - ValidBlockHash: rs.ValidBlock.Hash(), + ValidBlockHash: rs.TwoThirdPrevoteBlock.Hash(), Votes: votesJSON, Proposer: types.ValidatorInfo{ Address: addr, @@ -186,8 +186,8 @@ func (rs *RoundState) StringIndented(indent string) string { %s ProposalBlock: %v %v %s LockedRound: %v %s LockedBlock: %v %v -%s ValidRound: %v -%s ValidBlock: %v %v +%s TwoThirdPrevoteRound: %v +%s TwoThirdPrevoteBlock: %v %v %s Votes: %v %s LastCommit: %v %s LastValidators:%v @@ -200,8 +200,8 @@ func (rs *RoundState) StringIndented(indent string) string { indent, rs.ProposalBlockParts.StringShort(), rs.ProposalBlock.StringShort(), indent, rs.LockedRound, indent, rs.LockedBlockParts.StringShort(), rs.LockedBlock.StringShort(), - indent, rs.ValidRound, - indent, rs.ValidBlockParts.StringShort(), rs.ValidBlock.StringShort(), + indent, rs.TwoThirdPrevoteRound, + indent, rs.TwoThirdPrevoteBlockParts.StringShort(), rs.TwoThirdPrevoteBlock.StringShort(), indent, rs.Votes.StringIndented(indent+" "), indent, rs.LastCommit.StringShort(), indent, rs.LastValidators.StringIndented(indent+" "), diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index e6205939ab..4fc722198b 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -1,4 +1,4 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/libs/pubsub/query/query.peg.go b/libs/pubsub/query/query.peg.go index a8e14c8698..98f8f4ed1e 100644 --- a/libs/pubsub/query/query.peg.go +++ b/libs/pubsub/query/query.peg.go @@ -1,4 +1,4 @@ -// nolint +//nolint package query import ( diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go index 7bd0175c5e..0498f73175 100644 --- a/light/rpc/mocks/light_client.go +++ b/light/rpc/mocks/light_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index 8f0e5ee5c3..31f2cd24d7 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/proto/tendermint/abci/types.pb.go b/proto/tendermint/abci/types.pb.go index 7215e34d94..32a7cc12b7 100644 --- a/proto/tendermint/abci/types.pb.go +++ b/proto/tendermint/abci/types.pb.go @@ -120,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31, 0} + return fileDescriptor_252557cfdd89a31a, []int{32, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,35 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33, 0} + return fileDescriptor_252557cfdd89a31a, []int{34, 0} +} + +type ResponseProcessProposal_Result int32 + +const ( + ResponseProcessProposal_UNKNOWN ResponseProcessProposal_Result = 0 + ResponseProcessProposal_ACCEPT ResponseProcessProposal_Result = 1 + ResponseProcessProposal_REJECT ResponseProcessProposal_Result = 2 +) + +var ResponseProcessProposal_Result_name = map[int32]string{ + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "REJECT", +} + +var ResponseProcessProposal_Result_value = map[string]int32{ + "UNKNOWN": 0, + "ACCEPT": 1, + "REJECT": 2, +} + +func (x ResponseProcessProposal_Result) String() string { + return proto.EnumName(ResponseProcessProposal_Result_name, int32(x)) +} + +func (ResponseProcessProposal_Result) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36, 0} } type Request struct { @@ -177,7 +205,8 @@ type Request struct { // *Request_OfferSnapshot // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk - // *Request_PreprocessTxs + // *Request_PrepareProposal + // *Request_ProcessProposal Value isRequest_Value `protobuf_oneof:"value"` } @@ -265,8 +294,11 @@ type Request_LoadSnapshotChunk struct { type Request_ApplySnapshotChunk struct { ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } -type Request_PreprocessTxs struct { - PreprocessTxs *RequestPreprocessTxs `protobuf:"bytes,16,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +type Request_PrepareProposal struct { + PrepareProposal *RequestPrepareProposal `protobuf:"bytes,16,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} +type Request_ProcessProposal struct { + ProcessProposal *RequestProcessProposal `protobuf:"bytes,17,opt,name=process_proposal,json=processProposal,proto3,oneof" json:"process_proposal,omitempty"` } func (*Request_Echo) isRequest_Value() {} @@ -284,7 +316,8 @@ 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 (*Request_PrepareProposal) isRequest_Value() {} +func (*Request_ProcessProposal) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -398,9 +431,16 @@ func (m *Request) GetApplySnapshotChunk() *RequestApplySnapshotChunk { return nil } -func (m *Request) GetPreprocessTxs() *RequestPreprocessTxs { - if x, ok := m.GetValue().(*Request_PreprocessTxs); ok { - return x.PreprocessTxs +func (m *Request) GetPrepareProposal() *RequestPrepareProposal { + if x, ok := m.GetValue().(*Request_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + +func (m *Request) GetProcessProposal() *RequestProcessProposal { + if x, ok := m.GetValue().(*Request_ProcessProposal); ok { + return x.ProcessProposal } return nil } @@ -423,7 +463,8 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_OfferSnapshot)(nil), (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), - (*Request_PreprocessTxs)(nil), + (*Request_PrepareProposal)(nil), + (*Request_ProcessProposal)(nil), } } @@ -1228,22 +1269,79 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } -type RequestPreprocessTxs struct { - Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` +type RequestPrepareProposal struct { + // block_data is an array of transactions that will be included in a block, + // sent to the app for possible modifications. + // applications can not exceed the size of the data passed to it. + BlockData *types1.Data `protobuf:"bytes,1,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + // If an application decides to populate block_data with extra information, they can not exceed this value. + BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` } -func (m *RequestPreprocessTxs) Reset() { *m = RequestPreprocessTxs{} } -func (m *RequestPreprocessTxs) String() string { return proto.CompactTextString(m) } -func (*RequestPreprocessTxs) ProtoMessage() {} -func (*RequestPreprocessTxs) Descriptor() ([]byte, []int) { +func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } +func (m *RequestPrepareProposal) String() string { return proto.CompactTextString(m) } +func (*RequestPrepareProposal) ProtoMessage() {} +func (*RequestPrepareProposal) Descriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{16} } -func (m *RequestPreprocessTxs) XXX_Unmarshal(b []byte) error { +func (m *RequestPrepareProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestPrepareProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestPrepareProposal.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 *RequestPrepareProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestPrepareProposal.Merge(m, src) +} +func (m *RequestPrepareProposal) XXX_Size() int { + return m.Size() +} +func (m *RequestPrepareProposal) XXX_DiscardUnknown() { + xxx_messageInfo_RequestPrepareProposal.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestPrepareProposal proto.InternalMessageInfo + +func (m *RequestPrepareProposal) GetBlockData() *types1.Data { + if m != nil { + return m.BlockData + } + return nil +} + +func (m *RequestPrepareProposal) GetBlockDataSize() int64 { + if m != nil { + return m.BlockDataSize + } + return 0 +} + +type RequestProcessProposal struct { + Header types1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` + BlockData *types1.Data `protobuf:"bytes,2,opt,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` +} + +func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } +func (m *RequestProcessProposal) String() string { return proto.CompactTextString(m) } +func (*RequestProcessProposal) ProtoMessage() {} +func (*RequestProcessProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{17} +} +func (m *RequestProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *RequestPreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *RequestProcessProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_RequestPreprocessTxs.Marshal(b, m, deterministic) + return xxx_messageInfo_RequestProcessProposal.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1253,21 +1351,28 @@ func (m *RequestPreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *RequestPreprocessTxs) XXX_Merge(src proto.Message) { - xxx_messageInfo_RequestPreprocessTxs.Merge(m, src) +func (m *RequestProcessProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestProcessProposal.Merge(m, src) } -func (m *RequestPreprocessTxs) XXX_Size() int { +func (m *RequestProcessProposal) XXX_Size() int { return m.Size() } -func (m *RequestPreprocessTxs) XXX_DiscardUnknown() { - xxx_messageInfo_RequestPreprocessTxs.DiscardUnknown(m) +func (m *RequestProcessProposal) XXX_DiscardUnknown() { + xxx_messageInfo_RequestProcessProposal.DiscardUnknown(m) } -var xxx_messageInfo_RequestPreprocessTxs proto.InternalMessageInfo +var xxx_messageInfo_RequestProcessProposal proto.InternalMessageInfo + +func (m *RequestProcessProposal) GetHeader() types1.Header { + if m != nil { + return m.Header + } + return types1.Header{} +} -func (m *RequestPreprocessTxs) GetTxs() [][]byte { +func (m *RequestProcessProposal) GetBlockData() *types1.Data { if m != nil { - return m.Txs + return m.BlockData } return nil } @@ -1290,7 +1395,8 @@ type Response struct { // *Response_OfferSnapshot // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk - // *Response_PreprocessTxs + // *Response_PrepareProposal + // *Response_ProcessProposal Value isResponse_Value `protobuf_oneof:"value"` } @@ -1298,7 +1404,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{17} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1381,8 +1487,11 @@ type Response_LoadSnapshotChunk struct { type Response_ApplySnapshotChunk struct { ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,16,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } -type Response_PreprocessTxs struct { - PreprocessTxs *ResponsePreprocessTxs `protobuf:"bytes,17,opt,name=preprocess_txs,json=preprocessTxs,proto3,oneof" json:"preprocess_txs,omitempty"` +type Response_PrepareProposal struct { + PrepareProposal *ResponsePrepareProposal `protobuf:"bytes,17,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} +type Response_ProcessProposal struct { + ProcessProposal *ResponseProcessProposal `protobuf:"bytes,18,opt,name=process_proposal,json=processProposal,proto3,oneof" json:"process_proposal,omitempty"` } func (*Response_Exception) isResponse_Value() {} @@ -1401,7 +1510,8 @@ 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 (*Response_PrepareProposal) isResponse_Value() {} +func (*Response_ProcessProposal) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1522,9 +1632,16 @@ func (m *Response) GetApplySnapshotChunk() *ResponseApplySnapshotChunk { return nil } -func (m *Response) GetPreprocessTxs() *ResponsePreprocessTxs { - if x, ok := m.GetValue().(*Response_PreprocessTxs); ok { - return x.PreprocessTxs +func (m *Response) GetPrepareProposal() *ResponsePrepareProposal { + if x, ok := m.GetValue().(*Response_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + +func (m *Response) GetProcessProposal() *ResponseProcessProposal { + if x, ok := m.GetValue().(*Response_ProcessProposal); ok { + return x.ProcessProposal } return nil } @@ -1548,7 +1665,8 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_OfferSnapshot)(nil), (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), - (*Response_PreprocessTxs)(nil), + (*Response_PrepareProposal)(nil), + (*Response_ProcessProposal)(nil), } } @@ -1561,7 +1679,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{18} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1605,7 +1723,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{19} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1648,7 +1766,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{20} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1689,7 +1807,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{21} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1765,7 +1883,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1825,7 +1943,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{23} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1892,7 +2010,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{24} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1992,7 +2110,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{25} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2043,7 +2161,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{26} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2143,7 +2261,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{27} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2238,7 +2356,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{28} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2298,7 +2416,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{29} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2349,7 +2467,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{30} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2393,7 +2511,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{31} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2437,7 +2555,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{32} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2483,7 +2601,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{33} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2533,23 +2651,22 @@ 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"` +type ResponsePrepareProposal struct { + BlockData *types1.Data `protobuf:"bytes,1,opt,name=block_data,json=blockData,proto3" json:"block_data,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{34} +func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal{} } +func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } +func (*ResponsePrepareProposal) ProtoMessage() {} +func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{35} } -func (m *ResponsePreprocessTxs) XXX_Unmarshal(b []byte) error { +func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ResponsePreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *ResponsePrepareProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ResponsePreprocessTxs.Marshal(b, m, deterministic) + return xxx_messageInfo_ResponsePrepareProposal.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2559,28 +2676,73 @@ func (m *ResponsePreprocessTxs) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *ResponsePreprocessTxs) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResponsePreprocessTxs.Merge(m, src) +func (m *ResponsePrepareProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponsePrepareProposal.Merge(m, src) } -func (m *ResponsePreprocessTxs) XXX_Size() int { +func (m *ResponsePrepareProposal) XXX_Size() int { return m.Size() } -func (m *ResponsePreprocessTxs) XXX_DiscardUnknown() { - xxx_messageInfo_ResponsePreprocessTxs.DiscardUnknown(m) +func (m *ResponsePrepareProposal) XXX_DiscardUnknown() { + xxx_messageInfo_ResponsePrepareProposal.DiscardUnknown(m) } -var xxx_messageInfo_ResponsePreprocessTxs proto.InternalMessageInfo +var xxx_messageInfo_ResponsePrepareProposal proto.InternalMessageInfo -func (m *ResponsePreprocessTxs) GetTxs() [][]byte { +func (m *ResponsePrepareProposal) GetBlockData() *types1.Data { if m != nil { - return m.Txs + return m.BlockData } return nil } -func (m *ResponsePreprocessTxs) GetMessages() *types1.Messages { +type ResponseProcessProposal struct { + Result ResponseProcessProposal_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseProcessProposal_Result" json:"result,omitempty"` + Evidence [][]byte `protobuf:"bytes,2,rep,name=evidence,proto3" json:"evidence,omitempty"` +} + +func (m *ResponseProcessProposal) Reset() { *m = ResponseProcessProposal{} } +func (m *ResponseProcessProposal) String() string { return proto.CompactTextString(m) } +func (*ResponseProcessProposal) ProtoMessage() {} +func (*ResponseProcessProposal) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{36} +} +func (m *ResponseProcessProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseProcessProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseProcessProposal.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 *ResponseProcessProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseProcessProposal.Merge(m, src) +} +func (m *ResponseProcessProposal) XXX_Size() int { + return m.Size() +} +func (m *ResponseProcessProposal) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseProcessProposal.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseProcessProposal proto.InternalMessageInfo + +func (m *ResponseProcessProposal) GetResult() ResponseProcessProposal_Result { + if m != nil { + return m.Result + } + return ResponseProcessProposal_UNKNOWN +} + +func (m *ResponseProcessProposal) GetEvidence() [][]byte { if m != nil { - return m.Messages + return m.Evidence } return nil } @@ -2598,7 +2760,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2667,7 +2829,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2719,7 +2881,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{37} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2774,7 +2936,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{38} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2828,7 +2990,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{39} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2893,7 +3055,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{40} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2968,7 +3130,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{41} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3021,7 +3183,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{42} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3074,7 +3236,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{43} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3135,7 +3297,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{44} + return fileDescriptor_252557cfdd89a31a, []int{46} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3211,7 +3373,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{45} + return fileDescriptor_252557cfdd89a31a, []int{47} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3280,6 +3442,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseProcessProposal_Result", ResponseProcessProposal_Result_name, ResponseProcessProposal_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3296,7 +3459,8 @@ 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((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") + proto.RegisterType((*RequestProcessProposal)(nil), "tendermint.abci.RequestProcessProposal") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") @@ -3314,7 +3478,8 @@ 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((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") + proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") @@ -3331,186 +3496,193 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2850 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0xf5, 0xd7, 0xfb, 0x71, 0x6d, 0x3d, 0x5c, 0x33, 0x0c, 0xa2, 0x19, 0xec, 0xa1, 0xe7, 0xc0, 0x7f, - 0x18, 0xc0, 0xfe, 0x63, 0x0e, 0x13, 0x08, 0x24, 0x60, 0x09, 0x0d, 0x32, 0x36, 0x96, 0xd3, 0xd6, - 0x0c, 0x79, 0x31, 0x4d, 0x49, 0x2a, 0x4b, 0xcd, 0x48, 0xdd, 0x4d, 0x77, 0xc9, 0xd8, 0x2c, 0xf3, - 0xd8, 0x90, 0x0d, 0xcb, 0x6c, 0xf8, 0x0c, 0xd9, 0xe5, 0x64, 0x95, 0x4d, 0x36, 0x9c, 0x93, 0x0d, - 0xcb, 0xac, 0x48, 0xc2, 0xec, 0xf2, 0x05, 0xb2, 0xca, 0x49, 0x4e, 0x3d, 0xfa, 0x25, 0xa9, 0x25, - 0x19, 0xb2, 0xcb, 0xae, 0xea, 0xf6, 0xbd, 0xb7, 0x55, 0xb7, 0xab, 0x7e, 0xf7, 0x77, 0x6f, 0x09, - 0x9e, 0xa4, 0xc4, 0xec, 0x13, 0x67, 0x6c, 0x98, 0x74, 0x07, 0x77, 0x7b, 0xc6, 0x0e, 0xbd, 0xb0, - 0x89, 0xbb, 0x6d, 0x3b, 0x16, 0xb5, 0x50, 0x25, 0x78, 0xb8, 0xcd, 0x1e, 0x2a, 0x4f, 0x85, 0xb4, - 0x7b, 0xce, 0x85, 0x4d, 0xad, 0x1d, 0xdb, 0xb1, 0xac, 0x53, 0xa1, 0xaf, 0x5c, 0x0f, 0x3d, 0xe6, - 0x7e, 0xc2, 0xde, 0x22, 0x4f, 0xa5, 0xf1, 0x43, 0x72, 0xe1, 0x3d, 0x7d, 0x6a, 0xc6, 0xd6, 0xc6, - 0x0e, 0x1e, 0x7b, 0x8f, 0xb7, 0x06, 0x96, 0x35, 0x18, 0x91, 0x1d, 0x3e, 0xeb, 0x4e, 0x4e, 0x77, - 0xa8, 0x31, 0x26, 0x2e, 0xc5, 0x63, 0x5b, 0x2a, 0x5c, 0x1d, 0x58, 0x03, 0x8b, 0x0f, 0x77, 0xd8, - 0x48, 0x48, 0xd5, 0xbf, 0x17, 0x20, 0xaf, 0x91, 0x8f, 0x27, 0xc4, 0xa5, 0x68, 0x17, 0x32, 0xa4, - 0x37, 0xb4, 0x6a, 0xc9, 0x1b, 0xc9, 0x5b, 0x6b, 0xbb, 0xd7, 0xb7, 0xa7, 0x16, 0xb7, 0x2d, 0xf5, - 0x9a, 0xbd, 0xa1, 0xd5, 0x4a, 0x68, 0x5c, 0x17, 0xbd, 0x02, 0xd9, 0xd3, 0xd1, 0xc4, 0x1d, 0xd6, - 0x52, 0xdc, 0xe8, 0xa9, 0x38, 0xa3, 0xbb, 0x4c, 0xa9, 0x95, 0xd0, 0x84, 0x36, 0x7b, 0x95, 0x61, - 0x9e, 0x5a, 0xb5, 0xf4, 0xe2, 0x57, 0xed, 0x9b, 0xa7, 0xfc, 0x55, 0x4c, 0x17, 0xd5, 0x01, 0x5c, - 0x42, 0x75, 0xcb, 0xa6, 0x86, 0x65, 0xd6, 0x32, 0xdc, 0xf2, 0xe9, 0x38, 0xcb, 0x13, 0x42, 0xdb, - 0x5c, 0xb1, 0x95, 0xd0, 0x8a, 0xae, 0x37, 0x61, 0x3e, 0x0c, 0xd3, 0xa0, 0x7a, 0x6f, 0x88, 0x0d, - 0xb3, 0x96, 0x5d, 0xec, 0x63, 0xdf, 0x34, 0x68, 0x83, 0x29, 0x32, 0x1f, 0x86, 0x37, 0x61, 0x4b, - 0xfe, 0x78, 0x42, 0x9c, 0x8b, 0x5a, 0x6e, 0xf1, 0x92, 0x7f, 0xc4, 0x94, 0xd8, 0x92, 0xb9, 0x36, - 0x6a, 0xc2, 0x5a, 0x97, 0x0c, 0x0c, 0x53, 0xef, 0x8e, 0xac, 0xde, 0xc3, 0x5a, 0x9e, 0x1b, 0xab, - 0x71, 0xc6, 0x75, 0xa6, 0x5a, 0x67, 0x9a, 0xad, 0x84, 0x06, 0x5d, 0x7f, 0x86, 0xde, 0x80, 0x42, - 0x6f, 0x48, 0x7a, 0x0f, 0x75, 0x7a, 0x5e, 0x2b, 0x70, 0x1f, 0x5b, 0x71, 0x3e, 0x1a, 0x4c, 0xaf, - 0x73, 0xde, 0x4a, 0x68, 0xf9, 0x9e, 0x18, 0xb2, 0xf5, 0xf7, 0xc9, 0xc8, 0x38, 0x23, 0x0e, 0xb3, - 0x2f, 0x2e, 0x5e, 0xff, 0xdb, 0x42, 0x93, 0x7b, 0x28, 0xf6, 0xbd, 0x09, 0x7a, 0x13, 0x8a, 0xc4, - 0xec, 0xcb, 0x65, 0x00, 0x77, 0x71, 0x23, 0x76, 0xaf, 0x98, 0x7d, 0x6f, 0x11, 0x05, 0x22, 0xc7, - 0xe8, 0x55, 0xc8, 0xf5, 0xac, 0xf1, 0xd8, 0xa0, 0xb5, 0x35, 0x6e, 0xbd, 0x19, 0xbb, 0x00, 0xae, - 0xd5, 0x4a, 0x68, 0x52, 0x1f, 0x1d, 0x41, 0x79, 0x64, 0xb8, 0x54, 0x77, 0x4d, 0x6c, 0xbb, 0x43, - 0x8b, 0xba, 0xb5, 0x75, 0xee, 0xe1, 0x99, 0x38, 0x0f, 0x87, 0x86, 0x4b, 0x4f, 0x3c, 0xe5, 0x56, - 0x42, 0x2b, 0x8d, 0xc2, 0x02, 0xe6, 0xcf, 0x3a, 0x3d, 0x25, 0x8e, 0xef, 0xb0, 0x56, 0x5a, 0xec, - 0xaf, 0xcd, 0xb4, 0x3d, 0x7b, 0xe6, 0xcf, 0x0a, 0x0b, 0xd0, 0xcf, 0xe0, 0xca, 0xc8, 0xc2, 0x7d, - 0xdf, 0x9d, 0xde, 0x1b, 0x4e, 0xcc, 0x87, 0xb5, 0x32, 0x77, 0xfa, 0x5c, 0xec, 0x8f, 0xb4, 0x70, - 0xdf, 0x73, 0xd1, 0x60, 0x06, 0xad, 0x84, 0xb6, 0x31, 0x9a, 0x16, 0xa2, 0x07, 0x70, 0x15, 0xdb, - 0xf6, 0xe8, 0x62, 0xda, 0x7b, 0x85, 0x7b, 0xbf, 0x1d, 0xe7, 0x7d, 0x8f, 0xd9, 0x4c, 0xbb, 0x47, - 0x78, 0x46, 0xca, 0x82, 0x61, 0x3b, 0xc4, 0x76, 0xac, 0x1e, 0x71, 0x5d, 0x9d, 0x9e, 0xbb, 0xb5, - 0xea, 0xe2, 0x60, 0x1c, 0xfb, 0xda, 0x9d, 0x73, 0x1e, 0x5c, 0x3b, 0x2c, 0xa8, 0xe7, 0x21, 0x7b, - 0x86, 0x47, 0x13, 0xa2, 0xfe, 0x1f, 0xac, 0x85, 0xa0, 0x03, 0xd5, 0x20, 0x3f, 0x26, 0xae, 0x8b, - 0x07, 0x84, 0x23, 0x4d, 0x51, 0xf3, 0xa6, 0x6a, 0x19, 0xd6, 0xc3, 0x70, 0xa1, 0x8e, 0x7d, 0x43, - 0x06, 0x04, 0xcc, 0xf0, 0x8c, 0x38, 0x2e, 0x3b, 0xfd, 0xd2, 0x50, 0x4e, 0xd1, 0x4d, 0x28, 0xf1, - 0xed, 0xa8, 0x7b, 0xcf, 0x19, 0x1a, 0x65, 0xb4, 0x75, 0x2e, 0xbc, 0x2f, 0x95, 0xb6, 0x60, 0xcd, - 0xde, 0xb5, 0x7d, 0x95, 0x34, 0x57, 0x01, 0x7b, 0xd7, 0x96, 0x0a, 0xea, 0xf7, 0xa1, 0x3a, 0x8d, - 0x1e, 0xa8, 0x0a, 0xe9, 0x87, 0xe4, 0x42, 0xbe, 0x8f, 0x0d, 0xd1, 0x55, 0xb9, 0x2c, 0xfe, 0x8e, - 0xa2, 0x26, 0xd7, 0xf8, 0xe7, 0x94, 0x6f, 0xec, 0xc3, 0x06, 0x7a, 0x15, 0x32, 0x0c, 0x85, 0x25, - 0xa0, 0x2a, 0xdb, 0x02, 0xa2, 0xb7, 0x3d, 0x88, 0xde, 0xee, 0x78, 0x10, 0x5d, 0x2f, 0x7c, 0xf9, - 0xf5, 0x56, 0xe2, 0xf3, 0xbf, 0x6e, 0x25, 0x35, 0x6e, 0x81, 0x9e, 0x60, 0xa7, 0x1c, 0x1b, 0xa6, - 0x6e, 0xf4, 0xe5, 0x7b, 0xf2, 0x7c, 0xbe, 0xdf, 0x47, 0x07, 0x50, 0xed, 0x59, 0xa6, 0x4b, 0x4c, - 0x77, 0xe2, 0xea, 0x22, 0x05, 0x48, 0x18, 0x9d, 0x3d, 0x85, 0x0d, 0x4f, 0xf1, 0x98, 0xeb, 0x69, - 0x95, 0x5e, 0x54, 0x80, 0xee, 0x02, 0x9c, 0xe1, 0x91, 0xd1, 0xc7, 0xd4, 0x72, 0xdc, 0x5a, 0xe6, - 0x46, 0x7a, 0xae, 0x9b, 0xfb, 0x9e, 0xca, 0x3d, 0xbb, 0x8f, 0x29, 0xa9, 0x67, 0xd8, 0xaf, 0xd5, - 0x42, 0x96, 0xe8, 0x59, 0xa8, 0x60, 0xdb, 0xd6, 0x5d, 0x8a, 0x29, 0xd1, 0xbb, 0x17, 0x94, 0xb8, - 0x1c, 0x5c, 0xd7, 0xb5, 0x12, 0xb6, 0xed, 0x13, 0x26, 0xad, 0x33, 0x21, 0x7a, 0x06, 0xca, 0x0c, - 0x48, 0x0d, 0x3c, 0xd2, 0x87, 0xc4, 0x18, 0x0c, 0x29, 0x07, 0xd1, 0xb4, 0x56, 0x92, 0xd2, 0x16, - 0x17, 0xaa, 0x7d, 0x7f, 0x23, 0x70, 0x10, 0x45, 0x08, 0x32, 0x7d, 0x4c, 0x31, 0x0f, 0xe4, 0xba, - 0xc6, 0xc7, 0x4c, 0x66, 0x63, 0x3a, 0x94, 0xe1, 0xe1, 0x63, 0x74, 0x0d, 0x72, 0xd2, 0x6d, 0x9a, - 0xbb, 0x95, 0x33, 0xf6, 0xcd, 0x6c, 0xc7, 0x3a, 0x23, 0x3c, 0x6b, 0x14, 0x34, 0x31, 0x51, 0x7f, - 0x95, 0x82, 0x8d, 0x19, 0xb8, 0x65, 0x7e, 0x87, 0xd8, 0x1d, 0x7a, 0xef, 0x62, 0x63, 0x74, 0x87, - 0xf9, 0xc5, 0x7d, 0xe2, 0xc8, 0x34, 0x57, 0x0b, 0x87, 0x48, 0xa4, 0xf0, 0x16, 0x7f, 0x2e, 0x43, - 0x23, 0xb5, 0x51, 0x1b, 0xaa, 0x23, 0xec, 0x52, 0x5d, 0xc0, 0x97, 0x1e, 0x4a, 0x79, 0xb3, 0xa0, - 0x7d, 0x88, 0x3d, 0xc0, 0x63, 0x9b, 0x5d, 0x3a, 0x2a, 0x8f, 0x22, 0x52, 0xa4, 0xc1, 0xd5, 0xee, - 0xc5, 0xa7, 0xd8, 0xa4, 0x86, 0x49, 0xf4, 0x99, 0x2f, 0xf7, 0xc4, 0x8c, 0xd3, 0xe6, 0x99, 0xd1, - 0x27, 0x66, 0xcf, 0xfb, 0x64, 0x57, 0x7c, 0x63, 0xff, 0x93, 0xba, 0xaa, 0x06, 0xe5, 0x68, 0xc2, - 0x40, 0x65, 0x48, 0xd1, 0x73, 0x19, 0x80, 0x14, 0x3d, 0x47, 0xff, 0x0f, 0x19, 0xb6, 0x48, 0xbe, - 0xf8, 0xf2, 0x9c, 0x6c, 0x2d, 0xed, 0x3a, 0x17, 0x36, 0xd1, 0xb8, 0xa6, 0xaa, 0xfa, 0xa7, 0xc1, - 0x4f, 0x22, 0xd3, 0x5e, 0xd5, 0xe7, 0xa0, 0x32, 0x95, 0x25, 0x42, 0xdf, 0x2f, 0x19, 0xfe, 0x7e, - 0x6a, 0x05, 0x4a, 0x91, 0x94, 0xa0, 0x5e, 0x83, 0xab, 0xf3, 0x10, 0x5e, 0x1d, 0xfa, 0xf2, 0x08, - 0x52, 0xa3, 0x57, 0xa0, 0xe0, 0x43, 0xbc, 0x38, 0x8d, 0xb3, 0xb1, 0xf2, 0x94, 0x35, 0x5f, 0x95, - 0x1d, 0x43, 0xb6, 0xad, 0xf9, 0x7e, 0x48, 0xf1, 0x1f, 0x9e, 0xc7, 0xb6, 0xdd, 0xc2, 0xee, 0x50, - 0xfd, 0x10, 0x6a, 0x71, 0xf0, 0x3d, 0xb5, 0x8c, 0x8c, 0xbf, 0x0d, 0xaf, 0x41, 0xee, 0xd4, 0x72, - 0xc6, 0x98, 0x72, 0x67, 0x25, 0x4d, 0xce, 0xd8, 0xf6, 0x14, 0x50, 0x9e, 0xe6, 0x62, 0x31, 0x51, - 0x75, 0x78, 0x22, 0x16, 0xc2, 0x99, 0x89, 0x61, 0xf6, 0x89, 0x88, 0x67, 0x49, 0x13, 0x93, 0xc0, - 0x91, 0xf8, 0xb1, 0x62, 0xc2, 0x5e, 0xeb, 0xf2, 0xb5, 0x72, 0xff, 0x45, 0x4d, 0xce, 0xd4, 0x5b, - 0x7e, 0xb0, 0x22, 0x48, 0xce, 0x30, 0x8f, 0xa1, 0x7f, 0xf2, 0x46, 0xfa, 0xd6, 0xba, 0xc6, 0x86, - 0xea, 0xef, 0x8b, 0x50, 0xd0, 0x88, 0x6b, 0x33, 0xf4, 0x40, 0x75, 0x28, 0x92, 0xf3, 0x1e, 0x11, - 0x34, 0x2c, 0x19, 0x4b, 0x63, 0x84, 0x76, 0xd3, 0xd3, 0x64, 0x1c, 0xc2, 0x37, 0x43, 0x2f, 0x4b, - 0xaa, 0x19, 0xcf, 0x1a, 0xa5, 0x79, 0x98, 0x6b, 0xde, 0xf1, 0xb8, 0x66, 0x3a, 0x96, 0x36, 0x08, - 0xab, 0x29, 0xb2, 0xf9, 0xb2, 0x24, 0x9b, 0x99, 0x25, 0x2f, 0x8b, 0xb0, 0xcd, 0x46, 0x84, 0x6d, - 0x66, 0x97, 0x2c, 0x33, 0x86, 0x6e, 0x36, 0x22, 0x74, 0x33, 0xb7, 0xc4, 0x49, 0x0c, 0xdf, 0xbc, - 0xe3, 0xf1, 0xcd, 0xfc, 0x92, 0x65, 0x4f, 0x11, 0xce, 0xbb, 0x51, 0xc2, 0x29, 0xc8, 0xe2, 0xcd, - 0x58, 0xeb, 0x58, 0xc6, 0xf9, 0x83, 0x10, 0xe3, 0x2c, 0xc6, 0xd2, 0x3d, 0xe1, 0x64, 0x0e, 0xe5, - 0x6c, 0x44, 0x28, 0x27, 0x2c, 0x89, 0x41, 0x0c, 0xe7, 0x7c, 0x2b, 0xcc, 0x39, 0xd7, 0x62, 0x69, - 0xab, 0xdc, 0x34, 0xf3, 0x48, 0xe7, 0x6b, 0x3e, 0xe9, 0x5c, 0x8f, 0x65, 0xcd, 0x72, 0x0d, 0xd3, - 0xac, 0xb3, 0x3d, 0xc3, 0x3a, 0x05, 0x4b, 0x7c, 0x36, 0xd6, 0xc5, 0x12, 0xda, 0xd9, 0x9e, 0xa1, - 0x9d, 0xe5, 0x25, 0x0e, 0x97, 0xf0, 0xce, 0x9f, 0xcf, 0xe7, 0x9d, 0xf1, 0xcc, 0x50, 0xfe, 0xcc, - 0xd5, 0x88, 0xa7, 0x1e, 0x43, 0x3c, 0x05, 0x3d, 0x7c, 0x3e, 0xd6, 0xfd, 0xca, 0xcc, 0xb3, 0x3d, - 0xc3, 0x3c, 0x37, 0x96, 0xc4, 0x63, 0x55, 0xea, 0xf9, 0x1c, 0xcb, 0xf0, 0x53, 0x48, 0xc4, 0x50, - 0x92, 0x38, 0x8e, 0xe5, 0x48, 0x56, 0x27, 0x26, 0xea, 0x2d, 0xc6, 0x39, 0x02, 0xd4, 0x59, 0x40, - 0x53, 0x79, 0x36, 0x0a, 0x21, 0x8d, 0xfa, 0x87, 0x64, 0x60, 0xcb, 0xd3, 0x74, 0x98, 0xaf, 0x14, - 0x25, 0x5f, 0x09, 0xb1, 0xd7, 0x54, 0x94, 0xbd, 0x6e, 0xc1, 0x1a, 0xcb, 0x32, 0x53, 0xc4, 0x14, - 0xdb, 0x1e, 0x31, 0x45, 0xb7, 0x61, 0x83, 0xd3, 0x08, 0xc1, 0x71, 0x65, 0x6a, 0xc9, 0xf0, 0x0c, - 0x59, 0x61, 0x0f, 0xc4, 0x6e, 0x17, 0x39, 0xe6, 0x45, 0xb8, 0x12, 0xd2, 0xf5, 0xb3, 0x97, 0x60, - 0x63, 0x55, 0x5f, 0x7b, 0x4f, 0xa6, 0xb1, 0xf7, 0x82, 0x00, 0x05, 0xa4, 0x17, 0x41, 0xa6, 0x67, - 0xf5, 0x89, 0xcc, 0x2d, 0x7c, 0xcc, 0x92, 0xc2, 0xc8, 0x1a, 0xc8, 0x0c, 0xc2, 0x86, 0x4c, 0xcb, - 0x87, 0xd5, 0xa2, 0x40, 0x4d, 0xf5, 0x4f, 0xc9, 0xc0, 0x5f, 0xc0, 0x83, 0xe7, 0x51, 0xd6, 0xe4, - 0x7f, 0x87, 0xb2, 0xa6, 0xbe, 0x35, 0x65, 0x0d, 0xe7, 0xf6, 0x74, 0x34, 0xb7, 0xff, 0x33, 0x19, - 0x7c, 0x61, 0x9f, 0x80, 0x7e, 0xbb, 0x88, 0x04, 0x89, 0x3a, 0xcb, 0xbf, 0x97, 0x4c, 0xd4, 0xb2, - 0xac, 0xc8, 0xf1, 0xf7, 0x46, 0xcb, 0x8a, 0xbc, 0x48, 0xdd, 0x7c, 0x82, 0x5e, 0x85, 0x22, 0xef, - 0x1f, 0xe9, 0x96, 0xed, 0x4a, 0x04, 0x7f, 0x32, 0xbc, 0x56, 0xd1, 0x26, 0xda, 0x3e, 0x66, 0x3a, - 0x6d, 0xdb, 0xd5, 0x0a, 0xb6, 0x1c, 0x85, 0x38, 0x48, 0x31, 0x42, 0x85, 0xaf, 0x43, 0x91, 0xfd, - 0x7a, 0xd7, 0xc6, 0x3d, 0xc2, 0xd1, 0xb8, 0xa8, 0x05, 0x02, 0xf5, 0x01, 0xa0, 0xd9, 0x7c, 0x80, - 0x5a, 0x90, 0x23, 0x67, 0xc4, 0xa4, 0x82, 0x13, 0xac, 0xed, 0x5e, 0x9b, 0xc3, 0x33, 0x89, 0x49, - 0xeb, 0x35, 0x16, 0xe4, 0x7f, 0x7c, 0xbd, 0x55, 0x15, 0xda, 0x2f, 0x58, 0x63, 0x83, 0x92, 0xb1, - 0x4d, 0x2f, 0x34, 0x69, 0xaf, 0xfe, 0x32, 0xc5, 0x48, 0x5f, 0x24, 0x57, 0xcc, 0x8d, 0xad, 0x77, - 0x80, 0x52, 0x21, 0xc2, 0xbf, 0x5a, 0xbc, 0x37, 0x01, 0x06, 0xd8, 0xd5, 0x3f, 0xc1, 0x26, 0x25, - 0x7d, 0x19, 0xf4, 0x90, 0x04, 0x29, 0x50, 0x60, 0xb3, 0x89, 0x4b, 0xfa, 0xb2, 0xf6, 0xf0, 0xe7, - 0xa1, 0x75, 0xe6, 0xbf, 0xdb, 0x3a, 0xa3, 0x51, 0x2e, 0x4c, 0x47, 0xf9, 0xd7, 0xa9, 0xe0, 0x94, - 0x04, 0xfc, 0xf8, 0x7f, 0x2f, 0x0e, 0xbf, 0xe1, 0x45, 0x73, 0x34, 0x69, 0xa3, 0x13, 0xd8, 0xf0, - 0x4f, 0xa9, 0x3e, 0xe1, 0xa7, 0xd7, 0xdb, 0x77, 0xab, 0x1e, 0xf3, 0xea, 0x59, 0x54, 0xec, 0xa2, - 0x1f, 0xc3, 0xe3, 0x53, 0x08, 0xe4, 0xbb, 0x4e, 0xad, 0x08, 0x44, 0x8f, 0x45, 0x81, 0xc8, 0xf3, - 0x1c, 0xc4, 0x2a, 0xfd, 0x1d, 0xcf, 0xc6, 0x3e, 0xab, 0xc3, 0xc2, 0x14, 0x64, 0xee, 0xd7, 0xbf, - 0x09, 0x25, 0x87, 0x50, 0x6c, 0x98, 0x7a, 0xa4, 0xd2, 0x5d, 0x17, 0x42, 0x59, 0x3f, 0x1f, 0xc3, - 0x63, 0x73, 0xa9, 0x08, 0xfa, 0x1e, 0x14, 0x03, 0x16, 0x93, 0x8c, 0x29, 0x1a, 0xfd, 0x42, 0x28, - 0xd0, 0x55, 0xff, 0x98, 0x0c, 0x5c, 0x46, 0x4b, 0xab, 0x26, 0xe4, 0x1c, 0xe2, 0x4e, 0x46, 0xa2, - 0xd8, 0x29, 0xef, 0xbe, 0xb8, 0x1a, 0x89, 0x61, 0xd2, 0xc9, 0x88, 0x6a, 0xd2, 0x58, 0x7d, 0x00, - 0x39, 0x21, 0x41, 0x6b, 0x90, 0xbf, 0x77, 0x74, 0x70, 0xd4, 0x7e, 0xff, 0xa8, 0x9a, 0x40, 0x00, - 0xb9, 0xbd, 0x46, 0xa3, 0x79, 0xdc, 0xa9, 0x26, 0x51, 0x11, 0xb2, 0x7b, 0xf5, 0xb6, 0xd6, 0xa9, - 0xa6, 0x98, 0x58, 0x6b, 0xbe, 0xdb, 0x6c, 0x74, 0xaa, 0x69, 0xb4, 0x01, 0x25, 0x31, 0xd6, 0xef, - 0xb6, 0xb5, 0xf7, 0xf6, 0x3a, 0xd5, 0x4c, 0x48, 0x74, 0xd2, 0x3c, 0x7a, 0xbb, 0xa9, 0x55, 0xb3, - 0xea, 0x4b, 0xac, 0x9a, 0x8a, 0xa1, 0x3d, 0x41, 0xdd, 0x94, 0x0c, 0xd5, 0x4d, 0xea, 0x6f, 0x53, - 0xa0, 0xc4, 0x73, 0x19, 0xf4, 0xee, 0xd4, 0xc2, 0x77, 0x2f, 0x41, 0x84, 0xa6, 0x56, 0x8f, 0x9e, - 0x81, 0xb2, 0x43, 0x4e, 0x09, 0xed, 0x0d, 0x05, 0xb7, 0x12, 0x89, 0xad, 0xa4, 0x95, 0xa4, 0x94, - 0x1b, 0xb9, 0x42, 0xed, 0x23, 0xd2, 0xa3, 0xba, 0x28, 0xe1, 0xc4, 0xa6, 0x2b, 0x32, 0x35, 0x26, - 0x3d, 0x11, 0x42, 0xf5, 0xc3, 0x4b, 0xc5, 0xb2, 0x08, 0x59, 0xad, 0xd9, 0xd1, 0x7e, 0x52, 0x4d, - 0x23, 0x04, 0x65, 0x3e, 0xd4, 0x4f, 0x8e, 0xf6, 0x8e, 0x4f, 0x5a, 0x6d, 0x16, 0xcb, 0x2b, 0x50, - 0xf1, 0x62, 0xe9, 0x09, 0xb3, 0x2a, 0x0e, 0x76, 0xc3, 0x92, 0xda, 0x11, 0xdd, 0x81, 0x82, 0x24, - 0x4e, 0xde, 0x59, 0x53, 0x66, 0xbb, 0x27, 0xef, 0x49, 0x0d, 0xcd, 0xd7, 0x55, 0xff, 0x9d, 0x84, - 0xca, 0xd4, 0x19, 0x44, 0xbb, 0x90, 0x15, 0x25, 0x40, 0xdc, 0x15, 0x05, 0x87, 0x10, 0x79, 0x60, - 0x85, 0x2a, 0x7a, 0x03, 0x0a, 0x44, 0x76, 0x41, 0xe6, 0x9d, 0x75, 0xf1, 0x7e, 0xaf, 0x4f, 0x22, - 0x4d, 0x7d, 0x0b, 0xf4, 0x26, 0x14, 0x7d, 0x30, 0x91, 0x75, 0xe7, 0xd3, 0xb3, 0xe6, 0x3e, 0x0c, - 0x49, 0xfb, 0xc0, 0x06, 0xbd, 0x16, 0xd0, 0xbe, 0xcc, 0x6c, 0xe1, 0x21, 0xcd, 0x85, 0x82, 0x34, - 0xf6, 0xf4, 0xd5, 0x06, 0xac, 0x85, 0xd6, 0x83, 0x9e, 0x84, 0xe2, 0x18, 0x9f, 0xcb, 0xee, 0x9a, - 0xe8, 0x8f, 0x14, 0xc6, 0xf8, 0x5c, 0x34, 0xd6, 0x1e, 0x87, 0x3c, 0x7b, 0x38, 0xc0, 0x22, 0xc8, - 0x69, 0x2d, 0x37, 0xc6, 0xe7, 0xef, 0x60, 0x57, 0xfd, 0x00, 0xca, 0xd1, 0xce, 0x12, 0xdb, 0xec, - 0x8e, 0x35, 0x31, 0xfb, 0xdc, 0x47, 0x56, 0x13, 0x13, 0xf4, 0x0a, 0x64, 0xcf, 0x2c, 0x81, 0x87, - 0xf3, 0x51, 0xe1, 0xbe, 0x45, 0x49, 0xa8, 0x33, 0x25, 0xb4, 0xd5, 0x4f, 0x21, 0xcb, 0xf1, 0x8d, - 0x61, 0x15, 0xef, 0x11, 0x49, 0xca, 0xcb, 0xc6, 0xe8, 0x03, 0x00, 0x4c, 0xa9, 0x63, 0x74, 0x27, - 0x81, 0xe3, 0xad, 0xf9, 0xf8, 0xb8, 0xe7, 0xe9, 0xd5, 0xaf, 0x4b, 0xa0, 0xbc, 0x1a, 0x98, 0x86, - 0xc0, 0x32, 0xe4, 0x50, 0x3d, 0x82, 0x72, 0xd4, 0x36, 0xdc, 0xad, 0x5d, 0x9f, 0xd3, 0xad, 0xf5, - 0x69, 0x95, 0x4f, 0xca, 0xd2, 0xa2, 0x1f, 0xc8, 0x27, 0xea, 0xef, 0x92, 0x50, 0xe8, 0x9c, 0xcb, - 0x93, 0x13, 0xd3, 0x8a, 0x0a, 0x4c, 0x53, 0xe1, 0xc6, 0x8b, 0xe8, 0x6d, 0xa5, 0xfd, 0x8e, 0xd9, - 0x5b, 0x3e, 0x36, 0x64, 0x56, 0x2d, 0x78, 0xbd, 0xd6, 0xa1, 0x44, 0x84, 0x9b, 0x50, 0xb2, 0x1c, - 0x63, 0x60, 0x98, 0x78, 0x14, 0x66, 0xf0, 0xeb, 0x9e, 0x90, 0x13, 0xd5, 0xd7, 0xa1, 0xe8, 0x6f, - 0x3d, 0x56, 0x60, 0xe0, 0x7e, 0xdf, 0x21, 0xae, 0x2b, 0x03, 0xe0, 0x4d, 0x79, 0xfb, 0xd3, 0xfa, - 0x44, 0xf6, 0x7f, 0xd2, 0x9a, 0x98, 0xa8, 0x7d, 0xa8, 0x4c, 0xa5, 0x4f, 0xf4, 0x3a, 0xe4, 0xed, - 0x49, 0x57, 0xf7, 0x62, 0x38, 0x75, 0xc2, 0x3c, 0xb2, 0x39, 0xe9, 0x8e, 0x8c, 0xde, 0x01, 0xb9, - 0xf0, 0x7e, 0xb1, 0x3d, 0xe9, 0x1e, 0x88, 0x50, 0x8b, 0xb7, 0xa4, 0xc2, 0x6f, 0x39, 0x83, 0x82, - 0xb7, 0x73, 0xd0, 0x0f, 0xc3, 0x87, 0x29, 0x39, 0x8b, 0x05, 0xd1, 0x94, 0x2e, 0xdd, 0x87, 0xce, - 0xd2, 0x6d, 0xd8, 0x70, 0x8d, 0x81, 0x49, 0xfa, 0x7a, 0x50, 0xe2, 0xf0, 0xb7, 0x15, 0xb4, 0x8a, - 0x78, 0x70, 0xe8, 0xd5, 0x37, 0xea, 0xbf, 0x92, 0x50, 0xf0, 0x4e, 0x35, 0x7a, 0x29, 0xb4, 0x39, - 0xcb, 0x73, 0x3a, 0x40, 0x9e, 0x62, 0xd0, 0xc1, 0x8c, 0xfe, 0xd6, 0xd4, 0xe5, 0x7f, 0x6b, 0x5c, - 0x2b, 0xda, 0xbb, 0x13, 0xc8, 0x5c, 0xfa, 0x4e, 0xe0, 0x05, 0x40, 0xd4, 0xa2, 0x78, 0xa4, 0x9f, - 0x59, 0xd4, 0x30, 0x07, 0xba, 0x08, 0xb6, 0x60, 0x76, 0x55, 0xfe, 0xe4, 0x3e, 0x7f, 0x70, 0xcc, - 0xe3, 0xfe, 0x8b, 0x24, 0x14, 0xfc, 0x1c, 0x7d, 0xd9, 0x86, 0xe4, 0x35, 0xc8, 0xc9, 0x34, 0x24, - 0x3a, 0x92, 0x72, 0xe6, 0xf7, 0xc6, 0x33, 0xa1, 0xde, 0xb8, 0xc2, 0xf0, 0x9d, 0x62, 0x4e, 0x54, - 0xc4, 0x1e, 0xf5, 0xe7, 0xb7, 0x5f, 0x83, 0xb5, 0x50, 0x6f, 0x98, 0x1d, 0xcf, 0xa3, 0xe6, 0xfb, - 0xd5, 0x84, 0x92, 0xff, 0xec, 0x8b, 0x1b, 0xe9, 0x23, 0xf2, 0x09, 0xdb, 0xb3, 0x5a, 0xb3, 0xd1, - 0x6a, 0x36, 0x0e, 0xaa, 0x49, 0x65, 0xed, 0xb3, 0x2f, 0x6e, 0xe4, 0x35, 0xc2, 0x1b, 0x47, 0xb7, - 0x5b, 0xb0, 0x1e, 0xfe, 0x2a, 0xd1, 0x4c, 0x86, 0xa0, 0xfc, 0xf6, 0xbd, 0xe3, 0xc3, 0xfd, 0xc6, - 0x5e, 0xa7, 0xa9, 0xdf, 0x6f, 0x77, 0x9a, 0xd5, 0x24, 0x7a, 0x1c, 0xae, 0x1c, 0xee, 0xbf, 0xd3, - 0xea, 0xe8, 0x8d, 0xc3, 0xfd, 0xe6, 0x51, 0x47, 0xdf, 0xeb, 0x74, 0xf6, 0x1a, 0x07, 0xd5, 0xd4, - 0xee, 0x23, 0x80, 0xca, 0x5e, 0xbd, 0xb1, 0xcf, 0xb2, 0xb0, 0xd1, 0xc3, 0xb2, 0x31, 0x97, 0xe1, - 0x45, 0xfe, 0xc2, 0x4b, 0x6e, 0x65, 0x71, 0x5f, 0x12, 0xdd, 0x85, 0x2c, 0xaf, 0xff, 0xd1, 0xe2, - 0x5b, 0x6f, 0x65, 0x49, 0xa3, 0x92, 0xfd, 0x18, 0x7e, 0x3c, 0x16, 0x5e, 0x83, 0x2b, 0x8b, 0xfb, - 0x96, 0x48, 0x83, 0x62, 0x50, 0xc0, 0x2f, 0xbf, 0x16, 0x57, 0x56, 0xe8, 0x65, 0x32, 0x9f, 0x41, - 0x79, 0xb2, 0xfc, 0x9a, 0x58, 0x59, 0x01, 0xe5, 0xd0, 0x21, 0xe4, 0xbd, 0xc2, 0x6f, 0xd9, 0xc5, - 0xb5, 0xb2, 0xb4, 0xcf, 0xc8, 0x3e, 0x81, 0x28, 0xd0, 0x17, 0xdf, 0xc2, 0x2b, 0x4b, 0x9a, 0xa6, - 0x68, 0x1f, 0x72, 0x92, 0x73, 0x2f, 0xb9, 0x8c, 0x56, 0x96, 0xf5, 0x0d, 0x59, 0xd0, 0x82, 0xce, - 0xc7, 0xf2, 0xff, 0x16, 0x28, 0x2b, 0xf4, 0x83, 0xd1, 0x3d, 0x80, 0x50, 0x39, 0xbe, 0xc2, 0x9f, - 0x06, 0x94, 0x55, 0xfa, 0xbc, 0xa8, 0x0d, 0x05, 0xbf, 0xec, 0x5a, 0x7a, 0x85, 0xaf, 0x2c, 0x6f, - 0xb8, 0xa2, 0x07, 0x50, 0x8a, 0xd6, 0x1b, 0xab, 0x5d, 0xcc, 0x2b, 0x2b, 0x76, 0x52, 0x99, 0xff, - 0x68, 0xf1, 0xb1, 0xda, 0x45, 0xbd, 0xb2, 0x62, 0x63, 0x15, 0x7d, 0x04, 0x1b, 0xb3, 0xc5, 0xc1, - 0xea, 0xf7, 0xf6, 0xca, 0x25, 0x5a, 0xad, 0x68, 0x0c, 0x68, 0x4e, 0x51, 0x71, 0x89, 0x6b, 0x7c, - 0xe5, 0x32, 0x9d, 0x57, 0x16, 0xba, 0x28, 0x53, 0x5f, 0xed, 0x5a, 0x5f, 0x59, 0xb1, 0x07, 0x5b, - 0x6f, 0x7e, 0xf9, 0xcd, 0x66, 0xf2, 0xab, 0x6f, 0x36, 0x93, 0x7f, 0xfb, 0x66, 0x33, 0xf9, 0xf9, - 0xa3, 0xcd, 0xc4, 0x57, 0x8f, 0x36, 0x13, 0x7f, 0x79, 0xb4, 0x99, 0xf8, 0xe9, 0xf3, 0x03, 0x83, - 0x0e, 0x27, 0xdd, 0xed, 0x9e, 0x35, 0xde, 0x09, 0xff, 0x87, 0x69, 0xde, 0xff, 0xaa, 0xba, 0x39, - 0x9e, 0x08, 0x5f, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x89, 0x25, 0x0e, 0x77, 0x25, - 0x00, 0x00, + // 2972 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0xe3, 0xc6, + 0xf1, 0xe7, 0xfb, 0xd1, 0x14, 0x1f, 0x9a, 0x5d, 0xef, 0xd2, 0xf0, 0x5a, 0x5a, 0x63, 0xcb, 0xaf, + 0xb5, 0x2d, 0xfd, 0x2d, 0xd7, 0xfa, 0x6f, 0xc7, 0x4e, 0x6c, 0x91, 0xcb, 0x35, 0xe5, 0x95, 0x25, + 0x05, 0xa2, 0xd6, 0x79, 0x79, 0xe1, 0x21, 0x31, 0x22, 0xe1, 0x25, 0x01, 0x18, 0x00, 0xb5, 0xd2, + 0x1e, 0xf3, 0xa8, 0x54, 0x39, 0x17, 0x57, 0xe5, 0x92, 0x8b, 0x3f, 0x42, 0x2a, 0xd7, 0x5c, 0x92, + 0x4b, 0x2e, 0xae, 0xca, 0x21, 0x3e, 0xe6, 0xe4, 0xa4, 0xec, 0x5b, 0xbe, 0x40, 0x4e, 0xa9, 0xa4, + 0xe6, 0x81, 0x17, 0x49, 0x88, 0x90, 0x9d, 0x5b, 0x6e, 0x98, 0x46, 0xf7, 0x0f, 0x98, 0xc6, 0x4c, + 0xf7, 0xaf, 0x1b, 0x03, 0x4f, 0xb8, 0xc4, 0xd0, 0x88, 0x3d, 0xd1, 0x0d, 0x77, 0x13, 0xf7, 0x07, + 0xfa, 0xa6, 0x7b, 0x66, 0x11, 0x67, 0xc3, 0xb2, 0x4d, 0xd7, 0x44, 0xf5, 0xe0, 0xe6, 0x06, 0xbd, + 0x29, 0x3d, 0x19, 0xd2, 0x1e, 0xd8, 0x67, 0x96, 0x6b, 0x6e, 0x5a, 0xb6, 0x69, 0x1e, 0x73, 0x7d, + 0xe9, 0x5a, 0xe8, 0x36, 0xc3, 0x09, 0xa3, 0x45, 0xee, 0x0a, 0xe3, 0x07, 0xe4, 0xcc, 0xbb, 0xfb, + 0xe4, 0x9c, 0xad, 0x85, 0x6d, 0x3c, 0xf1, 0x6e, 0xaf, 0x0f, 0x4d, 0x73, 0x38, 0x26, 0x9b, 0x6c, + 0xd4, 0x9f, 0x1e, 0x6f, 0xba, 0xfa, 0x84, 0x38, 0x2e, 0x9e, 0x58, 0x42, 0xe1, 0xf2, 0xd0, 0x1c, + 0x9a, 0xec, 0x72, 0x93, 0x5e, 0x71, 0xa9, 0xfc, 0x87, 0x32, 0x14, 0x15, 0xf2, 0xf1, 0x94, 0x38, + 0x2e, 0xda, 0x82, 0x1c, 0x19, 0x8c, 0xcc, 0x66, 0xfa, 0x7a, 0xfa, 0xb9, 0xca, 0xd6, 0xb5, 0x8d, + 0x99, 0xc9, 0x6d, 0x08, 0xbd, 0xce, 0x60, 0x64, 0x76, 0x53, 0x0a, 0xd3, 0x45, 0xb7, 0x20, 0x7f, + 0x3c, 0x9e, 0x3a, 0xa3, 0x66, 0x86, 0x19, 0x3d, 0x19, 0x67, 0x74, 0x87, 0x2a, 0x75, 0x53, 0x0a, + 0xd7, 0xa6, 0x8f, 0xd2, 0x8d, 0x63, 0xb3, 0x99, 0x3d, 0xff, 0x51, 0x3b, 0xc6, 0x31, 0x7b, 0x14, + 0xd5, 0x45, 0x2d, 0x00, 0x87, 0xb8, 0xaa, 0x69, 0xb9, 0xba, 0x69, 0x34, 0x73, 0xcc, 0xf2, 0xa9, + 0x38, 0xcb, 0x43, 0xe2, 0xee, 0x33, 0xc5, 0x6e, 0x4a, 0x29, 0x3b, 0xde, 0x80, 0x62, 0xe8, 0x86, + 0xee, 0xaa, 0x83, 0x11, 0xd6, 0x8d, 0x66, 0xfe, 0x7c, 0x8c, 0x1d, 0x43, 0x77, 0xdb, 0x54, 0x91, + 0x62, 0xe8, 0xde, 0x80, 0x4e, 0xf9, 0xe3, 0x29, 0xb1, 0xcf, 0x9a, 0x85, 0xf3, 0xa7, 0xfc, 0x7d, + 0xaa, 0x44, 0xa7, 0xcc, 0xb4, 0x51, 0x07, 0x2a, 0x7d, 0x32, 0xd4, 0x0d, 0xb5, 0x3f, 0x36, 0x07, + 0x0f, 0x9a, 0x45, 0x66, 0x2c, 0xc7, 0x19, 0xb7, 0xa8, 0x6a, 0x8b, 0x6a, 0x76, 0x53, 0x0a, 0xf4, + 0xfd, 0x11, 0x7a, 0x13, 0x4a, 0x83, 0x11, 0x19, 0x3c, 0x50, 0xdd, 0xd3, 0x66, 0x89, 0x61, 0xac, + 0xc7, 0x61, 0xb4, 0xa9, 0x5e, 0xef, 0xb4, 0x9b, 0x52, 0x8a, 0x03, 0x7e, 0x49, 0xe7, 0xaf, 0x91, + 0xb1, 0x7e, 0x42, 0x6c, 0x6a, 0x5f, 0x3e, 0x7f, 0xfe, 0xb7, 0xb9, 0x26, 0x43, 0x28, 0x6b, 0xde, + 0x00, 0xbd, 0x05, 0x65, 0x62, 0x68, 0x62, 0x1a, 0xc0, 0x20, 0xae, 0xc7, 0xae, 0x15, 0x43, 0xf3, + 0x26, 0x51, 0x22, 0xe2, 0x1a, 0xbd, 0x06, 0x85, 0x81, 0x39, 0x99, 0xe8, 0x6e, 0xb3, 0xc2, 0xac, + 0xd7, 0x62, 0x27, 0xc0, 0xb4, 0xba, 0x29, 0x45, 0xe8, 0xa3, 0x3d, 0xa8, 0x8d, 0x75, 0xc7, 0x55, + 0x1d, 0x03, 0x5b, 0xce, 0xc8, 0x74, 0x9d, 0xe6, 0x0a, 0x43, 0x78, 0x3a, 0x0e, 0x61, 0x57, 0x77, + 0xdc, 0x43, 0x4f, 0xb9, 0x9b, 0x52, 0xaa, 0xe3, 0xb0, 0x80, 0xe2, 0x99, 0xc7, 0xc7, 0xc4, 0xf6, + 0x01, 0x9b, 0xd5, 0xf3, 0xf1, 0xf6, 0xa9, 0xb6, 0x67, 0x4f, 0xf1, 0xcc, 0xb0, 0x00, 0xfd, 0x18, + 0x2e, 0x8d, 0x4d, 0xac, 0xf9, 0x70, 0xea, 0x60, 0x34, 0x35, 0x1e, 0x34, 0x6b, 0x0c, 0xf4, 0xf9, + 0xd8, 0x97, 0x34, 0xb1, 0xe6, 0x41, 0xb4, 0xa9, 0x41, 0x37, 0xa5, 0xac, 0x8e, 0x67, 0x85, 0xe8, + 0x3e, 0x5c, 0xc6, 0x96, 0x35, 0x3e, 0x9b, 0x45, 0xaf, 0x33, 0xf4, 0x9b, 0x71, 0xe8, 0xdb, 0xd4, + 0x66, 0x16, 0x1e, 0xe1, 0x39, 0x29, 0xea, 0x41, 0xc3, 0xb2, 0x89, 0x85, 0x6d, 0xa2, 0x5a, 0xb6, + 0x69, 0x99, 0x0e, 0x1e, 0x37, 0x1b, 0x0c, 0xfb, 0xd9, 0x38, 0xec, 0x03, 0xae, 0x7f, 0x20, 0xd4, + 0xbb, 0x29, 0xa5, 0x6e, 0x45, 0x45, 0x1c, 0xd5, 0x1c, 0x10, 0xc7, 0x09, 0x50, 0x57, 0x97, 0xa1, + 0x32, 0xfd, 0x28, 0x6a, 0x44, 0xd4, 0x2a, 0x42, 0xfe, 0x04, 0x8f, 0xa7, 0x44, 0x7e, 0x16, 0x2a, + 0xa1, 0xb0, 0x84, 0x9a, 0x50, 0x9c, 0x10, 0xc7, 0xc1, 0x43, 0xc2, 0xa2, 0x58, 0x59, 0xf1, 0x86, + 0x72, 0x0d, 0x56, 0xc2, 0xa1, 0x48, 0x9e, 0xf8, 0x86, 0x34, 0xc8, 0x50, 0xc3, 0x13, 0x62, 0x3b, + 0x34, 0xb2, 0x08, 0x43, 0x31, 0x44, 0x37, 0xa0, 0xca, 0x96, 0xba, 0xea, 0xdd, 0xa7, 0x91, 0x2e, + 0xa7, 0xac, 0x30, 0xe1, 0x3d, 0xa1, 0xb4, 0x0e, 0x15, 0x6b, 0xcb, 0xf2, 0x55, 0xb2, 0x4c, 0x05, + 0xac, 0x2d, 0x4b, 0x28, 0xc8, 0xdf, 0x81, 0xc6, 0x6c, 0x64, 0x42, 0x0d, 0xc8, 0x3e, 0x20, 0x67, + 0xe2, 0x79, 0xf4, 0x12, 0x5d, 0x16, 0xd3, 0x62, 0xcf, 0x28, 0x2b, 0x62, 0x8e, 0x7f, 0xce, 0xf8, + 0xc6, 0x7e, 0x48, 0x42, 0xaf, 0x41, 0x8e, 0x46, 0x78, 0x11, 0xac, 0xa5, 0x0d, 0x1e, 0xfe, 0x37, + 0xbc, 0xf0, 0xbf, 0xd1, 0xf3, 0xc2, 0x7f, 0xab, 0xf4, 0xf9, 0x97, 0xeb, 0xa9, 0x4f, 0xff, 0xb6, + 0x9e, 0x56, 0x98, 0x05, 0x7a, 0x9c, 0x46, 0x10, 0xac, 0x1b, 0xaa, 0xae, 0x89, 0xe7, 0x14, 0xd9, + 0x78, 0x47, 0x43, 0x77, 0xa1, 0x31, 0x30, 0x0d, 0x87, 0x18, 0xce, 0xd4, 0x51, 0x79, 0x7a, 0x11, + 0x21, 0x7a, 0x7e, 0x87, 0xb7, 0x3d, 0xc5, 0x03, 0xa6, 0xa7, 0xd4, 0x07, 0x51, 0x01, 0xba, 0x03, + 0x70, 0x82, 0xc7, 0xba, 0x86, 0x5d, 0xd3, 0x76, 0x9a, 0xb9, 0xeb, 0xd9, 0x85, 0x30, 0xf7, 0x3c, + 0x95, 0x23, 0x4b, 0xc3, 0x2e, 0x69, 0xe5, 0xe8, 0xdb, 0x2a, 0x21, 0x4b, 0xf4, 0x0c, 0xd4, 0xb1, + 0x65, 0xa9, 0x8e, 0x8b, 0x5d, 0xa2, 0xf6, 0xcf, 0x5c, 0xe2, 0xb0, 0xc0, 0xbd, 0xa2, 0x54, 0xb1, + 0x65, 0x1d, 0x52, 0x69, 0x8b, 0x0a, 0xd1, 0xd3, 0x50, 0xa3, 0x41, 0x5a, 0xc7, 0x63, 0x75, 0x44, + 0xf4, 0xe1, 0xc8, 0x65, 0x01, 0x3a, 0xab, 0x54, 0x85, 0xb4, 0xcb, 0x84, 0xb2, 0xe6, 0x2f, 0x04, + 0x16, 0xa0, 0x11, 0x82, 0x9c, 0x86, 0x5d, 0xcc, 0x1c, 0xb9, 0xa2, 0xb0, 0x6b, 0x2a, 0xb3, 0xb0, + 0x3b, 0x12, 0xee, 0x61, 0xd7, 0xe8, 0x0a, 0x14, 0x04, 0x6c, 0x96, 0xc1, 0x8a, 0x11, 0xfd, 0x66, + 0x96, 0x6d, 0x9e, 0x10, 0x96, 0x91, 0x4a, 0x0a, 0x1f, 0xc8, 0x3f, 0xcf, 0xc0, 0xea, 0x5c, 0x28, + 0xa7, 0xb8, 0x23, 0xec, 0x8c, 0xbc, 0x67, 0xd1, 0x6b, 0xf4, 0x2a, 0xc5, 0xc5, 0x1a, 0xb1, 0x45, + 0x0a, 0x6d, 0x86, 0x5d, 0xc4, 0xe9, 0x41, 0x97, 0xdd, 0x17, 0xae, 0x11, 0xda, 0x68, 0x1f, 0x1a, + 0x63, 0xec, 0xb8, 0x2a, 0x0f, 0x8d, 0x6a, 0x28, 0x9d, 0xce, 0x27, 0x84, 0x5d, 0xec, 0x05, 0x53, + 0xba, 0xd8, 0x05, 0x50, 0x6d, 0x1c, 0x91, 0x22, 0x05, 0x2e, 0xf7, 0xcf, 0x1e, 0x61, 0xc3, 0xd5, + 0x0d, 0xa2, 0xce, 0x7d, 0xb9, 0xc7, 0xe7, 0x40, 0x3b, 0x27, 0xba, 0x46, 0x8c, 0x81, 0xf7, 0xc9, + 0x2e, 0xf9, 0xc6, 0xfe, 0x27, 0x75, 0x64, 0x05, 0x6a, 0xd1, 0x64, 0x84, 0x6a, 0x90, 0x71, 0x4f, + 0x85, 0x03, 0x32, 0xee, 0x29, 0xfa, 0x3f, 0xc8, 0xd1, 0x49, 0xb2, 0xc9, 0xd7, 0x16, 0x30, 0x01, + 0x61, 0xd7, 0x3b, 0xb3, 0x88, 0xc2, 0x34, 0x65, 0xd9, 0xdf, 0x0d, 0x7e, 0x82, 0x9a, 0x45, 0x95, + 0x9f, 0x87, 0xfa, 0x4c, 0x06, 0x0a, 0x7d, 0xbf, 0x74, 0xf8, 0xfb, 0xc9, 0x75, 0xa8, 0x46, 0xd2, + 0x8d, 0x7c, 0x05, 0x2e, 0x2f, 0xca, 0x1e, 0xf2, 0xc8, 0x97, 0x47, 0xb2, 0x00, 0xba, 0x05, 0x25, + 0x3f, 0x7d, 0xf0, 0xdd, 0x38, 0xef, 0x2b, 0x4f, 0x59, 0xf1, 0x55, 0xe9, 0x36, 0xa4, 0xcb, 0x9a, + 0xad, 0x87, 0x0c, 0x7b, 0xf1, 0x22, 0xb6, 0xac, 0x2e, 0x76, 0x46, 0xf2, 0x87, 0xd0, 0x8c, 0x4b, + 0x0d, 0x33, 0xd3, 0xc8, 0xf9, 0xcb, 0xf0, 0x0a, 0x14, 0x8e, 0x4d, 0x7b, 0x82, 0x5d, 0x06, 0x56, + 0x55, 0xc4, 0x88, 0x2e, 0x4f, 0x9e, 0x26, 0xb2, 0x4c, 0xcc, 0x07, 0xb2, 0x0a, 0x8f, 0xc7, 0xa6, + 0x07, 0x6a, 0xa2, 0x1b, 0x1a, 0xe1, 0xfe, 0xac, 0x2a, 0x7c, 0x10, 0x00, 0xf1, 0x97, 0xe5, 0x03, + 0xfa, 0x58, 0x87, 0xcd, 0x95, 0xe1, 0x97, 0x15, 0x31, 0x92, 0x1f, 0xc2, 0x95, 0xc5, 0x39, 0x02, + 0xdd, 0x02, 0xe0, 0xf1, 0xd4, 0xdf, 0x75, 0x95, 0xad, 0x2b, 0xf3, 0x6b, 0xfe, 0x36, 0x76, 0xb1, + 0x52, 0x66, 0x9a, 0xf4, 0x92, 0x46, 0x81, 0xc0, 0x4c, 0x75, 0xf4, 0x47, 0x7c, 0xc9, 0x64, 0x95, + 0xaa, 0xaf, 0x73, 0xa8, 0x3f, 0x22, 0xf2, 0x2f, 0xd3, 0xa1, 0x27, 0x47, 0x92, 0x46, 0x68, 0xa7, + 0xa5, 0x2f, 0xb4, 0xd3, 0xa2, 0x6f, 0x9c, 0x49, 0xf8, 0xc6, 0xf2, 0xaf, 0x01, 0x4a, 0x0a, 0x71, + 0x2c, 0x1a, 0x16, 0x51, 0x0b, 0xca, 0xe4, 0x74, 0x40, 0x38, 0x77, 0x4d, 0xc7, 0x72, 0x3f, 0xae, + 0xdd, 0xf1, 0x34, 0x29, 0xf1, 0xf2, 0xcd, 0xd0, 0x2b, 0x82, 0x9f, 0xc7, 0x53, 0x6d, 0x61, 0x1e, + 0x26, 0xe8, 0xaf, 0x7a, 0x04, 0x3d, 0x1b, 0xcb, 0xb5, 0xb8, 0xd5, 0x0c, 0x43, 0x7f, 0x45, 0x30, + 0xf4, 0xdc, 0x92, 0x87, 0x45, 0x28, 0x7a, 0x3b, 0x42, 0xd1, 0xf3, 0x4b, 0xa6, 0x19, 0xc3, 0xd1, + 0xdb, 0x11, 0x8e, 0x5e, 0x58, 0x02, 0x12, 0x43, 0xd2, 0x5f, 0xf5, 0x48, 0x7a, 0x71, 0xc9, 0xb4, + 0x67, 0x58, 0xfa, 0x9d, 0x28, 0x4b, 0xe7, 0x0c, 0xfb, 0x46, 0xac, 0x75, 0x2c, 0x4d, 0xff, 0x6e, + 0x88, 0xa6, 0x97, 0x63, 0x39, 0x32, 0x07, 0x59, 0xc0, 0xd3, 0xdb, 0x11, 0x9e, 0x0e, 0x4b, 0x7c, + 0x10, 0x43, 0xd4, 0xdf, 0x0e, 0x13, 0xf5, 0x4a, 0x2c, 0xd7, 0x17, 0x8b, 0x66, 0x11, 0x53, 0x7f, + 0xdd, 0x67, 0xea, 0x2b, 0xb1, 0xa5, 0x86, 0x98, 0xc3, 0x2c, 0x55, 0xdf, 0x9f, 0xa3, 0xea, 0x9c, + 0x5a, 0x3f, 0x13, 0x0b, 0xb1, 0x84, 0xab, 0xef, 0xcf, 0x71, 0xf5, 0xda, 0x12, 0xc0, 0x25, 0x64, + 0xfd, 0x27, 0x8b, 0xc9, 0x7a, 0x3c, 0x9d, 0x16, 0xaf, 0x99, 0x8c, 0xad, 0xab, 0x31, 0x6c, 0x9d, + 0x33, 0xea, 0x17, 0x62, 0xe1, 0x13, 0xd3, 0xf5, 0xa3, 0x05, 0x74, 0x9d, 0x13, 0xeb, 0xe7, 0x62, + 0xc1, 0x13, 0xf0, 0xf5, 0xa3, 0x05, 0x7c, 0x1d, 0x2d, 0x85, 0x4d, 0x4e, 0xd8, 0x9f, 0xa7, 0xbc, + 0x68, 0x26, 0xcc, 0xd1, 0xdc, 0x42, 0x6c, 0xdb, 0xb4, 0x05, 0x17, 0xe6, 0x03, 0xf9, 0x39, 0xca, + 0xd4, 0x82, 0x90, 0x76, 0x0e, 0xb9, 0x67, 0x39, 0x3c, 0x14, 0xc6, 0xe4, 0xdf, 0xa7, 0x03, 0x5b, + 0x46, 0x6e, 0xc2, 0x2c, 0xaf, 0x2c, 0x58, 0x5e, 0x88, 0xf3, 0x67, 0xa2, 0x9c, 0x7f, 0x1d, 0x2a, + 0x34, 0x37, 0xcf, 0xd0, 0x79, 0x6c, 0x79, 0x74, 0x1e, 0xdd, 0x84, 0x55, 0x46, 0xbe, 0x78, 0x5e, + 0x10, 0x09, 0x39, 0xc7, 0xf2, 0x51, 0x9d, 0xde, 0xe0, 0x5b, 0x89, 0x67, 0xe6, 0x97, 0xe0, 0x52, + 0x48, 0xd7, 0xcf, 0xf9, 0x9c, 0xc3, 0x36, 0x7c, 0xed, 0x6d, 0x91, 0xfc, 0xdf, 0x0b, 0x1c, 0x14, + 0x94, 0x0a, 0x08, 0x72, 0x03, 0x53, 0x23, 0x22, 0x23, 0xb3, 0x6b, 0x5a, 0x3e, 0x8c, 0xcd, 0xa1, + 0xc8, 0xbb, 0xf4, 0x92, 0x6a, 0xf9, 0x31, 0xbb, 0xcc, 0x43, 0xb2, 0xfc, 0xa7, 0x74, 0x80, 0x17, + 0x54, 0x0f, 0x8b, 0x88, 0x7e, 0xfa, 0xbf, 0x43, 0xf4, 0x33, 0xdf, 0x98, 0xe8, 0x87, 0x19, 0x51, + 0x36, 0xca, 0x88, 0xfe, 0x99, 0x0e, 0xbe, 0xb0, 0x4f, 0xdb, 0xbf, 0x99, 0x47, 0x02, 0x7a, 0x93, + 0x67, 0xdf, 0x4b, 0xd0, 0x1b, 0x51, 0x8c, 0x15, 0xd8, 0x73, 0xa3, 0xc5, 0x58, 0x91, 0x13, 0x1e, + 0x36, 0x40, 0xaf, 0x41, 0x99, 0x75, 0xf4, 0x54, 0xd3, 0x72, 0x44, 0x7a, 0x78, 0x22, 0x3c, 0x57, + 0xde, 0xb8, 0xdb, 0x38, 0xa0, 0x3a, 0xfb, 0x96, 0xa3, 0x94, 0x2c, 0x71, 0x15, 0x62, 0x6e, 0xe5, + 0x48, 0x01, 0x71, 0x0d, 0xca, 0xf4, 0xed, 0x1d, 0x0b, 0x0f, 0x08, 0x0b, 0xf5, 0x65, 0x25, 0x10, + 0xc8, 0xf7, 0x01, 0xcd, 0x27, 0x1b, 0xd4, 0x85, 0x02, 0x39, 0x21, 0x86, 0x4b, 0xbf, 0x5a, 0x76, + 0x96, 0x8e, 0x08, 0x76, 0x4e, 0x0c, 0xb7, 0xd5, 0xa4, 0x4e, 0xfe, 0xc7, 0x97, 0xeb, 0x0d, 0xae, + 0xfd, 0xa2, 0x39, 0xd1, 0x5d, 0x32, 0xb1, 0xdc, 0x33, 0x45, 0xd8, 0xcb, 0x3f, 0xcb, 0x50, 0xaa, + 0x1c, 0x49, 0x44, 0x0b, 0x7d, 0xeb, 0x6d, 0xa0, 0x4c, 0xa8, 0x4c, 0x4a, 0xe6, 0xef, 0x35, 0x80, + 0x21, 0x76, 0xd4, 0x87, 0xd8, 0x70, 0x89, 0x26, 0x9c, 0x1e, 0x92, 0x20, 0x09, 0x4a, 0x74, 0x34, + 0x75, 0x88, 0x26, 0x2a, 0x36, 0x7f, 0x1c, 0x9a, 0x67, 0xf1, 0xdb, 0xcd, 0x33, 0xea, 0xe5, 0xd2, + 0xac, 0x97, 0x7f, 0x91, 0x09, 0x76, 0x49, 0x50, 0x55, 0xfc, 0xef, 0xf9, 0xe1, 0x57, 0xac, 0xd5, + 0x10, 0x65, 0x04, 0xe8, 0x10, 0x56, 0xfd, 0x5d, 0xaa, 0x4e, 0xd9, 0xee, 0xf5, 0xd6, 0x5d, 0xd2, + 0x6d, 0xde, 0x38, 0x89, 0x8a, 0x1d, 0xf4, 0x03, 0xb8, 0x3a, 0x13, 0x81, 0x7c, 0xe8, 0x4c, 0xc2, + 0x40, 0xf4, 0x58, 0x34, 0x10, 0x79, 0xc8, 0x81, 0xaf, 0xb2, 0xdf, 0x72, 0x6f, 0xec, 0xd0, 0xea, + 0x35, 0xcc, 0x6f, 0x16, 0x7e, 0xfd, 0x1b, 0x50, 0xb5, 0x89, 0x8b, 0x75, 0x43, 0x8d, 0xf4, 0x07, + 0x56, 0xb8, 0x50, 0x74, 0x1d, 0x0e, 0xe0, 0xb1, 0x85, 0x3c, 0x07, 0xfd, 0x3f, 0x94, 0x03, 0x8a, + 0x94, 0x8e, 0x29, 0xb5, 0xfd, 0xf2, 0x31, 0xd0, 0x95, 0xff, 0x98, 0x0e, 0x20, 0xa3, 0x05, 0x69, + 0x07, 0x0a, 0x36, 0x71, 0xa6, 0x63, 0x5e, 0x22, 0xd6, 0xb6, 0x5e, 0x4a, 0xc6, 0x90, 0xa8, 0x74, + 0x3a, 0x76, 0x15, 0x61, 0x2c, 0xdf, 0x87, 0x02, 0x97, 0xa0, 0x0a, 0x14, 0x8f, 0xf6, 0xee, 0xee, + 0xed, 0xbf, 0xbf, 0xd7, 0x48, 0x21, 0x80, 0xc2, 0x76, 0xbb, 0xdd, 0x39, 0xe8, 0x35, 0xd2, 0xa8, + 0x0c, 0xf9, 0xed, 0xd6, 0xbe, 0xd2, 0x6b, 0x64, 0xa8, 0x58, 0xe9, 0xbc, 0xdb, 0x69, 0xf7, 0x1a, + 0x59, 0xb4, 0x0a, 0x55, 0x7e, 0xad, 0xde, 0xd9, 0x57, 0xde, 0xdb, 0xee, 0x35, 0x72, 0x21, 0xd1, + 0x61, 0x67, 0xef, 0x76, 0x47, 0x69, 0xe4, 0xe5, 0x97, 0x69, 0x0d, 0x1a, 0xc3, 0xa9, 0x82, 0x6a, + 0x33, 0x1d, 0xaa, 0x36, 0xe5, 0xdf, 0x64, 0x40, 0x8a, 0x27, 0x4a, 0xe8, 0xdd, 0x99, 0x89, 0x6f, + 0x5d, 0x80, 0x65, 0xcd, 0xcc, 0x1e, 0x3d, 0x0d, 0x35, 0x9b, 0x1c, 0x13, 0x77, 0x30, 0xe2, 0xc4, + 0x8d, 0x27, 0xb6, 0xaa, 0x52, 0x15, 0x52, 0x66, 0xe4, 0x70, 0xb5, 0x8f, 0xc8, 0xc0, 0x55, 0x79, + 0xe1, 0xcb, 0x17, 0x5d, 0x99, 0xaa, 0x51, 0xe9, 0x21, 0x17, 0xca, 0x1f, 0x5e, 0xc8, 0x97, 0x65, + 0xc8, 0x2b, 0x9d, 0x9e, 0xf2, 0xc3, 0x46, 0x16, 0x21, 0xa8, 0xb1, 0x4b, 0xf5, 0x70, 0x6f, 0xfb, + 0xe0, 0xb0, 0xbb, 0x4f, 0x7d, 0x79, 0x09, 0xea, 0x9e, 0x2f, 0x3d, 0x61, 0x5e, 0x3e, 0x80, 0xab, + 0x31, 0x2c, 0xef, 0x1b, 0x56, 0xdc, 0xf2, 0x6f, 0xd3, 0x61, 0xc8, 0x68, 0x29, 0xfd, 0xce, 0x8c, + 0xa7, 0x37, 0x93, 0x72, 0xc3, 0x59, 0x37, 0x4b, 0x50, 0x22, 0xa2, 0x8f, 0xc4, 0x1c, 0xbc, 0xa2, + 0xf8, 0x63, 0xf9, 0xa5, 0xe5, 0x4e, 0x0b, 0x56, 0x5d, 0x46, 0xfe, 0x77, 0x1a, 0xea, 0x33, 0x21, + 0x02, 0x6d, 0x41, 0x9e, 0x97, 0x3f, 0x71, 0xff, 0xb4, 0x58, 0x84, 0x13, 0xf1, 0x84, 0xab, 0xa2, + 0x37, 0x23, 0xaf, 0x34, 0x17, 0x8a, 0xb8, 0xb3, 0xbc, 0xe6, 0x97, 0x30, 0xf5, 0x2d, 0xd0, 0x5b, + 0x50, 0xf6, 0x63, 0x9d, 0xa8, 0xb9, 0x9f, 0x9a, 0x37, 0xf7, 0xa3, 0xa4, 0xb0, 0x0f, 0x6c, 0xd0, + 0xeb, 0x01, 0x2b, 0xcd, 0xcd, 0x17, 0x5d, 0xc2, 0x9c, 0x2b, 0x08, 0x63, 0x4f, 0x5f, 0x6e, 0x43, + 0x25, 0x34, 0x1f, 0xf4, 0x04, 0x94, 0x27, 0xf8, 0x54, 0xb4, 0x4c, 0x79, 0xd3, 0xab, 0x34, 0xc1, + 0xa7, 0xbc, 0x5b, 0x7a, 0x15, 0x8a, 0xf4, 0xe6, 0x10, 0x3b, 0xa2, 0x8f, 0x52, 0x98, 0xe0, 0xd3, + 0x77, 0xb0, 0x23, 0x7f, 0x00, 0xb5, 0x68, 0xbb, 0x90, 0xee, 0x45, 0xdb, 0x9c, 0x1a, 0x1a, 0xc3, + 0xc8, 0x2b, 0x7c, 0x80, 0x6e, 0x41, 0xfe, 0xc4, 0xe4, 0xe1, 0x7a, 0x71, 0xd0, 0xba, 0x67, 0xba, + 0x24, 0xd4, 0x6e, 0xe4, 0xda, 0xf2, 0x23, 0xc8, 0xb3, 0xf0, 0x4b, 0x43, 0x29, 0x6b, 0xfc, 0x09, + 0x46, 0x4e, 0xaf, 0xd1, 0x07, 0x00, 0xd8, 0x75, 0x6d, 0xbd, 0x3f, 0x0d, 0x80, 0xd7, 0x17, 0x87, + 0xef, 0x6d, 0x4f, 0xaf, 0x75, 0x4d, 0xc4, 0xf1, 0xcb, 0x81, 0x69, 0x28, 0x96, 0x87, 0x00, 0xe5, + 0x3d, 0xa8, 0x45, 0x6d, 0xc3, 0x2d, 0xf8, 0x95, 0x05, 0x2d, 0x78, 0x9f, 0xf5, 0xf9, 0x9c, 0x31, + 0xcb, 0x9b, 0xbc, 0x6c, 0x20, 0xff, 0x2e, 0x0d, 0xa5, 0xde, 0xa9, 0x58, 0xa3, 0x31, 0xfd, 0xc5, + 0xc0, 0x34, 0x13, 0xee, 0xa6, 0xf1, 0x86, 0x65, 0xd6, 0x6f, 0x83, 0xbe, 0xed, 0x6f, 0xa8, 0x5c, + 0xd2, 0x62, 0xdf, 0xeb, 0x52, 0x89, 0x9d, 0x74, 0x03, 0xaa, 0xa6, 0xad, 0x0f, 0x75, 0x03, 0x8f, + 0xc3, 0x05, 0xc6, 0x8a, 0x27, 0x64, 0x3c, 0xfa, 0x0d, 0x28, 0xfb, 0x4b, 0x8f, 0xd6, 0x3f, 0x58, + 0xd3, 0x6c, 0xe2, 0x38, 0xc2, 0x01, 0xde, 0x90, 0xf5, 0xb4, 0xcd, 0x87, 0xa2, 0xa9, 0x97, 0x55, + 0xf8, 0x40, 0xd6, 0xa0, 0x3e, 0x93, 0xdd, 0xd1, 0x1b, 0x50, 0xb4, 0xa6, 0x7d, 0xd5, 0xf3, 0xe1, + 0xcc, 0x0e, 0xf3, 0xb8, 0xf0, 0xb4, 0x3f, 0xd6, 0x07, 0x77, 0xc9, 0x99, 0xf7, 0xc6, 0xd6, 0xb4, + 0x7f, 0x97, 0xbb, 0x9a, 0x3f, 0x25, 0x13, 0x7e, 0xca, 0x09, 0x94, 0xbc, 0x95, 0x83, 0xbe, 0x17, + 0xde, 0x4c, 0xde, 0x9f, 0x8e, 0x58, 0xc6, 0x21, 0xe0, 0x43, 0x7b, 0xe9, 0x26, 0xac, 0x3a, 0xfa, + 0xd0, 0x20, 0x9a, 0x1a, 0x54, 0x60, 0xec, 0x69, 0x25, 0xa5, 0xce, 0x6f, 0xec, 0x7a, 0xe5, 0x97, + 0xfc, 0xaf, 0x34, 0x94, 0xbc, 0x5d, 0x8d, 0x5e, 0x0e, 0x2d, 0xce, 0xda, 0x82, 0xee, 0x97, 0xa7, + 0x18, 0xb4, 0xa5, 0xa3, 0xef, 0x9a, 0xb9, 0xf8, 0xbb, 0xc6, 0xfd, 0x5f, 0xf0, 0x7e, 0xf4, 0xe4, + 0x2e, 0xfc, 0xa3, 0xe7, 0x45, 0x40, 0xae, 0xe9, 0xe2, 0xb1, 0x7a, 0x62, 0xba, 0xba, 0x31, 0x54, + 0xb9, 0xb3, 0x39, 0xf1, 0x6c, 0xb0, 0x3b, 0xf7, 0xd8, 0x8d, 0x03, 0xe6, 0xf7, 0x9f, 0xa6, 0xa1, + 0xe4, 0x53, 0x88, 0x8b, 0x76, 0x99, 0xaf, 0x40, 0x41, 0x64, 0x49, 0xde, 0x66, 0x16, 0x23, 0xff, + 0x87, 0x47, 0x2e, 0xf4, 0xc3, 0x43, 0x82, 0xd2, 0x84, 0xb8, 0x98, 0x25, 0x23, 0xbe, 0x46, 0xfd, + 0xf1, 0xcd, 0xd7, 0xa1, 0x12, 0x6a, 0xf8, 0xd3, 0xed, 0xb9, 0xd7, 0x79, 0xbf, 0x91, 0x92, 0x8a, + 0x9f, 0x7c, 0x76, 0x3d, 0xbb, 0x47, 0x1e, 0xd2, 0x35, 0xab, 0x74, 0xda, 0xdd, 0x4e, 0xfb, 0x6e, + 0x23, 0x2d, 0x55, 0x3e, 0xf9, 0xec, 0x7a, 0x51, 0x21, 0xac, 0x69, 0x76, 0xb3, 0x0b, 0x2b, 0xe1, + 0xaf, 0x12, 0xcd, 0x19, 0x08, 0x6a, 0xb7, 0x8f, 0x0e, 0x76, 0x77, 0xda, 0xdb, 0xbd, 0x8e, 0x7a, + 0x6f, 0xbf, 0xd7, 0x69, 0xa4, 0xd1, 0x55, 0xb8, 0xb4, 0xbb, 0xf3, 0x4e, 0xb7, 0xa7, 0xb6, 0x77, + 0x77, 0x3a, 0x7b, 0x3d, 0x75, 0xbb, 0xd7, 0xdb, 0x6e, 0xdf, 0x6d, 0x64, 0xb6, 0xfe, 0x52, 0x81, + 0xfa, 0x76, 0xab, 0xbd, 0x43, 0x49, 0x82, 0x3e, 0xc0, 0xa2, 0x29, 0x99, 0x63, 0x3d, 0x88, 0x73, + 0x4f, 0x45, 0x48, 0xe7, 0xf7, 0x64, 0xd1, 0x1d, 0xc8, 0xb3, 0xf6, 0x04, 0x3a, 0xff, 0x98, 0x84, + 0xb4, 0xa4, 0x49, 0x4b, 0x5f, 0x86, 0x6d, 0x8f, 0x73, 0xcf, 0x4d, 0x48, 0xe7, 0xf7, 0x6c, 0x91, + 0x02, 0xe5, 0xa0, 0xbf, 0xb0, 0xfc, 0x1c, 0x85, 0x94, 0xa0, 0x8f, 0x4b, 0x31, 0x83, 0xea, 0x69, + 0xf9, 0xb9, 0x02, 0x29, 0x41, 0x94, 0x43, 0xbb, 0x50, 0xf4, 0xea, 0xd2, 0x65, 0x27, 0x1d, 0xa4, + 0xa5, 0x3d, 0x56, 0xfa, 0x09, 0x78, 0xff, 0xe0, 0xfc, 0x63, 0x1b, 0xd2, 0x92, 0x86, 0x31, 0xda, + 0x81, 0x82, 0x28, 0x09, 0x96, 0x9c, 0x5e, 0x90, 0x96, 0xf5, 0x4c, 0xa9, 0xd3, 0x82, 0xc6, 0xcc, + 0xf2, 0xc3, 0x28, 0x52, 0x82, 0x5e, 0x38, 0x3a, 0x02, 0x08, 0x75, 0x0b, 0x12, 0x9c, 0x32, 0x91, + 0x92, 0xf4, 0xb8, 0xd1, 0x3e, 0x94, 0xfc, 0xaa, 0x70, 0xe9, 0x99, 0x0f, 0x69, 0x79, 0xb3, 0x19, + 0xdd, 0x87, 0x6a, 0xb4, 0x1c, 0x4a, 0x76, 0x92, 0x43, 0x4a, 0xd8, 0x45, 0xa6, 0xf8, 0xd1, 0xda, + 0x28, 0xd9, 0xc9, 0x0e, 0x29, 0x61, 0x53, 0x19, 0x7d, 0x04, 0xab, 0xf3, 0xb5, 0x4b, 0xf2, 0x83, + 0x1e, 0xd2, 0x05, 0xda, 0xcc, 0x68, 0x02, 0x68, 0x41, 0xcd, 0x73, 0x81, 0x73, 0x1f, 0xd2, 0x45, + 0xba, 0xce, 0x48, 0x83, 0xfa, 0x6c, 0x21, 0x91, 0xf4, 0x1c, 0x88, 0x94, 0xb8, 0x03, 0xcd, 0x9f, + 0x12, 0xad, 0x2d, 0x92, 0x9e, 0x0b, 0x91, 0x12, 0x37, 0xa4, 0x5b, 0x9d, 0xcf, 0xbf, 0x5a, 0x4b, + 0x7f, 0xf1, 0xd5, 0x5a, 0xfa, 0xef, 0x5f, 0xad, 0xa5, 0x3f, 0xfd, 0x7a, 0x2d, 0xf5, 0xc5, 0xd7, + 0x6b, 0xa9, 0xbf, 0x7e, 0xbd, 0x96, 0xfa, 0xd1, 0x0b, 0x43, 0xdd, 0x1d, 0x4d, 0xfb, 0x1b, 0x03, + 0x73, 0xb2, 0x19, 0x3e, 0x60, 0xb7, 0xe8, 0xd0, 0x5f, 0xbf, 0xc0, 0x92, 0xee, 0x2b, 0xff, 0x09, + 0x00, 0x00, 0xff, 0xff, 0x16, 0x0c, 0xd3, 0x03, 0x14, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3540,7 +3712,8 @@ 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) + PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) + ProcessProposal(ctx context.Context, in *RequestProcessProposal, opts ...grpc.CallOption) (*ResponseProcessProposal, error) } type aBCIApplicationClient struct { @@ -3686,9 +3859,18 @@ 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...) +func (c *aBCIApplicationClient) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) { + out := new(ResponsePrepareProposal) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/PrepareProposal", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *aBCIApplicationClient) ProcessProposal(ctx context.Context, in *RequestProcessProposal, opts ...grpc.CallOption) (*ResponseProcessProposal, error) { + out := new(ResponseProcessProposal) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ProcessProposal", in, out, opts...) if err != nil { return nil, err } @@ -3712,7 +3894,8 @@ 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) + PrepareProposal(context.Context, *RequestPrepareProposal) (*ResponsePrepareProposal, error) + ProcessProposal(context.Context, *RequestProcessProposal) (*ResponseProcessProposal, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3764,8 +3947,11 @@ 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 (*UnimplementedABCIApplicationServer) PrepareProposal(ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { + return nil, status.Errorf(codes.Unimplemented, "method PrepareProposal not implemented") +} +func (*UnimplementedABCIApplicationServer) ProcessProposal(ctx context.Context, req *RequestProcessProposal) (*ResponseProcessProposal, error) { + return nil, status.Errorf(codes.Unimplemented, "method ProcessProposal not implemented") } func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { @@ -4042,20 +4228,38 @@ 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) +func _ABCIApplication_PrepareProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestPrepareProposal) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).PrepareProposal(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/PrepareProposal", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).PrepareProposal(ctx, req.(*RequestPrepareProposal)) + } + return interceptor(ctx, in, info, handler) +} + +func _ABCIApplication_ProcessProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestProcessProposal) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ABCIApplicationServer).PreprocessTxs(ctx, in) + return srv.(ABCIApplicationServer).ProcessProposal(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/PreprocessTxs", + FullMethod: "/tendermint.abci.ABCIApplication/ProcessProposal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ABCIApplicationServer).PreprocessTxs(ctx, req.(*RequestPreprocessTxs)) + return srv.(ABCIApplicationServer).ProcessProposal(ctx, req.(*RequestProcessProposal)) } return interceptor(ctx, in, info, handler) } @@ -4125,8 +4329,12 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, { - MethodName: "PreprocessTxs", - Handler: _ABCIApplication_PreprocessTxs_Handler, + MethodName: "PrepareProposal", + Handler: _ABCIApplication_PrepareProposal_Handler, + }, + { + MethodName: "ProcessProposal", + Handler: _ABCIApplication_ProcessProposal_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -4480,16 +4688,16 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } -func (m *Request_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *Request_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Request_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Request_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.PreprocessTxs != nil { + if m.PrepareProposal != nil { { - size, err := m.PreprocessTxs.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PrepareProposal.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4503,6 +4711,29 @@ func (m *Request_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } +func (m *Request_ProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_ProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.ProcessProposal != nil { + { + size, err := m.ProcessProposal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} func (m *RequestEcho) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4698,12 +4929,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err18 != nil { - return 0, err18 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err19 != nil { + return 0, err19 } - i -= n18 - i = encodeVarintTypes(dAtA, i, uint64(n18)) + i -= n19 + i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -5086,7 +5317,7 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } -func (m *RequestPreprocessTxs) Marshal() (dAtA []byte, err error) { +func (m *RequestPrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5096,25 +5327,78 @@ func (m *RequestPreprocessTxs) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RequestPreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *RequestPrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestPreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *RequestPrepareProposal) 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 + if m.BlockDataSize != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) + i-- + dAtA[i] = 0x10 + } + if m.BlockData != nil { + { + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *RequestProcessProposal) 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 *RequestProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BlockData != nil { + { + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + { + size, err := m.Header.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -5488,16 +5772,16 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } -func (m *Response_PreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *Response_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Response_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Response_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.PreprocessTxs != nil { + if m.PrepareProposal != nil { { - size, err := m.PreprocessTxs.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PrepareProposal.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5511,27 +5795,50 @@ func (m *Response_PreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } -func (m *ResponseException) 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 *ResponseException) MarshalTo(dAtA []byte) (int, error) { +func (m *Response_ProcessProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ResponseException) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Response_ProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Error) > 0 { + if m.ProcessProposal != nil { + { + size, err := m.ProcessProposal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + return len(dAtA) - i, nil +} +func (m *ResponseException) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ResponseException) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseException) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Error) > 0 { i -= len(m.Error) copy(dAtA[i:], m.Error) i = encodeVarintTypes(dAtA, i, uint64(len(m.Error))) @@ -6251,20 +6558,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA43 := make([]byte, len(m.RefetchChunks)*10) - var j42 int + dAtA48 := make([]byte, len(m.RefetchChunks)*10) + var j47 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA43[j42] = uint8(uint64(num)&0x7f | 0x80) + dAtA48[j47] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j42++ + j47++ } - dAtA43[j42] = uint8(num) - j42++ + dAtA48[j47] = uint8(num) + j47++ } - i -= j42 - copy(dAtA[i:], dAtA43[:j42]) - i = encodeVarintTypes(dAtA, i, uint64(j42)) + i -= j47 + copy(dAtA[i:], dAtA48[:j47]) + i = encodeVarintTypes(dAtA, i, uint64(j47)) i-- dAtA[i] = 0x12 } @@ -6276,7 +6583,7 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *ResponsePreprocessTxs) Marshal() (dAtA []byte, err error) { +func (m *ResponsePrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -6286,19 +6593,19 @@ func (m *ResponsePreprocessTxs) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResponsePreprocessTxs) MarshalTo(dAtA []byte) (int, error) { +func (m *ResponsePrepareProposal) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ResponsePreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ResponsePrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Messages != nil { + if m.BlockData != nil { { - size, err := m.Messages.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.BlockData.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6306,17 +6613,45 @@ func (m *ResponsePreprocessTxs) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa } - 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]))) + return len(dAtA) - i, nil +} + +func (m *ResponseProcessProposal) 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 *ResponseProcessProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Evidence) > 0 { + for iNdEx := len(m.Evidence) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Evidence[iNdEx]) + copy(dAtA[i:], m.Evidence[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.Evidence[iNdEx]))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -6755,12 +7090,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n52, err52 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err52 != nil { - return 0, err52 + n57, err57 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err57 != nil { + return 0, err57 } - i -= n52 - i = encodeVarintTypes(dAtA, i, uint64(n52)) + i -= n57 + i = encodeVarintTypes(dAtA, i, uint64(n57)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7041,14 +7376,26 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { } return n } -func (m *Request_PreprocessTxs) Size() (n int) { +func (m *Request_PrepareProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.PreprocessTxs != nil { - l = m.PreprocessTxs.Size() + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Request_ProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProcessProposal != nil { + l = m.ProcessProposal.Size() n += 2 + l + sovTypes(uint64(l)) } return n @@ -7303,17 +7650,33 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } -func (m *RequestPreprocessTxs) Size() (n int) { +func (m *RequestPrepareProposal) 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.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) + } + if m.BlockDataSize != 0 { + n += 1 + sovTypes(uint64(m.BlockDataSize)) + } + return n +} + +func (m *RequestProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Header.Size() + n += 1 + l + sovTypes(uint64(l)) + if m.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) } return n } @@ -7522,14 +7885,26 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { } return n } -func (m *Response_PreprocessTxs) Size() (n int) { +func (m *Response_PrepareProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.PreprocessTxs != nil { - l = m.PreprocessTxs.Size() + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Response_ProcessProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProcessProposal != nil { + l = m.ProcessProposal.Size() n += 2 + l + sovTypes(uint64(l)) } return n @@ -7882,22 +8257,34 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } -func (m *ResponsePreprocessTxs) Size() (n int) { +func (m *ResponsePrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BlockData != nil { + l = m.BlockData.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *ResponseProcessProposal) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Txs) > 0 { - for _, b := range m.Txs { + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + if len(m.Evidence) > 0 { + for _, b := range m.Evidence { 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 } @@ -8677,7 +9064,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 16: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8704,11 +9091,46 @@ func (m *Request) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &RequestPreprocessTxs{} + v := &RequestPrepareProposal{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &Request_PreprocessTxs{v} + m.Value = &Request_PrepareProposal{v} + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProcessProposal", 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 := &RequestProcessProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_ProcessProposal{v} iNdEx = postIndex default: iNdEx = preIndex @@ -10392,7 +10814,7 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { +func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -10415,17 +10837,17 @@ func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RequestPreprocessTxs: wiretype end group for non-group") + return fmt.Errorf("proto: RequestPrepareProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RequestPreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RequestPrepareProposal: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -10435,23 +10857,165 @@ func (m *RequestPreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + if m.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + } + m.BlockDataSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockDataSize |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *RequestProcessProposal) 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: RequestProcessProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", 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 err := m.Header.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", 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.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -11065,7 +11629,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 17: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PreprocessTxs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11092,11 +11656,46 @@ func (m *Response) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ResponsePreprocessTxs{} + v := &ResponsePrepareProposal{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &Response_PreprocessTxs{v} + m.Value = &Response_PrepareProposal{v} + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProcessProposal", 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 := &ResponseProcessProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_ProcessProposal{v} iNdEx = postIndex default: iNdEx = preIndex @@ -13410,7 +14009,7 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { +func (m *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -13433,17 +14032,17 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResponsePreprocessTxs: wiretype end group for non-group") + return fmt.Errorf("proto: ResponsePrepareProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResponsePreprocessTxs: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResponsePrepareProposal: 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) + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13453,29 +14052,102 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + if m.BlockData == nil { + m.BlockData = &types1.Data{} + } + if err := m.BlockData.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 *ResponseProcessProposal) 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: ResponseProcessProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= ResponseProcessProposal_Result(b&0x7F) << shift + if b < 0x80 { + break + } + } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Messages", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Evidence", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13485,27 +14157,23 @@ func (m *ResponsePreprocessTxs) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen 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 - } + m.Evidence = append(m.Evidence, make([]byte, postIndex-iNdEx)) + copy(m.Evidence[len(m.Evidence)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index c902922e36..ee1c03d2bf 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -36,7 +36,8 @@ message Request { RequestOfferSnapshot offer_snapshot = 13; RequestLoadSnapshotChunk load_snapshot_chunk = 14; RequestApplySnapshotChunk apply_snapshot_chunk = 15; - RequestPreprocessTxs preprocess_txs = 16; + RequestPrepareProposal prepare_proposal = 16; + RequestProcessProposal process_proposal = 17; } } @@ -126,8 +127,18 @@ message RequestApplySnapshotChunk { string sender = 3; } -message RequestPreprocessTxs { - repeated bytes txs = 1; +message RequestPrepareProposal { + // block_data is an array of transactions that will be included in a block, + // sent to the app for possible modifications. + // applications can not exceed the size of the data passed to it. + tendermint.types.Data block_data = 1; + // If an application decides to populate block_data with extra information, they can not exceed this value. + int64 block_data_size = 2; +} + +message RequestProcessProposal { + tendermint.types.Header header = 1 [(gogoproto.nullable) = false]; + tendermint.types.Data block_data = 2; } //---------------------------------------- @@ -151,7 +162,8 @@ message Response { ResponseOfferSnapshot offer_snapshot = 14; ResponseLoadSnapshotChunk load_snapshot_chunk = 15; ResponseApplySnapshotChunk apply_snapshot_chunk = 16; - ResponsePreprocessTxs preprocess_txs = 17; + ResponsePrepareProposal prepare_proposal = 17; + ResponseProcessProposal process_proposal = 18; } } @@ -282,9 +294,19 @@ message ResponseApplySnapshotChunk { } } -message ResponsePreprocessTxs { - repeated bytes txs = 1; - tendermint.types.Messages messages = 2; +message ResponsePrepareProposal { + tendermint.types.Data block_data = 1; +} + +message ResponseProcessProposal { + Result result = 1; + repeated bytes evidence = 2; + + enum Result { + UNKNOWN = 0; // Unknown result, invalidate + ACCEPT = 1; // proposal verified, vote on the proposal + REJECT = 2; // proposal invalidated + } } //---------------------------------------- @@ -416,5 +438,6 @@ service ABCIApplication { rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); - rpc PreprocessTxs(RequestPreprocessTxs) returns (ResponsePreprocessTxs); + rpc PrepareProposal(RequestPrepareProposal) returns (ResponsePrepareProposal); + rpc ProcessProposal(RequestProcessProposal) returns (ResponseProcessProposal); } diff --git a/proxy/app_conn.go b/proxy/app_conn.go index d14932487a..d302b5affa 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -21,7 +21,8 @@ type AppConnConsensus interface { EndBlockSync(types.RequestEndBlock) (*types.ResponseEndBlock, error) CommitSync() (*types.ResponseCommit, error) - PreprocessTxsSync(types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) + PrepareProposalSync(types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) + ProcessProposalSync(types.RequestProcessProposal) (*types.ResponseProcessProposal, error) } type AppConnMempool interface { @@ -95,10 +96,16 @@ func (app *appConnConsensus) CommitSync() (*types.ResponseCommit, error) { return app.appConn.CommitSync() } -func (app *appConnConsensus) PreprocessTxsSync( - req types.RequestPreprocessTxs, -) (*types.ResponsePreprocessTxs, error) { - return app.appConn.PreprocessTxsSync(req) +func (app *appConnConsensus) PrepareProposalSync( + req types.RequestPrepareProposal, +) (*types.ResponsePrepareProposal, error) { + return app.appConn.PrepareProposalSync(req) +} + +func (app *appConnConsensus) ProcessProposalSync( + req types.RequestProcessProposal, +) (*types.ResponseProcessProposal, error) { + return app.appConn.ProcessProposalSync(req) } //------------------------------------------------ diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index ddc34122ff..6f9a1ab2e0 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks @@ -136,21 +136,44 @@ func (_m *AppConnConsensus) InitChainSync(_a0 types.RequestInitChain) (*types.Re return r0, r1 } -// PreprocessTxsSync provides a mock function with given fields: _a0 -func (_m *AppConnConsensus) PreprocessTxsSync(_a0 types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error) { +// PrepareProposalSync provides a mock function with given fields: _a0 +func (_m *AppConnConsensus) PrepareProposalSync(_a0 types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) { ret := _m.Called(_a0) - var r0 *types.ResponsePreprocessTxs - if rf, ok := ret.Get(0).(func(types.RequestPreprocessTxs) *types.ResponsePreprocessTxs); ok { + var r0 *types.ResponsePrepareProposal + if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) *types.ResponsePrepareProposal); ok { r0 = rf(_a0) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*types.ResponsePreprocessTxs) + r0 = ret.Get(0).(*types.ResponsePrepareProposal) } } var r1 error - if rf, ok := ret.Get(1).(func(types.RequestPreprocessTxs) error); ok { + if rf, ok := ret.Get(1).(func(types.RequestPrepareProposal) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ProcessProposalSync provides a mock function with given fields: _a0 +func (_m *AppConnConsensus) ProcessProposalSync(_a0 types.RequestProcessProposal) (*types.ResponseProcessProposal, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseProcessProposal + if rf, ok := ret.Get(0).(func(types.RequestProcessProposal) *types.ResponseProcessProposal); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseProcessProposal) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestProcessProposal) error); ok { r1 = rf(_a0) } else { r1 = ret.Error(1) diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index a7d3ca3077..bc38147c79 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index 4de683cdb0..dd43b43e30 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index 9f31ea9b9f..dab5fee828 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/state/execution.go b/state/execution.go index f93065b034..a63ecff503 100644 --- a/state/execution.go +++ b/state/execution.go @@ -91,6 +91,8 @@ func (blockExec *BlockExecutor) SetEventBus(eventBus types.BlockEventPublisher) // and txs from the mempool. The max bytes must be big enough to fit the commit. // Up to 1/10th of the block space is allcoated for maximum sized evidence. // The rest is given to txs, up to the max gas. +// +// Contract: application will not return more bytes than are sent over the wire. func (blockExec *BlockExecutor) CreateProposalBlock( height int64, state State, commit *types.Commit, @@ -102,6 +104,13 @@ func (blockExec *BlockExecutor) CreateProposalBlock( evidence, evSize := blockExec.evpool.PendingEvidence(state.ConsensusParams.Evidence.MaxBytes) + evdData := types.EvidenceData{Evidence: evidence} + pevdData, err := evdData.ToProto() + if err != nil { + // todo(evan): see if we can get rid of this panic + panic(err) + } + // Fetch a limited amount of valid txs maxDataBytes := types.MaxDataBytes(maxBytes, evSize, state.Validators.Size()) @@ -118,40 +127,64 @@ func (blockExec *BlockExecutor) CreateProposalBlock( bzs[i] = txs[i] } - // TODO(ismail): - // 1. get those intermediate state roots & messages either from the - // mempool or from the abci-app - // 1.1 at this point we should now the square / block size: - // 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: - processedBlockTxs, err := blockExec.proxyApp.PreprocessTxsSync(abci.RequestPreprocessTxs{Txs: bzs}) + preparedProposal, err := blockExec.proxyApp.PrepareProposalSync( + abci.RequestPrepareProposal{ + BlockData: &tmproto.Data{Txs: txs.ToSliceOfBytes(), Evidence: *pevdData}, + BlockDataSize: maxDataBytes}, + ) 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. + // The App MUST ensure that only valid (and hence 'processable') transactions + // 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 transaction 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. + // this block, repair what caused the error and try again. Hence, we panic on + // purpose for now. panic(err) } + rawNewData := preparedProposal.GetBlockData() + var txSize int + for _, tx := range rawNewData.GetTxs() { + txSize += len(tx) - ppt := processedBlockTxs.GetTxs() + if maxDataBytes < int64(txSize) { + panic("block data exceeds max amount of allowed bytes") + } + } - pbmessages := processedBlockTxs.GetMessages() + newData, err := types.DataFromProto(rawNewData) + if err != nil { + // todo(evan): see if we can get rid of this panic + panic(err) + } - lp := len(ppt) - processedTxs := make(types.Txs, lp) - if lp > 0 { - for i := 0; i < l; i++ { - processedTxs[i] = ppt[i] - } + return state.MakeBlock( + height, + newData.Txs, + newData.Evidence.Evidence, + newData.IntermediateStateRoots.RawRootsList, + newData.Messages.MessagesList, + commit, + proposerAddr, + ) +} + +func (blockExec *BlockExecutor) ProcessProposal( + block *types.Block, +) (bool, error) { + pData := block.Data.ToProto() + req := abci.RequestProcessProposal{ + BlockData: &pData, + Header: *block.Header.ToProto(), } - messages := types.MessagesFromProto(pbmessages) + resp, err := blockExec.proxyApp.ProcessProposalSync(req) + if err != nil { + return false, ErrInvalidBlock(err) + } - return state.MakeBlock(height, processedTxs, evidence, nil, messages.MessagesList, commit, proposerAddr) + return resp.IsOK(), nil } // ValidateBlock validates the given block against the given state. diff --git a/state/execution_test.go b/state/execution_test.go index 8434e06946..99179be68a 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -21,6 +21,7 @@ import ( "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/state/mocks" + sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/test/factory" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" @@ -223,6 +224,36 @@ func TestBeginBlockByzantineValidators(t *testing.T) { assert.Equal(t, abciEv, app.ByzantineValidators) } +func TestProcessProposal(t *testing.T) { + height := 1 + runTest := func(txs types.Txs, expectAccept bool) { + app := &testApp{} + cc := proxy.NewLocalClientCreator(app) + proxyApp := proxy.NewAppConns(cc) + err := proxyApp.Start() + require.Nil(t, err) + defer proxyApp.Stop() //nolint:errcheck // ignore for tests + + state, stateDB, _ := makeState(1, height) + stateStore := sm.NewStore(stateDB) + + blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyApp.Consensus(), + mmock.Mempool{}, sm.EmptyEvidencePool{}) + + block := sf.MakeBlock(state, int64(height), new(types.Commit)) + block.Txs = txs + acceptBlock, err := blockExec.ProcessProposal(block) + require.Nil(t, err) + require.Equal(t, expectAccept, acceptBlock) + } + goodTxs := factory.MakeTenTxs(int64(height)) + runTest(goodTxs, true) + // testApp has process proposal fail if any tx is 0-len + badTxs := factory.MakeTenTxs(int64(height)) + badTxs[0] = types.Tx{} + runTest(badTxs, false) +} + func TestValidateValidatorUpdates(t *testing.T) { pubkey1 := ed25519.GenPrivKey().PubKey() pubkey2 := ed25519.GenPrivKey().PubKey() diff --git a/state/helpers_test.go b/state/helpers_test.go index aa8255f968..2deea7d90b 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -282,3 +282,12 @@ func (app *testApp) Commit() abci.ResponseCommit { func (app *testApp) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQuery) { return } + +func (app *testApp) ProcessProposal(req abci.RequestProcessProposal) abci.ResponseProcessProposal { + for _, tx := range req.BlockData.Txs { + if len(tx) == 0 { + return abci.ResponseProcessProposal{Result: abci.ResponseProcessProposal_REJECT} + } + } + return abci.ResponseProcessProposal{Result: abci.ResponseProcessProposal_ACCEPT} +} diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go index 91bfd0f5be..48e5d1838c 100644 --- a/state/mocks/block_store.go +++ b/state/mocks/block_store.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index 9d6091cde6..5c85354e19 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/state/mocks/store.go b/state/mocks/store.go index 91525b223a..11cf93397f 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/state/test/factory/block.go b/state/test/factory/block.go new file mode 100644 index 0000000000..66abd322fc --- /dev/null +++ b/state/test/factory/block.go @@ -0,0 +1,102 @@ +package factory + +import ( + "time" + + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/test/factory" + + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/tendermint/tendermint/types" +) + +func MakeBlocks(n int, state *sm.State, privVal types.PrivValidator) []*types.Block { + blocks := make([]*types.Block, 0) + + var ( + prevBlock *types.Block + prevBlockMeta *types.BlockMeta + ) + + appHeight := byte(0x01) + for i := 0; i < n; i++ { + height := int64(i + 1) + + block, parts := makeBlockAndPartSet(*state, prevBlock, prevBlockMeta, privVal, height) + blocks = append(blocks, block) + + prevBlock = block + prevBlockMeta = types.NewBlockMeta(block, parts) + + // update state + state.AppHash = []byte{appHeight} + appHeight++ + state.LastBlockHeight = height + } + + return blocks +} + +func MakeBlock(state sm.State, height int64, c *types.Commit) *types.Block { + block, _ := state.MakeBlock( + height, + factory.MakeTenTxs(state.LastBlockHeight), + nil, + nil, + nil, + c, + state.Validators.GetProposer().Address, + ) + return block +} + +func makeBlockAndPartSet(state sm.State, lastBlock *types.Block, lastBlockMeta *types.BlockMeta, + privVal types.PrivValidator, height int64) (*types.Block, *types.PartSet) { + + lastCommit := types.NewCommit(height-1, 0, types.BlockID{}, nil) + if height > 1 { + vote, _ := MakeVote( + privVal, + lastBlock.Header.ChainID, + 1, lastBlock.Header.Height, 0, 2, + lastBlockMeta.BlockID, + time.Now()) + lastCommit = types.NewCommit(vote.Height, vote.Round, + lastBlockMeta.BlockID, []types.CommitSig{vote.CommitSig()}) + } + + return state.MakeBlock(height, []types.Tx{}, nil, nil, nil, lastCommit, state.Validators.GetProposer().Address) +} + +func MakeVote( + val types.PrivValidator, + chainID string, + valIndex int32, + height int64, + round int32, + step int, + blockID types.BlockID, + time time.Time, +) (*types.Vote, error) { + pubKey, err := val.GetPubKey() + if err != nil { + return nil, err + } + v := &types.Vote{ + ValidatorAddress: pubKey.Address(), + ValidatorIndex: valIndex, + Height: height, + Round: round, + Type: tmproto.SignedMsgType(step), + BlockID: blockID, + Timestamp: time, + } + + vpb := v.ToProto() + err = val.SignVote(chainID, vpb) + if err != nil { + panic(err) + } + v.Signature = vpb.Signature + return v, nil +} diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index 47dbb86d2e..1b989a636f 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.10.0. DO NOT EDIT. package mocks diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index f0ee6cc087..8a94786323 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -254,10 +254,14 @@ 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} +func (app *Application) PrepareProposal( + req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { + return abci.ResponsePrepareProposal{BlockData: req.BlockData} +} + +func (app *Application) ProcessProposal( + req abci.RequestProcessProposal) abci.ResponseProcessProposal { + return abci.ResponseProcessProposal{Result: abci.ResponseProcessProposal_ACCEPT} } // validatorUpdates generates a validator set update. diff --git a/test/maverick/consensus/misbehavior.go b/test/maverick/consensus/misbehavior.go index db4f072ea0..1907756f65 100644 --- a/test/maverick/consensus/misbehavior.go +++ b/test/maverick/consensus/misbehavior.go @@ -289,14 +289,14 @@ func defaultReceivePrevote(cs *State, vote *types.Vote) { // Update Valid* if we can. // NOTE: our proposal block may be nil or not what received a polka.. - if len(blockID.Hash) != 0 && (cs.ValidRound < vote.Round) && (vote.Round == cs.Round) { + if len(blockID.Hash) != 0 && (cs.TwoThirdPrevoteRound < vote.Round) && (vote.Round == cs.Round) { if cs.ProposalBlock.HashesTo(blockID.Hash) { cs.Logger.Info( - "Updating ValidBlock because of POL.", "validRound", cs.ValidRound, "POLRound", vote.Round) - cs.ValidRound = vote.Round - cs.ValidBlock = cs.ProposalBlock - cs.ValidBlockParts = cs.ProposalBlockParts + "Updating ValidBlock because of POL.", "validRound", cs.TwoThirdPrevoteRound, "POLRound", vote.Round) + cs.TwoThirdPrevoteRound = vote.Round + cs.TwoThirdPrevoteBlock = cs.ProposalBlock + cs.TwoThirdPrevoteBlockParts = cs.ProposalBlockParts } else { cs.Logger.Info( "valid block we do not know about; set ProposalBlock=nil", diff --git a/test/maverick/consensus/state.go b/test/maverick/consensus/state.go index e4ff827932..ecf0e0b4b9 100644 --- a/test/maverick/consensus/state.go +++ b/test/maverick/consensus/state.go @@ -905,9 +905,9 @@ func (cs *State) updateToState(state sm.State) { cs.LockedRound = -1 cs.LockedBlock = nil cs.LockedBlockParts = nil - cs.ValidRound = -1 - cs.ValidBlock = nil - cs.ValidBlockParts = nil + cs.TwoThirdPrevoteRound = -1 + cs.TwoThirdPrevoteBlock = nil + cs.TwoThirdPrevoteBlockParts = nil cs.Votes = cstypes.NewHeightVoteSet(state.ChainID, height, validators) cs.CommitRound = -1 cs.LastValidators = state.LastValidators @@ -1186,9 +1186,9 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { var blockParts *types.PartSet // Decide on block - if cs.ValidBlock != nil { + if cs.TwoThirdPrevoteBlock != nil { // If there is valid block, choose that. - block, blockParts = cs.ValidBlock, cs.ValidBlockParts + block, blockParts = cs.TwoThirdPrevoteBlock, cs.TwoThirdPrevoteBlockParts } else { // Create a new proposal block from state/txs from the mempool. block, blockParts = cs.createProposalBlock() @@ -1205,7 +1205,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { // Make proposal propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} - proposal := types.NewProposal(height, round, cs.ValidRound, propBlockID) + proposal := types.NewProposal(height, round, cs.TwoThirdPrevoteRound, propBlockID) p := proposal.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p); err == nil { proposal.Signature = p.Signature @@ -1714,13 +1714,13 @@ func (cs *State) addProposalBlockPart(msg *tmcon.BlockPartMessage, peerID p2p.ID // Update Valid* if we can. prevotes := cs.Votes.Prevotes(cs.Round) blockID, hasTwoThirds := prevotes.TwoThirdsMajority() - if hasTwoThirds && !blockID.IsZero() && (cs.ValidRound < cs.Round) { + if hasTwoThirds && !blockID.IsZero() && (cs.TwoThirdPrevoteRound < cs.Round) { if cs.ProposalBlock.HashesTo(blockID.Hash) { cs.Logger.Info("Updating valid block to new proposal block", "valid-round", cs.Round, "valid-block-hash", cs.ProposalBlock.Hash()) - cs.ValidRound = cs.Round - cs.ValidBlock = cs.ProposalBlock - cs.ValidBlockParts = cs.ProposalBlockParts + cs.TwoThirdPrevoteRound = cs.Round + cs.TwoThirdPrevoteBlock = cs.ProposalBlock + cs.TwoThirdPrevoteBlockParts = cs.ProposalBlockParts } // TODO: In case there is +2/3 majority in Prevotes set for some // block and cs.ProposalBlock contains different block, either diff --git a/types/tx.go b/types/tx.go index 1254b2eafe..56e7bf0396 100644 --- a/types/tx.go +++ b/types/tx.go @@ -77,6 +77,27 @@ func (txs Txs) SplitIntoShares() NamespacedShares { return shares } +// ToSliceOfBytes converts a Txs to slice of byte slices. +// +// NOTE: This method should become obsolete once Txs is switched to [][]byte. +// ref: #2603 https://github.com/tendermint/tendermint/issues/2603 +func (txs Txs) ToSliceOfBytes() [][]byte { + txBzs := make([][]byte, len(txs)) + for i := 0; i < len(txs); i++ { + txBzs[i] = txs[i] + } + return txBzs +} + +// ToTxs converts a raw slice of byte slices into a Txs type. +func ToTxs(txs [][]byte) Txs { + txBzs := make(Txs, len(txs)) + for i := 0; i < len(txs); i++ { + txBzs[i] = txs[i] + } + return txBzs +} + // TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree. type TxProof struct { RowRoots []tmbytes.HexBytes `json:"root_hash"`