From b64d6e03959a86fe3923ad2f31799ea86061b44d Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Wed, 27 Jul 2022 15:09:02 +0200 Subject: [PATCH] Old PrepareProposal on feature/abci++ppp (#9106) * [Rebased to v0.34.x] abci: PrepareProposal (#6544) * fixed cherry-pick * proto changes * make proto-gen * UT fixes * generate Client directive * mockery * App fixes * Disable 'modified tx' hack * mockery * Make format * Fix lint Co-authored-by: Marko --- abci/client/client.go | 4 + abci/client/grpc_client.go | 15 + abci/client/local_client.go | 19 + abci/client/mocks/client.go | 56 +- abci/client/socket_client.go | 15 + abci/example/kvstore/kvstore.go | 6 + abci/example/kvstore/persistent_kvstore.go | 9 + abci/server/socket_server.go | 3 + abci/types/application.go | 15 +- abci/types/messages.go | 12 + abci/types/types.pb.go | 1104 +++++++++++++---- cmd/tendermint/commands/reindex_event_test.go | 3 +- consensus/mempool_test.go | 5 + evidence/mocks/block_store.go | 1 + mempool/v1/mempool.go | 1 + mempool/v1/mempool_bench_test.go | 1 + proto/tendermint/abci/types.proto | 17 + proxy/app_conn.go | 8 + proxy/mocks/app_conn_consensus.go | 24 + proxy/mocks/app_conn_mempool.go | 1 + state/execution.go | 30 +- state/indexer/mocks/block_indexer.go | 4 +- state/mocks/evidence_pool.go | 1 + state/mocks/store.go | 1 + state/txindex/mocks/tx_indexer.go | 5 +- statesync/mocks/state_provider.go | 1 + test/e2e/app/app.go | 5 + test/fuzz/mempool/v0/fuzz_test.go | 1 + test/fuzz/mempool/v1/fuzz_test.go | 1 + types/tx.go | 22 + 30 files changed, 1159 insertions(+), 231 deletions(-) diff --git a/abci/client/client.go b/abci/client/client.go index f2dd8142c..c72a8157f 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -14,6 +14,8 @@ const ( echoRetryIntervalSeconds = 1 ) +//go:generate mockery --case underscore --name Client + // Client defines an interface for an ABCI client. // All `Async` methods return a `ReqRes` object. // All `Sync` methods return the appropriate protobuf ResponseXxx struct and an error. @@ -33,6 +35,7 @@ type Client interface { QueryAsync(types.RequestQuery) *ReqRes CommitAsync() *ReqRes InitChainAsync(types.RequestInitChain) *ReqRes + PrepareProposalAsync(types.RequestPrepareProposal) *ReqRes BeginBlockAsync(types.RequestBeginBlock) *ReqRes EndBlockAsync(types.RequestEndBlock) *ReqRes ListSnapshotsAsync(types.RequestListSnapshots) *ReqRes @@ -48,6 +51,7 @@ type Client interface { QuerySync(types.RequestQuery) (*types.ResponseQuery, error) CommitSync() (*types.ResponseCommit, error) InitChainSync(types.RequestInitChain) (*types.ResponseInitChain, error) + PrepareProposalSync(types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) BeginBlockSync(types.RequestBeginBlock) (*types.ResponseBeginBlock, error) EndBlockSync(types.RequestEndBlock) (*types.ResponseEndBlock, error) ListSnapshotsSync(types.RequestListSnapshots) (*types.ResponseListSnapshots, error) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index c9e5b2c88..9deb517a4 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -291,6 +291,15 @@ func (cli *grpcClient) ApplySnapshotChunkAsync(params types.RequestApplySnapshot return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_ApplySnapshotChunk{ApplySnapshotChunk: res}}) } +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 cli.finishAsyncCall(req, &types.Response{Value: &types.Response_PrepareProposal{PrepareProposal: res}}) +} + // finishAsyncCall creates a ReqRes for an async call, and immediately populates it // with the response. We don't complete it until it's been ordered via the channel. func (cli *grpcClient) finishAsyncCall(req *types.Request, res *types.Response) *ReqRes { @@ -403,3 +412,9 @@ func (cli *grpcClient) ApplySnapshotChunkSync( reqres := cli.ApplySnapshotChunkAsync(params) return cli.finishSyncCall(reqres).GetApplySnapshotChunk(), cli.Error() } + +func (cli *grpcClient) PrepareProposalSync( + params types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) { + reqres := cli.PrepareProposalAsync(params) + return cli.finishSyncCall(reqres).GetPrepareProposal(), cli.Error() +} diff --git a/abci/client/local_client.go b/abci/client/local_client.go index c93f9a210..23be0630c 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -196,6 +196,17 @@ func (app *localClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotCh ) } +func (app *localClient) PrepareProposalAsync(req types.RequestPrepareProposal) *ReqRes { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.PrepareProposal(req) + return app.callback( + types.ToRequestPrepareProposal(req), + types.ToResponsePrepareProposal(res), + ) +} + //------------------------------------------------------- func (app *localClient) FlushSync() error { @@ -304,6 +315,14 @@ func (app *localClient) ApplySnapshotChunkSync( return &res, nil } +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) callback(req *types.Request, res *types.Response) *ReqRes { diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 1c7519270..6f4bbc18d 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.1.1. DO NOT EDIT. +// Code generated by mockery v2.14.0. DO NOT EDIT. package mocks @@ -575,6 +575,45 @@ func (_m *Client) OnStop() { _m.Called() } +// PrepareProposalAsync provides a mock function with given fields: _a0 +func (_m *Client) PrepareProposalAsync(_a0 types.RequestPrepareProposal) *abcicli.ReqRes { + ret := _m.Called(_a0) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) *abcicli.ReqRes); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + return r0 +} + +// 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.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.ResponsePrepareProposal) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestPrepareProposal) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // QueryAsync provides a mock function with given fields: _a0 func (_m *Client) QueryAsync(_a0 types.RequestQuery) *abcicli.ReqRes { ret := _m.Called(_a0) @@ -695,3 +734,18 @@ func (_m *Client) String() string { return r0 } + +type mockConstructorTestingTNewClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewClient(t mockConstructorTestingTNewClient) *Client { + mock := &Client{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 886698a1c..ea387fcb3 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -275,6 +275,10 @@ func (cli *socketClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotC return cli.queueRequest(types.ToRequestApplySnapshotChunk(req)) } +func (cli *socketClient) PrepareProposalAsync(req types.RequestPrepareProposal) *ReqRes { + return cli.queueRequest(types.ToRequestPrepareProposal(req)) +} + //---------------------------------------- func (cli *socketClient) FlushSync() error { @@ -404,6 +408,15 @@ func (cli *socketClient) ApplySnapshotChunkSync( return reqres.Response.GetApplySnapshotChunk(), cli.Error() } +func (cli *socketClient) PrepareProposalSync(req types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) { + reqres := cli.queueRequest(types.ToRequestPrepareProposal(req)) + if err := cli.FlushSync(); err != nil { + return nil, err + } + + return reqres.Response.GetPrepareProposal(), cli.Error() +} + //---------------------------------------- func (cli *socketClient) queueRequest(req *types.Request) *ReqRes { @@ -477,6 +490,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_PrepareProposal: + _, ok = res.Value.(*types.Response_PrepareProposal) } return ok } diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 8b851ca9a..b76699097 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -170,3 +170,9 @@ func (app *Application) Query(reqQuery types.RequestQuery) (resQuery types.Respo return resQuery } + +func (app *Application) PrepareProposal( + req types.RequestPrepareProposal) types.ResponsePrepareProposal { + return types.ResponsePrepareProposal{ + BlockData: req.BlockData} +} diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index d40983f85..3234301e4 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -166,6 +166,15 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} } +func (app *PersistentKVStoreApplication) PrepareProposal( + req types.RequestPrepareProposal) types.ResponsePrepareProposal { + if len(req.BlockData) > 1 && false { // this breaks TC: TestReactorValidatorSetChanges + req.BlockData[1] = []byte("modified tx") + } + + return types.ResponsePrepareProposal{BlockData: req.BlockData} +} + //--------------------------------------------- // update validators diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index cf3663d2d..c1eab3f24 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -227,6 +227,9 @@ 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) diff --git a/abci/types/application.go b/abci/types/application.go index 5b8270ba6..5e100d171 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -17,7 +17,8 @@ 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 + InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore + PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal 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 @@ -90,6 +91,12 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons return ResponseApplySnapshotChunk{} } +func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal { + return ResponsePrepareProposal{ + BlockData: req.BlockData, + } +} + //------------------------------------------------------- // GRPCApplication is a GRPC wrapper for Application @@ -172,3 +179,9 @@ func (app *GRPCApplication) ApplySnapshotChunk( res := app.app.ApplySnapshotChunk(*req) return &res, nil } + +func (app *GRPCApplication) PrepareProposal( + ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { + res := app.app.PrepareProposal(*req) + return &res, nil +} diff --git a/abci/types/messages.go b/abci/types/messages.go index a5011ffec..e846e0da1 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -153,6 +153,12 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request { } } +func ToRequestPrepareProposal(req RequestPrepareProposal) *Request { + return &Request{ + Value: &Request_PrepareProposal{&req}, + } +} + //---------------------------------------- func ToResponseException(errStr string) *Response { @@ -244,3 +250,9 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response { Value: &Response_ApplySnapshotChunk{&res}, } } + +func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response { + return &Response{ + Value: &Response_PrepareProposal{&res}, + } +} diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 694133ea9..28db201f2 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{30, 0} + return fileDescriptor_252557cfdd89a31a, []int{31, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32, 0} + return fileDescriptor_252557cfdd89a31a, []int{33, 0} } type Request struct { @@ -176,6 +176,7 @@ type Request struct { // *Request_OfferSnapshot // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk + // *Request_PrepareProposal Value isRequest_Value `protobuf_oneof:"value"` } @@ -260,6 +261,9 @@ 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_PrepareProposal struct { + PrepareProposal *RequestPrepareProposal `protobuf:"bytes,16,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} @@ -275,6 +279,7 @@ func (*Request_ListSnapshots) isRequest_Value() {} func (*Request_OfferSnapshot) isRequest_Value() {} func (*Request_LoadSnapshotChunk) isRequest_Value() {} func (*Request_ApplySnapshotChunk) isRequest_Value() {} +func (*Request_PrepareProposal) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -381,6 +386,13 @@ func (m *Request) GetApplySnapshotChunk() *RequestApplySnapshotChunk { return nil } +func (m *Request) GetPrepareProposal() *RequestPrepareProposal { + if x, ok := m.GetValue().(*Request_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -398,6 +410,7 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_OfferSnapshot)(nil), (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), + (*Request_PrepareProposal)(nil), } } @@ -1149,6 +1162,62 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } +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 [][]byte `protobuf:"bytes,1,rep,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 *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 *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() [][]byte { + if m != nil { + return m.BlockData + } + return nil +} + +func (m *RequestPrepareProposal) GetBlockDataSize() int64 { + if m != nil { + return m.BlockDataSize + } + return 0 +} + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -1166,6 +1235,7 @@ type Response struct { // *Response_OfferSnapshot // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk + // *Response_PrepareProposal Value isResponse_Value `protobuf_oneof:"value"` } @@ -1173,7 +1243,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_252557cfdd89a31a, []int{17} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1254,6 +1324,9 @@ 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_PrepareProposal struct { + PrepareProposal *ResponsePrepareProposal `protobuf:"bytes,17,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` +} func (*Response_Exception) isResponse_Value() {} func (*Response_Echo) isResponse_Value() {} @@ -1270,6 +1343,7 @@ func (*Response_ListSnapshots) isResponse_Value() {} func (*Response_OfferSnapshot) isResponse_Value() {} func (*Response_LoadSnapshotChunk) isResponse_Value() {} func (*Response_ApplySnapshotChunk) isResponse_Value() {} +func (*Response_PrepareProposal) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1383,6 +1457,13 @@ func (m *Response) GetApplySnapshotChunk() *ResponseApplySnapshotChunk { return nil } +func (m *Response) GetPrepareProposal() *ResponsePrepareProposal { + if x, ok := m.GetValue().(*Response_PrepareProposal); ok { + return x.PrepareProposal + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1401,6 +1482,7 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_OfferSnapshot)(nil), (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), + (*Response_PrepareProposal)(nil), } } @@ -1413,7 +1495,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1457,7 +1539,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1500,7 +1582,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1541,7 +1623,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1605,6 +1687,68 @@ func (m *ResponseInfo) GetLastBlockAppHash() []byte { return nil } +// nondeterministic +type ResponseSetOption struct { + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + // bytes data = 2; + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` +} + +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} +} +func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseSetOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseSetOption.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 *ResponseSetOption) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseSetOption.Merge(m, src) +} +func (m *ResponseSetOption) XXX_Size() int { + return m.Size() +} +func (m *ResponseSetOption) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseSetOption.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseSetOption proto.InternalMessageInfo + +func (m *ResponseSetOption) GetCode() uint32 { + if m != nil { + return m.Code + } + return 0 +} + +func (m *ResponseSetOption) GetLog() string { + if m != nil { + return m.Log + } + return "" +} + +func (m *ResponseSetOption) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + type ResponseInitChain struct { ConsensusParams *ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` Validators []ValidatorUpdate `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators"` @@ -1615,7 +1759,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{22} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1682,7 +1826,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{23} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1782,7 +1926,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{24} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1838,7 +1982,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{25} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1959,7 +2103,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{26} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2054,7 +2198,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{27} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2114,7 +2258,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{28} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2165,7 +2309,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{29} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2209,7 +2353,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{30} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2253,7 +2397,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{31} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2299,7 +2443,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{32} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2349,6 +2493,50 @@ func (m *ResponseApplySnapshotChunk) GetRejectSenders() []string { return nil } +type ResponsePrepareProposal struct { + BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` +} + +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{34} +} +func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponsePrepareProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponsePrepareProposal.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 *ResponsePrepareProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponsePrepareProposal.Merge(m, src) +} +func (m *ResponsePrepareProposal) XXX_Size() int { + return m.Size() +} +func (m *ResponsePrepareProposal) XXX_DiscardUnknown() { + xxx_messageInfo_ResponsePrepareProposal.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponsePrepareProposal proto.InternalMessageInfo + +func (m *ResponsePrepareProposal) GetBlockData() [][]byte { + if m != nil { + return m.BlockData + } + return nil +} + // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app type ConsensusParams struct { @@ -2362,7 +2550,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{33} + return fileDescriptor_252557cfdd89a31a, []int{35} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2431,7 +2619,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{34} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2483,7 +2671,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{35} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2538,7 +2726,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{36} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2592,7 +2780,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{37} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2656,7 +2844,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{38} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2724,7 +2912,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{39} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2777,7 +2965,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{40} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2830,7 +3018,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{41} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2891,7 +3079,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{42} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2967,7 +3155,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{43} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3051,6 +3239,7 @@ func init() { proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.RequestOfferSnapshot") proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") + proto.RegisterType((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") @@ -3067,6 +3256,7 @@ func init() { proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.ResponseOfferSnapshot") proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") @@ -3083,181 +3273,188 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2782 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0xf5, 0xd7, 0x5b, 0xea, 0x2b, 0xeb, 0xe1, 0x1a, 0x33, 0x08, 0x31, 0xd8, 0x43, 0x73, 0xe0, 0x0f, - 0x03, 0xd8, 0x7f, 0xcc, 0x81, 0x40, 0x20, 0x01, 0x4b, 0x68, 0x90, 0xb1, 0xb1, 0x9c, 0xb6, 0x66, - 0xc8, 0x8b, 0x69, 0x5a, 0xea, 0xb2, 0xd4, 0x8c, 0xd4, 0xdd, 0x74, 0x97, 0x8c, 0xc5, 0x32, 0x8f, - 0x0d, 0xd9, 0x90, 0x5d, 0x36, 0x7c, 0x8f, 0xac, 0xb2, 0xc9, 0x86, 0x73, 0xb2, 0x61, 0x99, 0x45, - 0x0e, 0xc9, 0x99, 0x39, 0xd9, 0xe4, 0x0b, 0x64, 0x95, 0x93, 0x9c, 0x7a, 0xf4, 0x4b, 0x52, 0x4b, - 0x32, 0x64, 0x97, 0x5d, 0xd5, 0xed, 0x7b, 0x6f, 0xab, 0xaa, 0xeb, 0xfe, 0xee, 0xef, 0xde, 0x12, - 0x3c, 0x4e, 0xb0, 0xa9, 0x63, 0x67, 0x6c, 0x98, 0x64, 0x4f, 0xeb, 0xf5, 0x8d, 0x3d, 0x32, 0xb5, - 0xb1, 0xbb, 0x6b, 0x3b, 0x16, 0xb1, 0x50, 0x25, 0x78, 0xb8, 0x4b, 0x1f, 0xd6, 0x9f, 0x08, 0x69, - 0xf7, 0x9d, 0xa9, 0x4d, 0xac, 0x3d, 0xdb, 0xb1, 0xac, 0x73, 0xae, 0x5f, 0xbf, 0x11, 0x7a, 0xcc, - 0xfc, 0x84, 0xbd, 0x45, 0x9e, 0x0a, 0xe3, 0xfb, 0x78, 0xea, 0x3d, 0x7d, 0x62, 0xce, 0xd6, 0xd6, - 0x1c, 0x6d, 0xec, 0x3d, 0xde, 0x19, 0x58, 0xd6, 0x60, 0x84, 0xf7, 0xd8, 0xac, 0x37, 0x39, 0xdf, - 0x23, 0xc6, 0x18, 0xbb, 0x44, 0x1b, 0xdb, 0x42, 0x61, 0x6b, 0x60, 0x0d, 0x2c, 0x36, 0xdc, 0xa3, - 0x23, 0x2e, 0x95, 0x7f, 0x5b, 0x80, 0xbc, 0x82, 0x3f, 0x99, 0x60, 0x97, 0xa0, 0x7d, 0xc8, 0xe0, - 0xfe, 0xd0, 0xaa, 0x25, 0x6f, 0x26, 0x9f, 0x2d, 0xee, 0xdf, 0xd8, 0x9d, 0x59, 0xdc, 0xae, 0xd0, - 0x6b, 0xf5, 0x87, 0x56, 0x3b, 0xa1, 0x30, 0x5d, 0xf4, 0x0a, 0x64, 0xcf, 0x47, 0x13, 0x77, 0x58, - 0x4b, 0x31, 0xa3, 0x27, 0xe2, 0x8c, 0x6e, 0x53, 0xa5, 0x76, 0x42, 0xe1, 0xda, 0xf4, 0x55, 0x86, - 0x79, 0x6e, 0xd5, 0xd2, 0xcb, 0x5f, 0x75, 0x68, 0x9e, 0xb3, 0x57, 0x51, 0x5d, 0xd4, 0x00, 0x70, - 0x31, 0x51, 0x2d, 0x9b, 0x18, 0x96, 0x59, 0xcb, 0x30, 0xcb, 0x27, 0xe3, 0x2c, 0xcf, 0x30, 0xe9, - 0x30, 0xc5, 0x76, 0x42, 0x91, 0x5c, 0x6f, 0x42, 0x7d, 0x18, 0xa6, 0x41, 0xd4, 0xfe, 0x50, 0x33, - 0xcc, 0x5a, 0x76, 0xb9, 0x8f, 0x43, 0xd3, 0x20, 0x4d, 0xaa, 0x48, 0x7d, 0x18, 0xde, 0x84, 0x2e, - 0xf9, 0x93, 0x09, 0x76, 0xa6, 0xb5, 0xdc, 0xf2, 0x25, 0xff, 0x88, 0x2a, 0xd1, 0x25, 0x33, 0x6d, - 0xd4, 0x82, 0x62, 0x0f, 0x0f, 0x0c, 0x53, 0xed, 0x8d, 0xac, 0xfe, 0xfd, 0x5a, 0x9e, 0x19, 0xcb, - 0x71, 0xc6, 0x0d, 0xaa, 0xda, 0xa0, 0x9a, 0xed, 0x84, 0x02, 0x3d, 0x7f, 0x86, 0xde, 0x84, 0x42, - 0x7f, 0x88, 0xfb, 0xf7, 0x55, 0x72, 0x59, 0x2b, 0x30, 0x1f, 0x3b, 0x71, 0x3e, 0x9a, 0x54, 0xaf, - 0x7b, 0xd9, 0x4e, 0x28, 0xf9, 0x3e, 0x1f, 0xd2, 0xf5, 0xeb, 0x78, 0x64, 0x5c, 0x60, 0x87, 0xda, - 0x4b, 0xcb, 0xd7, 0xff, 0x0e, 0xd7, 0x64, 0x1e, 0x24, 0xdd, 0x9b, 0xa0, 0xb7, 0x40, 0xc2, 0xa6, - 0x2e, 0x96, 0x01, 0xcc, 0xc5, 0xcd, 0xd8, 0xb3, 0x62, 0xea, 0xde, 0x22, 0x0a, 0x58, 0x8c, 0xd1, - 0x6b, 0x90, 0xeb, 0x5b, 0xe3, 0xb1, 0x41, 0x6a, 0x45, 0x66, 0xbd, 0x1d, 0xbb, 0x00, 0xa6, 0xd5, - 0x4e, 0x28, 0x42, 0x1f, 0x9d, 0x40, 0x79, 0x64, 0xb8, 0x44, 0x75, 0x4d, 0xcd, 0x76, 0x87, 0x16, - 0x71, 0x6b, 0x1b, 0xcc, 0xc3, 0xd3, 0x71, 0x1e, 0x8e, 0x0d, 0x97, 0x9c, 0x79, 0xca, 0xed, 0x84, - 0x52, 0x1a, 0x85, 0x05, 0xd4, 0x9f, 0x75, 0x7e, 0x8e, 0x1d, 0xdf, 0x61, 0xad, 0xb4, 0xdc, 0x5f, - 0x87, 0x6a, 0x7b, 0xf6, 0xd4, 0x9f, 0x15, 0x16, 0xa0, 0x9f, 0xc1, 0xb5, 0x91, 0xa5, 0xe9, 0xbe, - 0x3b, 0xb5, 0x3f, 0x9c, 0x98, 0xf7, 0x6b, 0x65, 0xe6, 0xf4, 0xb9, 0xd8, 0x1f, 0x69, 0x69, 0xba, - 0xe7, 0xa2, 0x49, 0x0d, 0xda, 0x09, 0x65, 0x73, 0x34, 0x2b, 0x44, 0xf7, 0x60, 0x4b, 0xb3, 0xed, - 0xd1, 0x74, 0xd6, 0x7b, 0x85, 0x79, 0xbf, 0x15, 0xe7, 0xfd, 0x80, 0xda, 0xcc, 0xba, 0x47, 0xda, - 0x9c, 0xb4, 0x91, 0x87, 0xec, 0x85, 0x36, 0x9a, 0x60, 0xf9, 0xff, 0xa0, 0x18, 0x0a, 0x75, 0x54, - 0x83, 0xfc, 0x18, 0xbb, 0xae, 0x36, 0xc0, 0x0c, 0x19, 0x24, 0xc5, 0x9b, 0xca, 0x65, 0xd8, 0x08, - 0x87, 0xb7, 0x3c, 0xf6, 0x0d, 0x69, 0xe0, 0x52, 0xc3, 0x0b, 0xec, 0xb8, 0x34, 0x5a, 0x85, 0xa1, - 0x98, 0xa2, 0xa7, 0xa0, 0xc4, 0x8e, 0x8f, 0xea, 0x3d, 0xa7, 0xe8, 0x91, 0x51, 0x36, 0x98, 0xf0, - 0xae, 0x50, 0xda, 0x81, 0xa2, 0xbd, 0x6f, 0xfb, 0x2a, 0x69, 0xa6, 0x02, 0xf6, 0xbe, 0x2d, 0x14, - 0xe4, 0xef, 0x43, 0x75, 0x36, 0xda, 0x51, 0x15, 0xd2, 0xf7, 0xf1, 0x54, 0xbc, 0x8f, 0x0e, 0xd1, - 0x96, 0x58, 0x16, 0x7b, 0x87, 0xa4, 0x88, 0x35, 0xfe, 0x29, 0xe5, 0x1b, 0xfb, 0x61, 0x8e, 0x5e, - 0x83, 0x0c, 0x45, 0x4d, 0x01, 0x80, 0xf5, 0x5d, 0x0e, 0xa9, 0xbb, 0x1e, 0xa4, 0xee, 0x76, 0x3d, - 0x48, 0x6d, 0x14, 0xbe, 0xfa, 0x66, 0x27, 0xf1, 0xc5, 0x5f, 0x77, 0x92, 0x0a, 0xb3, 0x40, 0x8f, - 0xd1, 0xa8, 0xd4, 0x0c, 0x53, 0x35, 0x74, 0xf1, 0x9e, 0x3c, 0x9b, 0x1f, 0xea, 0xe8, 0x08, 0xaa, - 0x7d, 0xcb, 0x74, 0xb1, 0xe9, 0x4e, 0x5c, 0x95, 0x43, 0xb6, 0x80, 0xbd, 0xf9, 0xa8, 0x69, 0x7a, - 0x8a, 0xa7, 0x4c, 0x4f, 0xa9, 0xf4, 0xa3, 0x02, 0x74, 0x1b, 0xe0, 0x42, 0x1b, 0x19, 0xba, 0x46, - 0x2c, 0xc7, 0xad, 0x65, 0x6e, 0xa6, 0x17, 0xba, 0xb9, 0xeb, 0xa9, 0xdc, 0xb1, 0x75, 0x8d, 0xe0, - 0x46, 0x86, 0xfe, 0x5a, 0x25, 0x64, 0x89, 0x9e, 0x81, 0x8a, 0x66, 0xdb, 0xaa, 0x4b, 0x34, 0x82, - 0xd5, 0xde, 0x94, 0x60, 0x97, 0x81, 0xe1, 0x86, 0x52, 0xd2, 0x6c, 0xfb, 0x8c, 0x4a, 0x1b, 0x54, - 0x88, 0x9e, 0x86, 0x32, 0x05, 0x3e, 0x43, 0x1b, 0xa9, 0x43, 0x6c, 0x0c, 0x86, 0x84, 0x81, 0x5e, - 0x5a, 0x29, 0x09, 0x69, 0x9b, 0x09, 0x65, 0xdd, 0x3f, 0x08, 0x0c, 0xf4, 0x10, 0x82, 0x8c, 0xae, - 0x11, 0x8d, 0x6d, 0xe4, 0x86, 0xc2, 0xc6, 0x54, 0x66, 0x6b, 0x64, 0x28, 0xb6, 0x87, 0x8d, 0xd1, - 0x75, 0xc8, 0x09, 0xb7, 0x69, 0xe6, 0x56, 0xcc, 0xe8, 0x37, 0xb3, 0x1d, 0xeb, 0x02, 0x33, 0x94, - 0x2f, 0x28, 0x7c, 0x22, 0xff, 0x2a, 0x05, 0x9b, 0x73, 0xf0, 0x48, 0xfd, 0x0e, 0x35, 0x77, 0xe8, - 0xbd, 0x8b, 0x8e, 0xd1, 0xab, 0xd4, 0xaf, 0xa6, 0x63, 0x47, 0xa4, 0xa5, 0x5a, 0x78, 0x8b, 0x78, - 0xca, 0x6d, 0xb3, 0xe7, 0x62, 0x6b, 0x84, 0x36, 0xea, 0x40, 0x75, 0xa4, 0xb9, 0x44, 0xe5, 0x70, - 0xa3, 0x86, 0x52, 0xd4, 0x3c, 0xc8, 0x1e, 0x6b, 0x1e, 0x40, 0xd1, 0xc3, 0x2e, 0x1c, 0x95, 0x47, - 0x11, 0x29, 0x52, 0x60, 0xab, 0x37, 0xfd, 0x4c, 0x33, 0x89, 0x61, 0x62, 0x75, 0xee, 0xcb, 0x3d, - 0x36, 0xe7, 0xb4, 0x75, 0x61, 0xe8, 0xd8, 0xec, 0x7b, 0x9f, 0xec, 0x9a, 0x6f, 0xec, 0x7f, 0x52, - 0x57, 0x56, 0xa0, 0x1c, 0x05, 0x78, 0x54, 0x86, 0x14, 0xb9, 0x14, 0x1b, 0x90, 0x22, 0x97, 0xe8, - 0xff, 0x21, 0x43, 0x17, 0xc9, 0x16, 0x5f, 0x5e, 0x90, 0x5d, 0x85, 0x5d, 0x77, 0x6a, 0x63, 0x85, - 0x69, 0xca, 0xb2, 0x1f, 0x0d, 0x3e, 0xe8, 0xcf, 0x7a, 0x95, 0x9f, 0x83, 0xca, 0x0c, 0xaa, 0x87, - 0xbe, 0x5f, 0x32, 0xfc, 0xfd, 0xe4, 0x0a, 0x94, 0x22, 0x10, 0x2e, 0x5f, 0x87, 0xad, 0x45, 0x88, - 0x2c, 0x0f, 0x7d, 0x79, 0x04, 0x59, 0xd1, 0x2b, 0x50, 0xf0, 0x21, 0x99, 0x47, 0xe3, 0xfc, 0x5e, - 0x79, 0xca, 0x8a, 0xaf, 0x4a, 0xc3, 0x90, 0x1e, 0x6b, 0x76, 0x1e, 0x52, 0xec, 0x87, 0xe7, 0x35, - 0xdb, 0x6e, 0x6b, 0xee, 0x50, 0xfe, 0x08, 0x6a, 0x71, 0x70, 0x3b, 0xb3, 0x8c, 0x8c, 0x7f, 0x0c, - 0xaf, 0x43, 0xee, 0xdc, 0x72, 0xc6, 0x1a, 0x61, 0xce, 0x4a, 0x8a, 0x98, 0xd1, 0xe3, 0xc9, 0xa1, - 0x37, 0xcd, 0xc4, 0x7c, 0x22, 0xab, 0xf0, 0x58, 0x2c, 0xe4, 0x52, 0x13, 0xc3, 0xd4, 0x31, 0xdf, - 0xcf, 0x92, 0xc2, 0x27, 0x81, 0x23, 0xfe, 0x63, 0xf9, 0x84, 0xbe, 0xd6, 0x65, 0x6b, 0x65, 0xfe, - 0x25, 0x45, 0xcc, 0xe4, 0xbf, 0x17, 0xa0, 0xa0, 0x60, 0xd7, 0xa6, 0x98, 0x80, 0x1a, 0x20, 0xe1, - 0xcb, 0x3e, 0xe6, 0x64, 0x28, 0x19, 0x4b, 0x26, 0xb8, 0x76, 0xcb, 0xd3, 0xa4, 0x99, 0xdc, 0x37, - 0x43, 0x2f, 0x0b, 0xc2, 0x17, 0xcf, 0xdd, 0x84, 0x79, 0x98, 0xf1, 0xbd, 0xea, 0x31, 0xbe, 0x74, - 0x6c, 0xf2, 0xe6, 0x56, 0x33, 0x94, 0xef, 0x65, 0x41, 0xf9, 0x32, 0x2b, 0x5e, 0x16, 0xe1, 0x7c, - 0xcd, 0x08, 0xe7, 0xcb, 0xae, 0x58, 0x66, 0x0c, 0xe9, 0x6b, 0x46, 0x48, 0x5f, 0x6e, 0x85, 0x93, - 0x18, 0xd6, 0xf7, 0xaa, 0xc7, 0xfa, 0xf2, 0x2b, 0x96, 0x3d, 0x43, 0xfb, 0x6e, 0x47, 0x69, 0x1f, - 0xa7, 0x6c, 0x4f, 0xc5, 0x5a, 0xc7, 0xf2, 0xbe, 0x1f, 0x84, 0x78, 0x9f, 0x14, 0x4b, 0xba, 0xb8, - 0x93, 0x05, 0xc4, 0xaf, 0x19, 0x21, 0x7e, 0xb0, 0x62, 0x0f, 0x62, 0x98, 0xdf, 0xdb, 0x61, 0xe6, - 0x57, 0x8c, 0x25, 0x8f, 0xe2, 0xd0, 0x2c, 0xa2, 0x7e, 0xaf, 0xfb, 0xd4, 0x6f, 0x23, 0x96, 0xbb, - 0x8a, 0x35, 0xcc, 0x72, 0xbf, 0xce, 0x1c, 0xf7, 0xe3, 0x5c, 0xed, 0x99, 0x58, 0x17, 0x2b, 0xc8, - 0x5f, 0x67, 0x8e, 0xfc, 0x95, 0x57, 0x38, 0x5c, 0xc1, 0xfe, 0x7e, 0xbe, 0x98, 0xfd, 0xc5, 0xf3, - 0x33, 0xf1, 0x33, 0xd7, 0xa3, 0x7f, 0x6a, 0x0c, 0xfd, 0xab, 0x32, 0xf7, 0xcf, 0xc7, 0xba, 0xbf, - 0x3a, 0xff, 0x7b, 0x8e, 0xa6, 0xd9, 0x19, 0xe0, 0xa0, 0x50, 0x85, 0x1d, 0xc7, 0x72, 0x04, 0xb5, - 0xe2, 0x13, 0xf9, 0x59, 0x9a, 0xf8, 0x03, 0x90, 0x58, 0xc2, 0x15, 0x59, 0x4a, 0x08, 0x01, 0x83, - 0xfc, 0xfb, 0x64, 0x60, 0xcb, 0x72, 0x65, 0x98, 0x34, 0x48, 0x82, 0x34, 0x84, 0x28, 0x64, 0x2a, - 0x4a, 0x21, 0x77, 0xa0, 0x48, 0xa1, 0x7e, 0x86, 0x1d, 0x6a, 0xb6, 0xc7, 0x0e, 0xd1, 0x2d, 0xd8, - 0x64, 0xb9, 0x9c, 0x13, 0x4d, 0x81, 0xef, 0x19, 0x96, 0xa6, 0x2a, 0xf4, 0x01, 0x3f, 0x9c, 0x1c, - 0xe8, 0x5f, 0x84, 0x6b, 0x21, 0x5d, 0x3f, 0x85, 0x70, 0x4a, 0x54, 0xf5, 0xb5, 0x0f, 0x44, 0x2e, - 0x79, 0x3f, 0xd8, 0xa0, 0x80, 0x79, 0x22, 0xc8, 0xf4, 0x2d, 0x1d, 0x0b, 0x80, 0x67, 0x63, 0xca, - 0x46, 0x47, 0xd6, 0x40, 0xc0, 0x38, 0x1d, 0x52, 0x2d, 0x1f, 0x05, 0x25, 0x0e, 0x72, 0xf2, 0x1f, - 0x93, 0x81, 0xbf, 0x80, 0x8c, 0x2e, 0xe2, 0x8d, 0xc9, 0xff, 0x0e, 0x6f, 0x4c, 0x7d, 0x6b, 0xde, - 0x18, 0x4e, 0xb0, 0xe9, 0x68, 0x82, 0xfd, 0x67, 0x32, 0xf8, 0xc2, 0x3e, 0x0b, 0xfc, 0x76, 0x3b, - 0x12, 0x64, 0xcb, 0x2c, 0xfb, 0x5e, 0x22, 0x5b, 0x0a, 0x6e, 0x9f, 0x63, 0xef, 0x8d, 0x72, 0xfb, - 0x3c, 0xcf, 0x9f, 0x6c, 0x82, 0x5e, 0x03, 0x89, 0x35, 0x5d, 0x54, 0xcb, 0x76, 0x05, 0xe0, 0x3e, - 0x1e, 0x5e, 0x2b, 0xef, 0xad, 0xec, 0x9e, 0x52, 0x9d, 0x8e, 0xed, 0x2a, 0x05, 0x5b, 0x8c, 0x42, - 0x44, 0x40, 0x8a, 0xf0, 0xd1, 0x1b, 0x20, 0xd1, 0x5f, 0xef, 0xda, 0x5a, 0x1f, 0x33, 0xf0, 0x94, - 0x94, 0x40, 0x20, 0xdf, 0x03, 0x34, 0x0f, 0xdf, 0xa8, 0x0d, 0x39, 0x7c, 0x81, 0x4d, 0x42, 0xbf, - 0x1a, 0xdd, 0xee, 0xeb, 0x0b, 0xc8, 0x1e, 0x36, 0x49, 0xa3, 0x46, 0x37, 0xf9, 0x1f, 0xdf, 0xec, - 0x54, 0xb9, 0xf6, 0x0b, 0xd6, 0xd8, 0x20, 0x78, 0x6c, 0x93, 0xa9, 0x22, 0xec, 0xe5, 0xbf, 0xa4, - 0x28, 0xf3, 0x8a, 0x40, 0xfb, 0xc2, 0xbd, 0xf5, 0x02, 0x28, 0x15, 0x62, 0xdd, 0xeb, 0xed, 0xf7, - 0x36, 0xc0, 0x40, 0x73, 0xd5, 0x4f, 0x35, 0x93, 0x60, 0x5d, 0x6c, 0x7a, 0x48, 0x82, 0xea, 0x50, - 0xa0, 0xb3, 0x89, 0x8b, 0x75, 0x51, 0x00, 0xf8, 0xf3, 0xd0, 0x3a, 0xf3, 0xdf, 0x6d, 0x9d, 0xd1, - 0x5d, 0x2e, 0xcc, 0xec, 0x72, 0x88, 0x15, 0x49, 0x61, 0x56, 0x44, 0x7f, 0x9b, 0xed, 0x18, 0x96, - 0x63, 0x90, 0x29, 0xfb, 0x34, 0x69, 0xc5, 0x9f, 0xd3, 0x3a, 0x73, 0x8c, 0xc7, 0xb6, 0x65, 0x8d, - 0x54, 0x0e, 0x5e, 0x45, 0x66, 0xba, 0x21, 0x84, 0x2d, 0x86, 0x61, 0xbf, 0x4e, 0x05, 0xe1, 0x17, - 0xb0, 0xdf, 0xff, 0xb9, 0x0d, 0x96, 0x7f, 0xc3, 0x4a, 0xe2, 0x68, 0xf2, 0x46, 0x67, 0xb0, 0xe9, - 0x87, 0xbf, 0x3a, 0x61, 0xb0, 0xe0, 0x1d, 0xe8, 0x75, 0xf1, 0xa3, 0x7a, 0x11, 0x15, 0xbb, 0xe8, - 0xc7, 0xf0, 0xe8, 0x0c, 0xb4, 0xf9, 0xae, 0x53, 0x6b, 0x22, 0xdc, 0x23, 0x51, 0x84, 0xf3, 0x3c, - 0x07, 0x7b, 0x95, 0xfe, 0x8e, 0x41, 0x77, 0x48, 0xab, 0xac, 0x30, 0x15, 0x59, 0xf8, 0xf5, 0x9f, - 0x82, 0x92, 0x83, 0x09, 0x2d, 0xfc, 0x23, 0x75, 0xec, 0x06, 0x17, 0x8a, 0xea, 0xf8, 0x14, 0x1e, - 0x59, 0x48, 0x49, 0xd0, 0xf7, 0x40, 0x0a, 0xd8, 0x4c, 0x32, 0xa6, 0x24, 0xf4, 0xcb, 0x9c, 0x40, - 0x57, 0xfe, 0x43, 0x32, 0x70, 0x19, 0x2d, 0x9c, 0x5a, 0x90, 0x73, 0xb0, 0x3b, 0x19, 0xf1, 0x52, - 0xa6, 0xbc, 0xff, 0xe2, 0x7a, 0x64, 0x86, 0x4a, 0x27, 0x23, 0xa2, 0x08, 0x63, 0xf9, 0x1e, 0xe4, - 0xb8, 0x04, 0x15, 0x21, 0x7f, 0xe7, 0xe4, 0xe8, 0xa4, 0xf3, 0xc1, 0x49, 0x35, 0x81, 0x00, 0x72, - 0x07, 0xcd, 0x66, 0xeb, 0xb4, 0x5b, 0x4d, 0x22, 0x09, 0xb2, 0x07, 0x8d, 0x8e, 0xd2, 0xad, 0xa6, - 0xa8, 0x58, 0x69, 0xbd, 0xd7, 0x6a, 0x76, 0xab, 0x69, 0xb4, 0x09, 0x25, 0x3e, 0x56, 0x6f, 0x77, - 0x94, 0xf7, 0x0f, 0xba, 0xd5, 0x4c, 0x48, 0x74, 0xd6, 0x3a, 0x79, 0xa7, 0xa5, 0x54, 0xb3, 0xf2, - 0x4b, 0xb4, 0x56, 0x8a, 0xa1, 0x3f, 0x41, 0x55, 0x94, 0x0c, 0x55, 0x45, 0xf2, 0xef, 0x52, 0x50, - 0x8f, 0xe7, 0x34, 0xe8, 0xbd, 0x99, 0x85, 0xef, 0x5f, 0x81, 0x10, 0xcd, 0xac, 0x1e, 0x3d, 0x0d, - 0x65, 0x07, 0x9f, 0x63, 0xd2, 0x1f, 0x72, 0x8e, 0xc5, 0x33, 0x66, 0x49, 0x29, 0x09, 0x29, 0x33, - 0x72, 0xb9, 0xda, 0xc7, 0xb8, 0x4f, 0x54, 0x0e, 0x45, 0xfc, 0xd0, 0x49, 0x54, 0x8d, 0x4a, 0xcf, - 0xb8, 0x50, 0xfe, 0xe8, 0x4a, 0x7b, 0x29, 0x41, 0x56, 0x69, 0x75, 0x95, 0x9f, 0x54, 0xd3, 0x08, - 0x41, 0x99, 0x0d, 0xd5, 0xb3, 0x93, 0x83, 0xd3, 0xb3, 0x76, 0x87, 0xee, 0xe5, 0x35, 0xa8, 0x78, - 0x7b, 0xe9, 0x09, 0xb3, 0xf2, 0xbf, 0x93, 0x50, 0x99, 0x09, 0x10, 0xb4, 0x0f, 0x59, 0xce, 0xd3, - 0xe3, 0xba, 0xf9, 0x2c, 0xbe, 0x45, 0x34, 0x71, 0x55, 0xf4, 0x26, 0x14, 0xb0, 0x68, 0x40, 0x2c, - 0x0a, 0x44, 0xde, 0x38, 0xf1, 0x5a, 0x14, 0xc2, 0xd4, 0xb7, 0x40, 0x6f, 0x81, 0xe4, 0x47, 0xba, - 0x28, 0x0e, 0x9f, 0x9c, 0x37, 0xf7, 0x31, 0x42, 0xd8, 0x07, 0x36, 0xe8, 0xf5, 0x80, 0xec, 0x65, - 0xe6, 0xab, 0x03, 0x61, 0xce, 0x15, 0x84, 0xb1, 0xa7, 0x2f, 0x37, 0xa1, 0x18, 0x5a, 0x0f, 0x7a, - 0x1c, 0xa4, 0xb1, 0x76, 0x29, 0x1a, 0x5b, 0xbc, 0x35, 0x51, 0x18, 0x6b, 0x97, 0xbc, 0xa7, 0xf5, - 0x28, 0xe4, 0xe9, 0xc3, 0x81, 0xc6, 0xd1, 0x26, 0xad, 0xe4, 0xc6, 0xda, 0xe5, 0xbb, 0x9a, 0x2b, - 0x7f, 0x08, 0xe5, 0x68, 0x53, 0x87, 0x9e, 0x44, 0xc7, 0x9a, 0x98, 0x3a, 0xf3, 0x91, 0x55, 0xf8, - 0x04, 0xbd, 0x02, 0xd9, 0x0b, 0x8b, 0x83, 0xd5, 0xe2, 0x90, 0xbd, 0x6b, 0x11, 0x1c, 0x6a, 0x0a, - 0x71, 0x6d, 0xf9, 0x33, 0xc8, 0x32, 0xf0, 0xa1, 0x40, 0xc2, 0xda, 0x33, 0x82, 0xe8, 0xd2, 0x31, - 0xfa, 0x10, 0x40, 0x23, 0xc4, 0x31, 0x7a, 0x93, 0xc0, 0xf1, 0xce, 0x62, 0xf0, 0x3a, 0xf0, 0xf4, - 0x1a, 0x37, 0x04, 0x8a, 0x6d, 0x05, 0xa6, 0x21, 0x24, 0x0b, 0x39, 0x94, 0x4f, 0xa0, 0x1c, 0xb5, - 0x0d, 0x37, 0x4a, 0x37, 0x16, 0x34, 0x4a, 0x7d, 0x32, 0xe5, 0x53, 0xb1, 0x34, 0x6f, 0xc5, 0xb1, - 0x89, 0xfc, 0x79, 0x12, 0x0a, 0xdd, 0x4b, 0x71, 0xac, 0x63, 0xba, 0x40, 0x81, 0x69, 0x2a, 0xdc, - 0xf3, 0xe0, 0x6d, 0xa5, 0xb4, 0xdf, 0xac, 0x7a, 0xdb, 0x0f, 0xdc, 0xcc, 0xba, 0x55, 0xa9, 0xd7, - 0xb5, 0x13, 0x60, 0xf5, 0x06, 0x48, 0xfe, 0xa9, 0xa2, 0x15, 0x83, 0xa6, 0xeb, 0x0e, 0x76, 0x5d, - 0xb1, 0x36, 0x6f, 0xca, 0x9a, 0x8a, 0xd6, 0xa7, 0xa2, 0xab, 0x92, 0x56, 0xf8, 0x44, 0xd6, 0xa1, - 0x32, 0x93, 0xb6, 0xd0, 0x1b, 0x90, 0xb7, 0x27, 0x3d, 0xd5, 0xdb, 0x9e, 0x99, 0xe0, 0xf1, 0xd8, - 0xe3, 0xa4, 0x37, 0x32, 0xfa, 0x47, 0x78, 0xea, 0xfd, 0x18, 0x7b, 0xd2, 0x3b, 0xe2, 0xbb, 0xc8, - 0xdf, 0x92, 0x0a, 0xbf, 0xe5, 0x02, 0x0a, 0xde, 0xa1, 0x40, 0x3f, 0x0c, 0xc7, 0x89, 0xd7, 0x6a, - 0x8e, 0x4d, 0xa5, 0xc2, 0x7d, 0x28, 0x4c, 0x6e, 0xc1, 0xa6, 0x6b, 0x0c, 0x4c, 0xac, 0xab, 0x41, - 0xcd, 0xc2, 0xde, 0x56, 0x50, 0x2a, 0xfc, 0xc1, 0xb1, 0x57, 0xb0, 0xc8, 0xff, 0x4a, 0x42, 0xc1, - 0x0b, 0x58, 0xf4, 0x52, 0xe8, 0xdc, 0x95, 0x17, 0x74, 0x60, 0x3c, 0xc5, 0xa0, 0x2f, 0x18, 0xfd, - 0xad, 0xa9, 0xab, 0xff, 0xd6, 0xb8, 0x06, 0xaf, 0xd7, 0x69, 0xcf, 0x5c, 0xb9, 0xd3, 0xfe, 0x02, - 0x20, 0x62, 0x11, 0x6d, 0xa4, 0x5e, 0x58, 0xc4, 0x30, 0x07, 0x2a, 0xdf, 0x6c, 0xce, 0xa8, 0xaa, - 0xec, 0xc9, 0x5d, 0xf6, 0xe0, 0x94, 0xed, 0xfb, 0x2f, 0x92, 0x50, 0xf0, 0x73, 0xe3, 0x55, 0xdb, - 0x7c, 0xd7, 0x21, 0x27, 0xe0, 0x9f, 0xf7, 0xf9, 0xc4, 0xcc, 0xef, 0x38, 0x67, 0x42, 0x1d, 0xe7, - 0x3a, 0x14, 0xc6, 0x98, 0x68, 0x8c, 0x20, 0xf0, 0xb2, 0xd1, 0x9f, 0xdf, 0x7a, 0x1d, 0x8a, 0xa1, - 0x8e, 0x2b, 0x8d, 0xbc, 0x93, 0xd6, 0x07, 0xd5, 0x44, 0x3d, 0xff, 0xf9, 0x97, 0x37, 0xd3, 0x27, - 0xf8, 0x53, 0x7a, 0x66, 0x95, 0x56, 0xb3, 0xdd, 0x6a, 0x1e, 0x55, 0x93, 0xf5, 0xe2, 0xe7, 0x5f, - 0xde, 0xcc, 0x2b, 0x98, 0x35, 0x6e, 0x6e, 0xb5, 0x61, 0x23, 0xfc, 0x55, 0xa2, 0x19, 0x04, 0x41, - 0xf9, 0x9d, 0x3b, 0xa7, 0xc7, 0x87, 0xcd, 0x83, 0x6e, 0x4b, 0xbd, 0xdb, 0xe9, 0xb6, 0xaa, 0x49, - 0xf4, 0x28, 0x5c, 0x3b, 0x3e, 0x7c, 0xb7, 0xdd, 0x55, 0x9b, 0xc7, 0x87, 0xad, 0x93, 0xae, 0x7a, - 0xd0, 0xed, 0x1e, 0x34, 0x8f, 0xaa, 0xa9, 0xfd, 0x5f, 0x02, 0x54, 0x0e, 0x1a, 0xcd, 0x43, 0x9a, - 0xfd, 0x8c, 0xbe, 0x26, 0x1a, 0x63, 0x19, 0x56, 0xb5, 0x2f, 0xbd, 0xea, 0xad, 0x2f, 0xef, 0x0b, - 0xa2, 0xdb, 0x90, 0x65, 0x05, 0x3d, 0x5a, 0x7e, 0xf7, 0x5b, 0x5f, 0xd1, 0x28, 0xa4, 0x3f, 0x86, - 0x85, 0xc7, 0xd2, 0xcb, 0xe0, 0xfa, 0xf2, 0xbe, 0x21, 0x52, 0x40, 0x0a, 0x2a, 0xf2, 0xd5, 0x97, - 0xc3, 0xf5, 0x35, 0x7a, 0x89, 0xd4, 0x67, 0x50, 0x16, 0xac, 0xbe, 0x2c, 0xad, 0xaf, 0x01, 0x60, - 0xe8, 0x18, 0xf2, 0x5e, 0x25, 0xb7, 0xea, 0xfa, 0xb6, 0xbe, 0xb2, 0xcf, 0x47, 0x3f, 0x01, 0xaf, - 0xb8, 0x97, 0xdf, 0x45, 0xd7, 0x57, 0x34, 0x2d, 0xd1, 0x21, 0xe4, 0x04, 0xd7, 0x5d, 0x71, 0x25, - 0x5b, 0x5f, 0xd5, 0xb7, 0xa3, 0x9b, 0x16, 0xb4, 0x32, 0x56, 0xdf, 0xb0, 0xd7, 0xd7, 0xe8, 0xc7, - 0xa2, 0x3b, 0x00, 0xa1, 0xfa, 0x7a, 0x8d, 0xab, 0xf3, 0xfa, 0x3a, 0x7d, 0x56, 0xd4, 0x81, 0x82, - 0x5f, 0xee, 0xac, 0xbc, 0xc8, 0xae, 0xaf, 0x6e, 0x78, 0xa2, 0x7b, 0x50, 0x8a, 0xf2, 0xfc, 0xf5, - 0xae, 0xa7, 0xeb, 0x6b, 0x76, 0x32, 0xa9, 0xff, 0x28, 0xe9, 0x5f, 0xef, 0xba, 0xba, 0xbe, 0x66, - 0x63, 0x13, 0x7d, 0x0c, 0x9b, 0xf3, 0xa4, 0x7c, 0xfd, 0xdb, 0xeb, 0xfa, 0x15, 0x5a, 0x9d, 0x68, - 0x0c, 0x68, 0x01, 0x99, 0xbf, 0xc2, 0x65, 0x76, 0xfd, 0x2a, 0x9d, 0xcf, 0x46, 0xeb, 0xab, 0x07, - 0xdb, 0xc9, 0xaf, 0x1f, 0x6c, 0x27, 0xff, 0xf6, 0x60, 0x3b, 0xf9, 0xc5, 0xc3, 0xed, 0xc4, 0xd7, - 0x0f, 0xb7, 0x13, 0x7f, 0x7e, 0xb8, 0x9d, 0xf8, 0xe9, 0xf3, 0x03, 0x83, 0x0c, 0x27, 0xbd, 0xdd, - 0xbe, 0x35, 0xde, 0x0b, 0xff, 0xd3, 0x66, 0xd1, 0xbf, 0x7f, 0x7a, 0x39, 0x96, 0xa8, 0x5e, 0xfe, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x2d, 0x07, 0xd8, 0x1d, 0x24, 0x00, 0x00, + // 2894 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5, + 0x15, 0xd7, 0xb7, 0x34, 0x4f, 0xd6, 0x87, 0x7b, 0x97, 0x5d, 0x31, 0xec, 0xda, 0xcb, 0x50, 0xc0, + 0xb2, 0x80, 0x1d, 0x4c, 0x41, 0x96, 0x40, 0x02, 0x96, 0x56, 0x8b, 0x8c, 0x8d, 0xed, 0x8c, 0xb5, + 0x4b, 0xbe, 0xd8, 0x61, 0xa4, 0x69, 0x4b, 0xc3, 0x4a, 0x33, 0xc3, 0x4c, 0xcb, 0xd8, 0x7b, 0x4c, + 0x25, 0x17, 0x72, 0xe1, 0x98, 0x0b, 0xff, 0x47, 0x0e, 0xa9, 0x5c, 0x72, 0xa1, 0x2a, 0x17, 0x8e, + 0x39, 0xa4, 0x48, 0x8a, 0x3d, 0xa4, 0x92, 0x7f, 0x20, 0xa7, 0x54, 0x52, 0xfd, 0x31, 0x5f, 0x92, + 0xc6, 0x92, 0x21, 0xb7, 0xdc, 0xba, 0x5f, 0xbf, 0xf7, 0x66, 0xba, 0xa7, 0xfb, 0xf7, 0x7e, 0xef, + 0xf5, 0xc0, 0x53, 0x04, 0x5b, 0x06, 0x76, 0xc7, 0xa6, 0x45, 0x36, 0xf5, 0x5e, 0xdf, 0xdc, 0x24, + 0x67, 0x0e, 0xf6, 0x36, 0x1c, 0xd7, 0x26, 0x36, 0xaa, 0x85, 0x83, 0x1b, 0x74, 0x50, 0xbe, 0x1e, + 0xd1, 0xee, 0xbb, 0x67, 0x0e, 0xb1, 0x37, 0x1d, 0xd7, 0xb6, 0x8f, 0xb9, 0xbe, 0x7c, 0x2d, 0x32, + 0xcc, 0xfc, 0x44, 0xbd, 0xc5, 0x46, 0x85, 0xf1, 0x43, 0x7c, 0xe6, 0x8f, 0x5e, 0x9f, 0xb1, 0x75, + 0x74, 0x57, 0x1f, 0xfb, 0xc3, 0xeb, 0x03, 0xdb, 0x1e, 0x8c, 0xf0, 0x26, 0xeb, 0xf5, 0x26, 0xc7, + 0x9b, 0xc4, 0x1c, 0x63, 0x8f, 0xe8, 0x63, 0x47, 0x28, 0x5c, 0x1e, 0xd8, 0x03, 0x9b, 0x35, 0x37, + 0x69, 0x8b, 0x4b, 0x95, 0xbf, 0x97, 0xa0, 0xa8, 0xe2, 0x4f, 0x26, 0xd8, 0x23, 0x68, 0x0b, 0x72, + 0xb8, 0x3f, 0xb4, 0x1b, 0xe9, 0x1b, 0xe9, 0x9b, 0xe5, 0xad, 0x6b, 0x1b, 0x53, 0x93, 0xdb, 0x10, + 0x7a, 0xed, 0xfe, 0xd0, 0xee, 0xa4, 0x54, 0xa6, 0x8b, 0x5e, 0x83, 0xfc, 0xf1, 0x68, 0xe2, 0x0d, + 0x1b, 0x19, 0x66, 0x74, 0x3d, 0xc9, 0xe8, 0x2e, 0x55, 0xea, 0xa4, 0x54, 0xae, 0x4d, 0x1f, 0x65, + 0x5a, 0xc7, 0x76, 0x23, 0x7b, 0xfe, 0xa3, 0x76, 0xac, 0x63, 0xf6, 0x28, 0xaa, 0x8b, 0x9a, 0x00, + 0x1e, 0x26, 0x9a, 0xed, 0x10, 0xd3, 0xb6, 0x1a, 0x39, 0x66, 0xf9, 0x74, 0x92, 0xe5, 0x11, 0x26, + 0x07, 0x4c, 0xb1, 0x93, 0x52, 0x25, 0xcf, 0xef, 0x50, 0x1f, 0xa6, 0x65, 0x12, 0xad, 0x3f, 0xd4, + 0x4d, 0xab, 0x91, 0x3f, 0xdf, 0xc7, 0x8e, 0x65, 0x92, 0x16, 0x55, 0xa4, 0x3e, 0x4c, 0xbf, 0x43, + 0xa7, 0xfc, 0xc9, 0x04, 0xbb, 0x67, 0x8d, 0xc2, 0xf9, 0x53, 0xfe, 0x31, 0x55, 0xa2, 0x53, 0x66, + 0xda, 0xa8, 0x0d, 0xe5, 0x1e, 0x1e, 0x98, 0x96, 0xd6, 0x1b, 0xd9, 0xfd, 0x87, 0x8d, 0x22, 0x33, + 0x56, 0x92, 0x8c, 0x9b, 0x54, 0xb5, 0x49, 0x35, 0x3b, 0x29, 0x15, 0x7a, 0x41, 0x0f, 0xbd, 0x05, + 0xa5, 0xfe, 0x10, 0xf7, 0x1f, 0x6a, 0xe4, 0xb4, 0x51, 0x62, 0x3e, 0xd6, 0x93, 0x7c, 0xb4, 0xa8, + 0x5e, 0xf7, 0xb4, 0x93, 0x52, 0x8b, 0x7d, 0xde, 0xa4, 0xf3, 0x37, 0xf0, 0xc8, 0x3c, 0xc1, 0x2e, + 0xb5, 0x97, 0xce, 0x9f, 0xff, 0x1d, 0xae, 0xc9, 0x3c, 0x48, 0x86, 0xdf, 0x41, 0x6f, 0x83, 0x84, + 0x2d, 0x43, 0x4c, 0x03, 0x98, 0x8b, 0x1b, 0x89, 0x7b, 0xc5, 0x32, 0xfc, 0x49, 0x94, 0xb0, 0x68, + 0xa3, 0xdb, 0x50, 0xe8, 0xdb, 0xe3, 0xb1, 0x49, 0x1a, 0x65, 0x66, 0xbd, 0x96, 0x38, 0x01, 0xa6, + 0xd5, 0x49, 0xa9, 0x42, 0x1f, 0xed, 0x43, 0x75, 0x64, 0x7a, 0x44, 0xf3, 0x2c, 0xdd, 0xf1, 0x86, + 0x36, 0xf1, 0x1a, 0x2b, 0xcc, 0xc3, 0xb3, 0x49, 0x1e, 0xf6, 0x4c, 0x8f, 0x1c, 0xf9, 0xca, 0x9d, + 0x94, 0x5a, 0x19, 0x45, 0x05, 0xd4, 0x9f, 0x7d, 0x7c, 0x8c, 0xdd, 0xc0, 0x61, 0xa3, 0x72, 0xbe, + 0xbf, 0x03, 0xaa, 0xed, 0xdb, 0x53, 0x7f, 0x76, 0x54, 0x80, 0x7e, 0x0e, 0x97, 0x46, 0xb6, 0x6e, + 0x04, 0xee, 0xb4, 0xfe, 0x70, 0x62, 0x3d, 0x6c, 0x54, 0x99, 0xd3, 0x17, 0x12, 0x5f, 0xd2, 0xd6, + 0x0d, 0xdf, 0x45, 0x8b, 0x1a, 0x74, 0x52, 0xea, 0xea, 0x68, 0x5a, 0x88, 0x1e, 0xc0, 0x65, 0xdd, + 0x71, 0x46, 0x67, 0xd3, 0xde, 0x6b, 0xcc, 0xfb, 0xad, 0x24, 0xef, 0xdb, 0xd4, 0x66, 0xda, 0x3d, + 0xd2, 0x67, 0xa4, 0xa8, 0x0b, 0x75, 0xc7, 0xc5, 0x8e, 0xee, 0x62, 0xcd, 0x71, 0x6d, 0xc7, 0xf6, + 0xf4, 0x51, 0xa3, 0xce, 0x7c, 0x3f, 0x9f, 0xe4, 0xfb, 0x90, 0xeb, 0x1f, 0x0a, 0xf5, 0x4e, 0x4a, + 0xad, 0x39, 0x71, 0x51, 0xb3, 0x08, 0xf9, 0x13, 0x7d, 0x34, 0xc1, 0xca, 0xf3, 0x50, 0x8e, 0x00, + 0x08, 0x6a, 0x40, 0x71, 0x8c, 0x3d, 0x4f, 0x1f, 0x60, 0x86, 0x37, 0x92, 0xea, 0x77, 0x95, 0x2a, + 0xac, 0x44, 0x41, 0x43, 0x19, 0x07, 0x86, 0x14, 0x0e, 0xa8, 0xe1, 0x09, 0x76, 0x3d, 0x8a, 0x01, + 0xc2, 0x50, 0x74, 0xd1, 0x33, 0x50, 0x61, 0x9b, 0x52, 0xf3, 0xc7, 0x29, 0x26, 0xe5, 0xd4, 0x15, + 0x26, 0xbc, 0x2f, 0x94, 0xd6, 0xa1, 0xec, 0x6c, 0x39, 0x81, 0x4a, 0x96, 0xa9, 0x80, 0xb3, 0xe5, + 0x08, 0x05, 0xe5, 0x07, 0x50, 0x9f, 0xc6, 0x10, 0x54, 0x87, 0xec, 0x43, 0x7c, 0x26, 0x9e, 0x47, + 0x9b, 0xe8, 0xb2, 0x98, 0x16, 0x7b, 0x86, 0xa4, 0x8a, 0x39, 0xfe, 0x29, 0x13, 0x18, 0x07, 0xe0, + 0x81, 0x6e, 0x43, 0x8e, 0x62, 0xb1, 0x80, 0x55, 0x79, 0x83, 0x03, 0xf5, 0x86, 0x0f, 0xd4, 0x1b, + 0x5d, 0x1f, 0xa8, 0x9b, 0xa5, 0x2f, 0xbf, 0x5e, 0x4f, 0x7d, 0xfe, 0xd7, 0xf5, 0xb4, 0xca, 0x2c, + 0xd0, 0x93, 0xf4, 0xac, 0xeb, 0xa6, 0xa5, 0x99, 0x86, 0x78, 0x4e, 0x91, 0xf5, 0x77, 0x0c, 0xb4, + 0x0b, 0xf5, 0xbe, 0x6d, 0x79, 0xd8, 0xf2, 0x26, 0x9e, 0xc6, 0x03, 0x81, 0x00, 0xd3, 0xd9, 0xb3, + 0xd8, 0xf2, 0x15, 0x0f, 0x99, 0x9e, 0x5a, 0xeb, 0xc7, 0x05, 0xe8, 0x2e, 0xc0, 0x89, 0x3e, 0x32, + 0x0d, 0x9d, 0xd8, 0xae, 0xd7, 0xc8, 0xdd, 0xc8, 0xce, 0x75, 0x73, 0xdf, 0x57, 0xb9, 0xe7, 0x18, + 0x3a, 0xc1, 0xcd, 0x1c, 0x7d, 0x5b, 0x35, 0x62, 0x89, 0x9e, 0x83, 0x9a, 0xee, 0x38, 0x9a, 0x47, + 0x74, 0x82, 0xb5, 0xde, 0x19, 0xc1, 0x1e, 0x83, 0xd8, 0x15, 0xb5, 0xa2, 0x3b, 0xce, 0x11, 0x95, + 0x36, 0xa9, 0x10, 0x3d, 0x0b, 0x55, 0x0a, 0xa7, 0xa6, 0x3e, 0xd2, 0x86, 0xd8, 0x1c, 0x0c, 0x09, + 0x83, 0xd2, 0xac, 0x5a, 0x11, 0xd2, 0x0e, 0x13, 0x2a, 0x46, 0xb0, 0x11, 0x18, 0x94, 0x22, 0x04, + 0x39, 0x43, 0x27, 0x3a, 0x5b, 0xc8, 0x15, 0x95, 0xb5, 0xa9, 0xcc, 0xd1, 0xc9, 0x50, 0x2c, 0x0f, + 0x6b, 0xa3, 0x2b, 0x50, 0x10, 0x6e, 0xb3, 0xcc, 0xad, 0xe8, 0xd1, 0x6f, 0xe6, 0xb8, 0xf6, 0x09, + 0x66, 0xb1, 0xa3, 0xa4, 0xf2, 0x8e, 0xf2, 0xab, 0x0c, 0xac, 0xce, 0x80, 0x2e, 0xf5, 0x3b, 0xd4, + 0xbd, 0xa1, 0xff, 0x2c, 0xda, 0x46, 0xaf, 0x53, 0xbf, 0xba, 0x81, 0x5d, 0x11, 0xec, 0x1a, 0xd1, + 0x25, 0xe2, 0x81, 0xbc, 0xc3, 0xc6, 0xc5, 0xd2, 0x08, 0x6d, 0x74, 0x00, 0xf5, 0x91, 0xee, 0x11, + 0x8d, 0x83, 0x98, 0x16, 0x09, 0x7c, 0xb3, 0xd0, 0xbd, 0xa7, 0xfb, 0xb0, 0x47, 0x37, 0xbb, 0x70, + 0x54, 0x1d, 0xc5, 0xa4, 0x48, 0x85, 0xcb, 0xbd, 0xb3, 0x47, 0xba, 0x45, 0x4c, 0x0b, 0x6b, 0x33, + 0x5f, 0xee, 0xc9, 0x19, 0xa7, 0xed, 0x13, 0xd3, 0xc0, 0x56, 0xdf, 0xff, 0x64, 0x97, 0x02, 0xe3, + 0xe0, 0x93, 0x7a, 0x8a, 0x0a, 0xd5, 0x78, 0xd8, 0x40, 0x55, 0xc8, 0x90, 0x53, 0xb1, 0x00, 0x19, + 0x72, 0x8a, 0xbe, 0x07, 0x39, 0x3a, 0x49, 0x36, 0xf9, 0xea, 0x9c, 0x98, 0x2d, 0xec, 0xba, 0x67, + 0x0e, 0x56, 0x99, 0xa6, 0xa2, 0x04, 0xa7, 0x21, 0x08, 0x25, 0xd3, 0x5e, 0x95, 0x17, 0xa0, 0x36, + 0x15, 0x2b, 0x22, 0xdf, 0x2f, 0x1d, 0xfd, 0x7e, 0x4a, 0x0d, 0x2a, 0xb1, 0xc0, 0xa0, 0x5c, 0x81, + 0xcb, 0xf3, 0x70, 0x5e, 0x19, 0x06, 0xf2, 0x18, 0x5e, 0xa3, 0xd7, 0xa0, 0x14, 0x00, 0x3d, 0x3f, + 0x8d, 0xb3, 0x6b, 0xe5, 0x2b, 0xab, 0x81, 0x2a, 0x3d, 0x86, 0x74, 0x5b, 0xb3, 0xfd, 0x90, 0x61, + 0x2f, 0x5e, 0xd4, 0x1d, 0xa7, 0xa3, 0x7b, 0x43, 0xe5, 0x23, 0x68, 0x24, 0x81, 0xf8, 0xd4, 0x34, + 0x72, 0xc1, 0x36, 0xbc, 0x02, 0x85, 0x63, 0xdb, 0x1d, 0xeb, 0x84, 0x39, 0xab, 0xa8, 0xa2, 0x47, + 0xb7, 0x27, 0x07, 0xf4, 0x2c, 0x13, 0xf3, 0x8e, 0xa2, 0xc1, 0x93, 0x89, 0x40, 0x4e, 0x4d, 0x4c, + 0xcb, 0xc0, 0x7c, 0x3d, 0x2b, 0x2a, 0xef, 0x84, 0x8e, 0xf8, 0xcb, 0xf2, 0x0e, 0x7d, 0xac, 0xc7, + 0xe6, 0xca, 0xfc, 0x4b, 0xaa, 0xe8, 0x29, 0x1a, 0x5c, 0x99, 0x8f, 0xe6, 0xe8, 0x3a, 0x00, 0xc7, + 0x53, 0x71, 0xea, 0xb2, 0x37, 0x57, 0x54, 0x89, 0x49, 0xee, 0xd0, 0xa3, 0xf7, 0x1c, 0xd4, 0xc2, + 0x61, 0xcd, 0x33, 0x1f, 0xf1, 0xad, 0x91, 0x55, 0x2b, 0x81, 0xce, 0x91, 0xf9, 0x08, 0x2b, 0xbf, + 0x97, 0xa0, 0xa4, 0x62, 0xcf, 0xa1, 0xa0, 0x83, 0x9a, 0x20, 0xe1, 0xd3, 0x3e, 0xe6, 0x1c, 0x2e, + 0x9d, 0xc8, 0x81, 0xb8, 0x76, 0xdb, 0xd7, 0xa4, 0x04, 0x24, 0x30, 0x43, 0xaf, 0x0a, 0x9e, 0x9a, + 0x4c, 0x39, 0x85, 0x79, 0x94, 0xa8, 0xbe, 0xee, 0x13, 0xd5, 0x6c, 0x22, 0xe7, 0xe0, 0x56, 0x53, + 0x4c, 0xf5, 0x55, 0xc1, 0x54, 0x73, 0x0b, 0x1e, 0x16, 0xa3, 0xaa, 0xad, 0x18, 0x55, 0xcd, 0x2f, + 0x98, 0x66, 0x02, 0x57, 0x6d, 0xc5, 0xb8, 0x6a, 0x61, 0x81, 0x93, 0x04, 0xb2, 0xfa, 0xba, 0x4f, + 0x56, 0x8b, 0x0b, 0xa6, 0x3d, 0xc5, 0x56, 0xef, 0xc6, 0xd9, 0x2a, 0x67, 0x9a, 0xcf, 0x24, 0x5a, + 0x27, 0xd2, 0xd5, 0x1f, 0x46, 0xe8, 0xaa, 0x94, 0xc8, 0x15, 0xb9, 0x93, 0x39, 0x7c, 0xb5, 0x15, + 0xe3, 0xab, 0xb0, 0x60, 0x0d, 0x12, 0x08, 0xeb, 0x3b, 0x51, 0xc2, 0x5a, 0x4e, 0xe4, 0xbc, 0x62, + 0xd3, 0xcc, 0x63, 0xac, 0x6f, 0x04, 0x8c, 0x75, 0x25, 0x91, 0x72, 0x8b, 0x39, 0x4c, 0x53, 0xd6, + 0x83, 0x19, 0xca, 0xca, 0x29, 0xe6, 0x73, 0x89, 0x2e, 0x16, 0x70, 0xd6, 0x83, 0x19, 0xce, 0x5a, + 0x5d, 0xe0, 0x70, 0x01, 0x69, 0xfd, 0xc5, 0x7c, 0xd2, 0x9a, 0x4c, 0x2b, 0xc5, 0x6b, 0x2e, 0xc7, + 0x5a, 0xb5, 0x04, 0xd6, 0xca, 0x99, 0xe5, 0x8b, 0x89, 0xee, 0x97, 0xa6, 0xad, 0xf7, 0xe6, 0xd0, + 0xd6, 0x55, 0xe6, 0xfc, 0x66, 0xa2, 0xf3, 0x8b, 0xf0, 0xd6, 0x17, 0x28, 0x3d, 0x98, 0xc2, 0x23, + 0x0a, 0xb1, 0xd8, 0x75, 0x6d, 0x57, 0x50, 0x42, 0xde, 0x51, 0x6e, 0x52, 0xc2, 0x12, 0x62, 0xcf, + 0x39, 0x1c, 0x97, 0x85, 0xb2, 0x08, 0xde, 0x28, 0xbf, 0x4b, 0x87, 0xb6, 0x2c, 0xc6, 0x47, 0xc9, + 0x8e, 0x24, 0xc8, 0x4e, 0x84, 0xfa, 0x66, 0xe2, 0xd4, 0x77, 0x1d, 0xca, 0x34, 0x44, 0x4d, 0xb1, + 0x5a, 0xdd, 0xf1, 0x59, 0x2d, 0xba, 0x05, 0xab, 0x8c, 0x83, 0x70, 0xc4, 0x16, 0x71, 0x29, 0xc7, + 0xe0, 0xba, 0x46, 0x07, 0xf8, 0x9e, 0xe7, 0x01, 0xea, 0x65, 0xb8, 0x14, 0xd1, 0x0d, 0x42, 0x1f, + 0xa7, 0x72, 0xf5, 0x40, 0x7b, 0x5b, 0xc4, 0xc0, 0xf7, 0xc3, 0x05, 0x0a, 0x19, 0x33, 0x82, 0x5c, + 0xdf, 0x36, 0xb0, 0x08, 0x4c, 0xac, 0x4d, 0x59, 0xf4, 0xc8, 0x1e, 0x88, 0xf0, 0x43, 0x9b, 0x54, + 0x2b, 0x00, 0x57, 0x89, 0x63, 0xa7, 0xf2, 0xc7, 0x74, 0xe8, 0x2f, 0x24, 0xd1, 0xf3, 0xf8, 0x6e, + 0xfa, 0x7f, 0xc3, 0x77, 0x33, 0xdf, 0x9a, 0xef, 0x46, 0x89, 0x41, 0x36, 0x4e, 0x0c, 0xfe, 0x95, + 0x0e, 0xbf, 0x70, 0xc0, 0x5e, 0xbf, 0xdd, 0x8a, 0x84, 0x51, 0x3e, 0xcf, 0xbe, 0x97, 0x88, 0xf2, + 0x22, 0x27, 0x29, 0xb0, 0xe7, 0xc6, 0x73, 0x92, 0x22, 0x8f, 0xfb, 0xac, 0x83, 0x6e, 0x83, 0xc4, + 0x4a, 0x50, 0x9a, 0xed, 0x78, 0x02, 0xc7, 0x9f, 0x8a, 0xce, 0x95, 0x57, 0x9a, 0x36, 0x0e, 0xa9, + 0xce, 0x81, 0xe3, 0xa9, 0x25, 0x47, 0xb4, 0x22, 0x04, 0x46, 0x8a, 0xf1, 0xe8, 0x6b, 0x20, 0xd1, + 0xb7, 0xf7, 0x1c, 0xbd, 0x8f, 0x19, 0x26, 0x4b, 0x6a, 0x28, 0x50, 0x1e, 0x00, 0x9a, 0x8d, 0x0a, + 0xa8, 0x03, 0x05, 0x7c, 0x82, 0x2d, 0xe2, 0x31, 0x1e, 0x51, 0xde, 0xba, 0x32, 0x87, 0xa4, 0x62, + 0x8b, 0x34, 0x1b, 0x74, 0x91, 0xff, 0xf9, 0xf5, 0x7a, 0x9d, 0x6b, 0xbf, 0x64, 0x8f, 0x4d, 0x82, + 0xc7, 0x0e, 0x39, 0x53, 0x85, 0xbd, 0xf2, 0x97, 0x0c, 0x65, 0x8c, 0xb1, 0x88, 0x31, 0x77, 0x6d, + 0xfd, 0x03, 0x94, 0x89, 0x64, 0x0b, 0xcb, 0xad, 0xf7, 0x1a, 0xc0, 0x40, 0xf7, 0xb4, 0x4f, 0x75, + 0x8b, 0x60, 0x43, 0x2c, 0x7a, 0x44, 0x82, 0x64, 0x28, 0xd1, 0xde, 0xc4, 0xc3, 0x86, 0x48, 0x5c, + 0x82, 0x7e, 0x64, 0x9e, 0xc5, 0xef, 0x36, 0xcf, 0xf8, 0x2a, 0x97, 0xa6, 0x56, 0x39, 0xc2, 0xe6, + 0xa4, 0x28, 0x9b, 0xa3, 0xef, 0xe6, 0xb8, 0xa6, 0xed, 0x9a, 0xe4, 0x8c, 0x7d, 0x9a, 0xac, 0x1a, + 0xf4, 0x69, 0x7e, 0x3c, 0xc6, 0x63, 0xc7, 0xb6, 0x47, 0x1a, 0x07, 0xaf, 0x32, 0x33, 0x5d, 0x11, + 0xc2, 0x36, 0xc3, 0xb0, 0x5f, 0x67, 0xc2, 0xe3, 0x17, 0xb2, 0xf6, 0xff, 0xbb, 0x05, 0x56, 0x7e, + 0xc3, 0x52, 0xf9, 0x38, 0x27, 0x40, 0x47, 0xb0, 0x1a, 0x1c, 0x7f, 0x6d, 0xc2, 0x60, 0xc1, 0xdf, + 0xd0, 0xcb, 0xe2, 0x47, 0xfd, 0x24, 0x2e, 0xf6, 0xd0, 0x4f, 0xe0, 0xea, 0x14, 0xb4, 0x05, 0xae, + 0x33, 0x4b, 0x22, 0xdc, 0x13, 0x71, 0x84, 0xf3, 0x3d, 0x87, 0x6b, 0x95, 0xfd, 0x8e, 0x87, 0x6e, + 0x87, 0x66, 0x87, 0x51, 0x86, 0x33, 0xf7, 0xeb, 0x3f, 0x03, 0x15, 0x17, 0x13, 0xdd, 0xb4, 0xb4, + 0x58, 0xfe, 0xbd, 0xc2, 0x85, 0x22, 0xab, 0x3f, 0x84, 0x27, 0xe6, 0x32, 0x1d, 0xf4, 0x7d, 0x90, + 0x42, 0x92, 0x94, 0x4e, 0x48, 0x65, 0x83, 0xf4, 0x2c, 0xd4, 0x55, 0xfe, 0x90, 0x0e, 0x5d, 0xc6, + 0x13, 0xbe, 0x36, 0x14, 0x5c, 0xec, 0x4d, 0x46, 0x3c, 0x05, 0xab, 0x6e, 0xbd, 0xbc, 0x1c, 0x47, + 0xa2, 0xd2, 0xc9, 0x88, 0xa8, 0xc2, 0x58, 0x79, 0x00, 0x05, 0x2e, 0x41, 0x65, 0x28, 0xde, 0xdb, + 0xdf, 0xdd, 0x3f, 0xf8, 0x60, 0xbf, 0x9e, 0x42, 0x00, 0x85, 0xed, 0x56, 0xab, 0x7d, 0xd8, 0xad, + 0xa7, 0x91, 0x04, 0xf9, 0xed, 0xe6, 0x81, 0xda, 0xad, 0x67, 0xa8, 0x58, 0x6d, 0xbf, 0xd7, 0x6e, + 0x75, 0xeb, 0x59, 0xb4, 0x0a, 0x15, 0xde, 0xd6, 0xee, 0x1e, 0xa8, 0xef, 0x6f, 0x77, 0xeb, 0xb9, + 0x88, 0xe8, 0xa8, 0xbd, 0x7f, 0xa7, 0xad, 0xd6, 0xf3, 0xca, 0x2b, 0x34, 0xc7, 0x4b, 0x60, 0x55, + 0x61, 0x36, 0x97, 0x8e, 0x64, 0x73, 0xca, 0x6f, 0x33, 0x20, 0x27, 0x53, 0x25, 0xf4, 0xde, 0xd4, + 0xc4, 0xb7, 0x2e, 0xc0, 0xb3, 0xa6, 0x66, 0x8f, 0x9e, 0x85, 0xaa, 0x8b, 0x8f, 0x31, 0xe9, 0x0f, + 0x39, 0x75, 0xe3, 0x11, 0xb3, 0xa2, 0x56, 0x84, 0x94, 0x19, 0x79, 0x5c, 0xed, 0x63, 0xdc, 0x27, + 0x1a, 0x87, 0x22, 0xbe, 0xe9, 0x24, 0xaa, 0x46, 0xa5, 0x47, 0x5c, 0xa8, 0x7c, 0x74, 0xa1, 0xb5, + 0x94, 0x20, 0xaf, 0xb6, 0xbb, 0xea, 0x4f, 0xeb, 0x59, 0x84, 0xa0, 0xca, 0x9a, 0xda, 0xd1, 0xfe, + 0xf6, 0xe1, 0x51, 0xe7, 0x80, 0xae, 0xe5, 0x25, 0xa8, 0xf9, 0x6b, 0xe9, 0x0b, 0xf3, 0xca, 0x6d, + 0xb8, 0x9a, 0xc0, 0xf3, 0x16, 0x64, 0xb4, 0xca, 0x7f, 0xd2, 0x50, 0x9b, 0x3a, 0x5a, 0x68, 0x0b, + 0xf2, 0x3c, 0x71, 0x48, 0xba, 0x15, 0x61, 0xc8, 0x20, 0xce, 0x21, 0x57, 0x45, 0x6f, 0x41, 0x09, + 0x8b, 0x92, 0xcb, 0xbc, 0x23, 0xcc, 0x4b, 0x45, 0x7e, 0x51, 0x46, 0x98, 0x06, 0x16, 0xe8, 0x6d, + 0x90, 0x02, 0x8c, 0x10, 0xd9, 0xea, 0xd3, 0xb3, 0xe6, 0x01, 0xba, 0x08, 0xfb, 0xd0, 0x06, 0xbd, + 0x11, 0xd2, 0xc4, 0xdc, 0x6c, 0xba, 0x22, 0xcc, 0xb9, 0x82, 0x30, 0xf6, 0xf5, 0x95, 0x16, 0x94, + 0x23, 0xf3, 0x41, 0x4f, 0x81, 0x34, 0xd6, 0x4f, 0x45, 0x29, 0x8f, 0x17, 0x63, 0x4a, 0x63, 0xfd, + 0x94, 0x57, 0xf1, 0xae, 0x42, 0x91, 0x0e, 0x0e, 0x74, 0x4f, 0xe4, 0xfd, 0x85, 0xb1, 0x7e, 0xfa, + 0xae, 0xee, 0x29, 0x1f, 0x42, 0x35, 0x5e, 0xc6, 0xa2, 0x7b, 0xd8, 0xb5, 0x27, 0x96, 0xc1, 0x7c, + 0xe4, 0x55, 0xde, 0x41, 0xaf, 0x41, 0xfe, 0xc4, 0xe6, 0x30, 0x37, 0xff, 0xb0, 0xdf, 0xb7, 0x09, + 0x8e, 0x94, 0xc1, 0xb8, 0xb6, 0xf2, 0x08, 0xf2, 0x0c, 0xb6, 0x28, 0x04, 0xb1, 0x82, 0x94, 0xa0, + 0xc8, 0xb4, 0x8d, 0x3e, 0x04, 0xd0, 0x09, 0x71, 0xcd, 0xde, 0x24, 0x74, 0xbc, 0x3e, 0x1f, 0xf6, + 0xb6, 0x7d, 0xbd, 0xe6, 0x35, 0x81, 0x7f, 0x97, 0x43, 0xd3, 0x08, 0x06, 0x46, 0x1c, 0x2a, 0xfb, + 0x50, 0x8d, 0xdb, 0x46, 0x4b, 0xc3, 0x2b, 0x73, 0x4a, 0xc3, 0x01, 0x0d, 0x0b, 0x48, 0x5c, 0x96, + 0x17, 0x1f, 0x59, 0x47, 0xf9, 0x2c, 0x0d, 0xa5, 0xee, 0xa9, 0x38, 0x10, 0x09, 0x75, 0xaf, 0xd0, + 0x34, 0x13, 0xad, 0xf2, 0xf0, 0x42, 0x5a, 0x36, 0x28, 0xcf, 0xbd, 0x13, 0x1c, 0xf9, 0xdc, 0xb2, + 0x69, 0xb2, 0x5f, 0xa7, 0x14, 0x30, 0xf7, 0x26, 0x48, 0xc1, 0xae, 0xa2, 0xb9, 0x86, 0x6e, 0x18, + 0x2e, 0xf6, 0x3c, 0x31, 0x37, 0xbf, 0xcb, 0xca, 0xa8, 0xf6, 0xa7, 0xa2, 0x8e, 0x94, 0x55, 0x79, + 0x47, 0x31, 0xa0, 0x36, 0x15, 0xf0, 0xd0, 0x9b, 0x50, 0x74, 0x26, 0x3d, 0xcd, 0x5f, 0x9e, 0xa9, + 0xc3, 0xe3, 0xf3, 0xce, 0x49, 0x6f, 0x64, 0xf6, 0x77, 0xf1, 0x99, 0xff, 0x32, 0xce, 0xa4, 0xb7, + 0xcb, 0x57, 0x91, 0x3f, 0x25, 0x13, 0x7d, 0xca, 0x09, 0x94, 0xfc, 0x4d, 0x81, 0x7e, 0x14, 0x3d, + 0x27, 0x7e, 0x71, 0x3d, 0x31, 0x08, 0x0b, 0xf7, 0x91, 0x63, 0x72, 0x0b, 0x56, 0x3d, 0x73, 0x60, + 0x61, 0x43, 0x0b, 0xb3, 0x1d, 0xf6, 0xb4, 0x92, 0x5a, 0xe3, 0x03, 0x7b, 0x7e, 0xaa, 0xa3, 0xfc, + 0x3b, 0x0d, 0x25, 0xff, 0xc0, 0xa2, 0x57, 0x22, 0xfb, 0xae, 0x3a, 0xa7, 0x24, 0xe4, 0x2b, 0x86, + 0x95, 0xd0, 0xf8, 0xbb, 0x66, 0x2e, 0xfe, 0xae, 0x49, 0x25, 0x6d, 0xff, 0x6e, 0x21, 0x77, 0xe1, + 0xbb, 0x85, 0x97, 0x00, 0x11, 0x9b, 0xe8, 0x23, 0xed, 0xc4, 0x26, 0xa6, 0x35, 0xd0, 0xf8, 0x62, + 0x73, 0x2e, 0x56, 0x67, 0x23, 0xf7, 0xd9, 0xc0, 0x21, 0x5b, 0xf7, 0x5f, 0xa6, 0xa1, 0x14, 0x44, + 0xd5, 0x8b, 0x16, 0x36, 0xaf, 0x40, 0x41, 0x04, 0x0e, 0x5e, 0xd9, 0x14, 0xbd, 0xa0, 0xc6, 0x9e, + 0x8b, 0xd4, 0xd8, 0x65, 0x28, 0x8d, 0x31, 0xd1, 0x19, 0x3e, 0xf3, 0x84, 0x33, 0xe8, 0xdf, 0x7a, + 0x03, 0xca, 0x91, 0x1a, 0x33, 0x3d, 0x79, 0xfb, 0xed, 0x0f, 0xea, 0x29, 0xb9, 0xf8, 0xd9, 0x17, + 0x37, 0xb2, 0xfb, 0xf8, 0x53, 0xba, 0x67, 0xd5, 0x76, 0xab, 0xd3, 0x6e, 0xed, 0xd6, 0xd3, 0x72, + 0xf9, 0xb3, 0x2f, 0x6e, 0x14, 0x55, 0xcc, 0x2a, 0x49, 0xb7, 0x3a, 0xb0, 0x12, 0xfd, 0x2a, 0xf1, + 0xd8, 0x83, 0xa0, 0x7a, 0xe7, 0xde, 0xe1, 0xde, 0x4e, 0x6b, 0xbb, 0xdb, 0xd6, 0xee, 0x1f, 0x74, + 0xdb, 0xf5, 0x34, 0xba, 0x0a, 0x97, 0xf6, 0x76, 0xde, 0xed, 0x74, 0xb5, 0xd6, 0xde, 0x4e, 0x7b, + 0xbf, 0xab, 0x6d, 0x77, 0xbb, 0xdb, 0xad, 0xdd, 0x7a, 0x66, 0xeb, 0x1f, 0x00, 0xb5, 0xed, 0x66, + 0x6b, 0x87, 0xc6, 0x4d, 0xb3, 0xaf, 0x8b, 0x4a, 0x5d, 0x8e, 0xe5, 0xfb, 0xe7, 0x5e, 0x99, 0xcb, + 0xe7, 0x17, 0x2a, 0xd1, 0x5d, 0xc8, 0xb3, 0x52, 0x00, 0x3a, 0xff, 0x0e, 0x5d, 0x5e, 0x50, 0xb9, + 0xa4, 0x2f, 0xc3, 0x8e, 0xc7, 0xb9, 0x97, 0xea, 0xf2, 0xf9, 0x85, 0x4c, 0xa4, 0x82, 0x14, 0xe6, + 0xf2, 0x8b, 0x2f, 0xd9, 0xe5, 0x25, 0x8a, 0x9b, 0xd4, 0x67, 0x98, 0x50, 0x2c, 0xbe, 0x74, 0x96, + 0x97, 0x00, 0x30, 0xb4, 0x07, 0x45, 0x3f, 0x07, 0x5c, 0x74, 0x0d, 0x2e, 0x2f, 0x2c, 0x3c, 0xd2, + 0x4f, 0xc0, 0x73, 0xf5, 0xf3, 0xef, 0xf4, 0xe5, 0x05, 0x55, 0x54, 0xb4, 0x03, 0x05, 0xc1, 0x92, + 0x17, 0x5c, 0x6d, 0xcb, 0x8b, 0x0a, 0x89, 0x74, 0xd1, 0xc2, 0x22, 0xc8, 0xe2, 0x3f, 0x15, 0xe4, + 0x25, 0x0a, 0xc4, 0xe8, 0x1e, 0x40, 0x24, 0x33, 0x5f, 0xe2, 0x17, 0x04, 0x79, 0x99, 0xc2, 0x2f, + 0x3a, 0x80, 0x52, 0x90, 0x28, 0x2d, 0xfc, 0x21, 0x40, 0x5e, 0x5c, 0x81, 0x45, 0x0f, 0xa0, 0x12, + 0xcf, 0x10, 0x96, 0xbb, 0xe6, 0x97, 0x97, 0x2c, 0xad, 0x52, 0xff, 0xf1, 0x74, 0x61, 0xb9, 0x6b, + 0x7f, 0x79, 0xc9, 0x4a, 0x2b, 0xfa, 0x18, 0x56, 0x67, 0xe9, 0xfc, 0xf2, 0x7f, 0x01, 0xc8, 0x17, + 0xa8, 0xbd, 0xa2, 0x31, 0xa0, 0x39, 0x69, 0xc0, 0x05, 0x7e, 0x0a, 0x90, 0x2f, 0x52, 0x8a, 0x45, + 0x06, 0xd4, 0xa6, 0xb9, 0xf5, 0xb2, 0x3f, 0x09, 0xc8, 0x4b, 0x97, 0x65, 0x9b, 0xed, 0x2f, 0xbf, + 0x59, 0x4b, 0x7f, 0xf5, 0xcd, 0x5a, 0xfa, 0x6f, 0xdf, 0xac, 0xa5, 0x3f, 0x7f, 0xbc, 0x96, 0xfa, + 0xea, 0xf1, 0x5a, 0xea, 0xcf, 0x8f, 0xd7, 0x52, 0x3f, 0x7b, 0x71, 0x60, 0x92, 0xe1, 0xa4, 0xb7, + 0xd1, 0xb7, 0xc7, 0x9b, 0xd1, 0xff, 0xa2, 0xe6, 0xfd, 0xab, 0xd5, 0x2b, 0xb0, 0x70, 0xf8, 0xea, + 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x29, 0x35, 0x72, 0xcb, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3286,6 +3483,7 @@ type ABCIApplicationClient interface { OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) + PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) } type aBCIApplicationClient struct { @@ -3422,6 +3620,15 @@ func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *Requ return out, nil } +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 +} + // ABCIApplicationServer is the server API for ABCIApplication service. type ABCIApplicationServer interface { Echo(context.Context, *RequestEcho) (*ResponseEcho, error) @@ -3438,6 +3645,7 @@ type ABCIApplicationServer interface { OfferSnapshot(context.Context, *RequestOfferSnapshot) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(context.Context, *RequestLoadSnapshotChunk) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(context.Context, *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) + PrepareProposal(context.Context, *RequestPrepareProposal) (*ResponsePrepareProposal, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3486,6 +3694,9 @@ func (*UnimplementedABCIApplicationServer) LoadSnapshotChunk(ctx context.Context func (*UnimplementedABCIApplicationServer) ApplySnapshotChunk(ctx context.Context, req *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) { return nil, status.Errorf(codes.Unimplemented, "method ApplySnapshotChunk not implemented") } +func (*UnimplementedABCIApplicationServer) PrepareProposal(ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { + return nil, status.Errorf(codes.Unimplemented, "method PrepareProposal not implemented") +} func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { s.RegisterService(&_ABCIApplication_serviceDesc, srv) @@ -3743,6 +3954,24 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +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) +} + var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ ServiceName: "tendermint.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), @@ -3803,6 +4032,10 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "ApplySnapshotChunk", Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, + { + MethodName: "PrepareProposal", + Handler: _ABCIApplication_PrepareProposal_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "tendermint/abci/types.proto", @@ -4135,6 +4368,29 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } +func (m *Request_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.PrepareProposal != nil { + { + size, err := m.PrepareProposal.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + return len(dAtA) - i, nil +} func (m *RequestEcho) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4293,12 +4549,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err17 != nil { - return 0, err17 + 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 } - i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i -= n18 + i = encodeVarintTypes(dAtA, i, uint64(n18)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4681,6 +4937,43 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } +func (m *RequestPrepareProposal) 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 *RequestPrepareProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BlockDataSize != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.BlockDataSize)) + i-- + dAtA[i] = 0x10 + } + if len(m.BlockData) > 0 { + for iNdEx := len(m.BlockData) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.BlockData[iNdEx]) + copy(dAtA[i:], m.BlockData[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.BlockData[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *Response) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5031,6 +5324,29 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } +func (m *Response_PrepareProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.PrepareProposal != nil { + { + size, err := m.PrepareProposal.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 *ResponseException) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5748,20 +6064,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA41 := make([]byte, len(m.RefetchChunks)*10) - var j40 int + dAtA43 := make([]byte, len(m.RefetchChunks)*10) + var j42 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA43[j42] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j42++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA43[j42] = uint8(num) + j42++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i -= j42 + copy(dAtA[i:], dAtA43[:j42]) + i = encodeVarintTypes(dAtA, i, uint64(j42)) i-- dAtA[i] = 0x12 } @@ -5773,6 +6089,38 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *ResponsePrepareProposal) 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 *ResponsePrepareProposal) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponsePrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.BlockData) > 0 { + for iNdEx := len(m.BlockData) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.BlockData[iNdEx]) + copy(dAtA[i:], m.BlockData[iNdEx]) + i = encodeVarintTypes(dAtA, i, uint64(len(m.BlockData[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *ConsensusParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6201,12 +6549,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n49, err49 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err49 != nil { - return 0, err49 + n51, err51 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err51 != nil { + return 0, err51 } - i -= n49 - i = encodeVarintTypes(dAtA, i, uint64(n49)) + i -= n51 + i = encodeVarintTypes(dAtA, i, uint64(n51)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6476,6 +6824,18 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { } return n } +func (m *Request_PrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *RequestEcho) Size() (n int) { if m == nil { return 0 @@ -6709,6 +7069,24 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } +func (m *RequestPrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.BlockData) > 0 { + for _, b := range m.BlockData { + l = len(b) + n += 1 + l + sovTypes(uint64(l)) + } + } + if m.BlockDataSize != 0 { + n += 1 + sovTypes(uint64(m.BlockDataSize)) + } + return n +} + func (m *Response) Size() (n int) { if m == nil { return 0 @@ -6902,6 +7280,18 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { } return n } +func (m *Response_PrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PrepareProposal != nil { + l = m.PrepareProposal.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *ResponseException) Size() (n int) { if m == nil { return 0 @@ -7241,6 +7631,21 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } +func (m *ResponsePrepareProposal) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.BlockData) > 0 { + for _, b := range m.BlockData { + l = len(b) + n += 1 + l + sovTypes(uint64(l)) + } + } + return n +} + func (m *ConsensusParams) Size() (n int) { if m == nil { return 0 @@ -8002,6 +8407,41 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_ApplySnapshotChunk{v} iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", 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 := &RequestPrepareProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_PrepareProposal{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -9570,6 +10010,107 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RequestPrepareProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestPrepareProposal: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) + copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockDataSize", wireType) + } + m.BlockDataSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockDataSize |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Response) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -10151,6 +10692,41 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_ApplySnapshotChunk{v} iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PrepareProposal", 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 := &ResponsePrepareProposal{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_PrepareProposal{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -12413,6 +12989,88 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *ResponsePrepareProposal) 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: ResponsePrepareProposal: wiretype end group for non-group") + } + if fieldNum <= 0 { + 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 BlockData", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BlockData = append(m.BlockData, make([]byte, postIndex-iNdEx)) + copy(m.BlockData[len(m.BlockData)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + 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 *ConsensusParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/cmd/tendermint/commands/reindex_event_test.go b/cmd/tendermint/commands/reindex_event_test.go index 716f4167a..87ff80ddc 100644 --- a/cmd/tendermint/commands/reindex_event_test.go +++ b/cmd/tendermint/commands/reindex_event_test.go @@ -9,6 +9,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + dbm "github.com/tendermint/tm-db" + abcitypes "github.com/tendermint/tendermint/abci/types" tmcfg "github.com/tendermint/tendermint/config" prototmstate "github.com/tendermint/tendermint/proto/tendermint/state" @@ -16,7 +18,6 @@ import ( "github.com/tendermint/tendermint/state/mocks" txmocks "github.com/tendermint/tendermint/state/txindex/mocks" "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" ) const ( diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index db9662acb..a0cdae1df 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -256,3 +256,8 @@ func (app *CounterApplication) Commit() abci.ResponseCommit { binary.BigEndian.PutUint64(hash, uint64(app.txCount)) return abci.ResponseCommit{Data: hash} } + +func (app *CounterApplication) PrepareProposal( + req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { + return abci.ResponsePrepareProposal{BlockData: req.BlockData} +} diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index b0c67ff87..5531f98c3 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -4,6 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" + types "github.com/tendermint/tendermint/types" ) diff --git a/mempool/v1/mempool.go b/mempool/v1/mempool.go index fab3fc910..8b444ac53 100644 --- a/mempool/v1/mempool.go +++ b/mempool/v1/mempool.go @@ -9,6 +9,7 @@ import ( "time" "github.com/creachadair/taskgroup" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/libs/clist" diff --git a/mempool/v1/mempool_bench_test.go b/mempool/v1/mempool_bench_test.go index bad8ec8ab..a26501275 100644 --- a/mempool/v1/mempool_bench_test.go +++ b/mempool/v1/mempool_bench_test.go @@ -7,6 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/mempool" ) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 3c0c227e7..ac7c9f076 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -35,6 +35,7 @@ message Request { RequestOfferSnapshot offer_snapshot = 13; RequestLoadSnapshotChunk load_snapshot_chunk = 14; RequestApplySnapshotChunk apply_snapshot_chunk = 15; + RequestPrepareProposal prepare_proposal = 16; } Reserve = 4; } @@ -118,6 +119,15 @@ message RequestApplySnapshotChunk { string sender = 3; } +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. + repeated bytes 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; +} + //---------------------------------------- // Response types @@ -138,6 +148,8 @@ message Response { ResponseOfferSnapshot offer_snapshot = 14; ResponseLoadSnapshotChunk load_snapshot_chunk = 15; ResponseApplySnapshotChunk apply_snapshot_chunk = 16; + ResponsePrepareProposal prepare_proposal = 17; + } Reserve = 5; } @@ -268,6 +280,10 @@ message ResponseApplySnapshotChunk { } } +message ResponsePrepareProposal { + repeated bytes block_data = 1; +} + //---------------------------------------- // Misc. @@ -395,4 +411,5 @@ service ABCIApplication { returns (ResponseLoadSnapshotChunk); rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); + rpc PrepareProposal(RequestPrepareProposal) returns (ResponsePrepareProposal); } diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 3c12ceb3d..77912b6ff 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -16,6 +16,7 @@ type AppConnConsensus interface { InitChainSync(types.RequestInitChain) (*types.ResponseInitChain, error) + PrepareProposalSync(types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) BeginBlockSync(types.RequestBeginBlock) (*types.ResponseBeginBlock, error) DeliverTxAsync(types.RequestDeliverTx) *abcicli.ReqRes EndBlockSync(types.RequestEndBlock) (*types.ResponseEndBlock, error) @@ -57,6 +58,8 @@ type appConnConsensus struct { appConn abcicli.Client } +var _ AppConnConsensus = (*appConnConsensus)(nil) + func NewAppConnConsensus(appConn abcicli.Client) AppConnConsensus { return &appConnConsensus{ appConn: appConn, @@ -75,6 +78,11 @@ func (app *appConnConsensus) InitChainSync(req types.RequestInitChain) (*types.R return app.appConn.InitChainSync(req) } +func (app *appConnConsensus) PrepareProposalSync( + req types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) { + return app.appConn.PrepareProposalSync(req) +} + func (app *appConnConsensus) BeginBlockSync(req types.RequestBeginBlock) (*types.ResponseBeginBlock, error) { return app.appConn.BeginBlockSync(req) } diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 5acd8cac9..0a22e75bc 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -4,6 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" + abcicli "github.com/tendermint/tendermint/abci/client" types "github.com/tendermint/tendermint/abci/types" @@ -136,6 +137,29 @@ func (_m *AppConnConsensus) InitChainSync(_a0 types.RequestInitChain) (*types.Re return r0, r1 } +// 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.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.ResponsePrepareProposal) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestPrepareProposal) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // SetResponseCallback provides a mock function with given fields: _a0 func (_m *AppConnConsensus) SetResponseCallback(_a0 abcicli.Callback) { _m.Called(_a0) diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index 87128ce85..552938658 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -4,6 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" + abcicli "github.com/tendermint/tendermint/abci/client" types "github.com/tendermint/tendermint/abci/types" diff --git a/state/execution.go b/state/execution.go index 2cc3db6e7..a6451146d 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, @@ -107,7 +109,33 @@ func (blockExec *BlockExecutor) CreateProposalBlock( txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas) - return state.MakeBlock(height, txs, commit, evidence, proposerAddr) + preparedProposal, err := blockExec.proxyApp.PrepareProposalSync( + abci.RequestPrepareProposal{BlockData: txs.ToSliceOfBytes(), BlockDataSize: maxDataBytes}, + ) + if err != nil { + // 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. + panic(err) + } + newTxs := preparedProposal.GetBlockData() + var txSize int + for _, tx := range newTxs { + txSize += len(tx) + + if maxDataBytes < int64(txSize) { + panic("block data exceeds max amount of allowed bytes") + } + } + + modifiedTxs := types.ToTxs(preparedProposal.GetBlockData()) + + return state.MakeBlock(height, modifiedTxs, commit, evidence, proposerAddr) } // ValidateBlock validates the given block against the given state. diff --git a/state/indexer/mocks/block_indexer.go b/state/indexer/mocks/block_indexer.go index 583e64d3a..2c0f0ecb0 100644 --- a/state/indexer/mocks/block_indexer.go +++ b/state/indexer/mocks/block_indexer.go @@ -75,13 +75,13 @@ func (_m *BlockIndexer) Search(ctx context.Context, q *query.Query) ([]int64, er return r0, r1 } -type NewBlockIndexerT interface { +type mockConstructorTestingTNewBlockIndexer interface { mock.TestingT Cleanup(func()) } // NewBlockIndexer creates a new instance of BlockIndexer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewBlockIndexer(t NewBlockIndexerT) *BlockIndexer { +func NewBlockIndexer(t mockConstructorTestingTNewBlockIndexer) *BlockIndexer { mock := &BlockIndexer{} mock.Mock.Test(t) diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index b4d57d04d..f02b149a9 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -4,6 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" + state "github.com/tendermint/tendermint/state" types "github.com/tendermint/tendermint/types" diff --git a/state/mocks/store.go b/state/mocks/store.go index d02eedb6d..145f806e0 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -4,6 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" + state "github.com/tendermint/tendermint/state" tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state" diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go index 210942e2e..b489874d2 100644 --- a/state/txindex/mocks/tx_indexer.go +++ b/state/txindex/mocks/tx_indexer.go @@ -6,6 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" + query "github.com/tendermint/tendermint/libs/pubsub/query" txindex "github.com/tendermint/tendermint/state/txindex" @@ -92,13 +93,13 @@ func (_m *TxIndexer) Search(ctx context.Context, q *query.Query) ([]*types.TxRes return r0, r1 } -type NewTxIndexerT interface { +type mockConstructorTestingTNewTxIndexer interface { mock.TestingT Cleanup(func()) } // NewTxIndexer creates a new instance of TxIndexer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewTxIndexer(t NewTxIndexerT) *TxIndexer { +func NewTxIndexer(t mockConstructorTestingTNewTxIndexer) *TxIndexer { mock := &TxIndexer{} mock.Mock.Test(t) diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index 5029f615e..c4850b3f2 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -6,6 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" + state "github.com/tendermint/tendermint/state" types "github.com/tendermint/tendermint/types" diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index c812b0f15..4366f437c 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -257,6 +257,11 @@ func (app *Application) ApplySnapshotChunk(req abci.RequestApplySnapshotChunk) a return abci.ResponseApplySnapshotChunk{Result: abci.ResponseApplySnapshotChunk_ACCEPT} } +func (app *Application) PrepareProposal( + req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { + return abci.ResponsePrepareProposal{BlockData: req.BlockData} +} + func (app *Application) Rollback() error { return app.state.Rollback() } diff --git a/test/fuzz/mempool/v0/fuzz_test.go b/test/fuzz/mempool/v0/fuzz_test.go index 4f8f1e9c8..52ac92f24 100644 --- a/test/fuzz/mempool/v0/fuzz_test.go +++ b/test/fuzz/mempool/v0/fuzz_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" + mempoolv0 "github.com/tendermint/tendermint/test/fuzz/mempool/v0" ) diff --git a/test/fuzz/mempool/v1/fuzz_test.go b/test/fuzz/mempool/v1/fuzz_test.go index 863697a0a..52ec0fb5a 100644 --- a/test/fuzz/mempool/v1/fuzz_test.go +++ b/test/fuzz/mempool/v1/fuzz_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" + mempoolv1 "github.com/tendermint/tendermint/test/fuzz/mempool/v1" ) diff --git a/types/tx.go b/types/tx.go index b6a0ecd3a..5bfc4f925 100644 --- a/types/tx.go +++ b/types/tx.go @@ -92,6 +92,28 @@ func (txs Txs) Proof(i int) TxProof { } } +// ToSliceOfBytes converts a Txs to slice of byte slices. +// +// NOTE: This method should become obsolete once Txs is switched to [][]byte. +// ref: #2603 +// TODO This function is to disappear when TxRecord is introduced +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 { RootHash tmbytes.HexBytes `json:"root_hash"`