From 877e67070b191e126085d246d9573803ca359e9a Mon Sep 17 00:00:00 2001 From: egonspace Date: Wed, 7 Jul 2021 20:48:36 +0900 Subject: [PATCH] feat: concurrent checkTx #213; fix tm-db call --- abci/client/client.go | 5 + abci/client/grpc_client.go | 28 + abci/client/local_client.go | 46 +- abci/client/mocks/client.go | 80 +- abci/client/socket_client.go | 26 + abci/example/kvstore/persistent_kvstore.go | 8 + abci/types/application.go | 23 +- abci/types/messages.go | 24 + abci/types/types.pb.go | 1526 +++++++++++++++++--- consensus/mempool_test.go | 22 +- consensus/replay_stubs.go | 3 +- light/example_test.go | 7 +- mempool/cache_test.go | 3 +- mempool/clist_mempool.go | 32 +- mempool/clist_mempool_test.go | 36 +- mempool/mempool.go | 3 +- mempool/mock/mempool.go | 3 +- mempool/reactor_test.go | 5 +- p2p/trust/store_test.go | 13 +- proto/ostracon/abci/types.proto | 22 + proxy/app_conn.go | 24 +- proxy/mocks/app_conn_consensus.go | 4 +- proxy/mocks/app_conn_mempool.go | 82 +- proxy/mocks/app_conn_query.go | 2 +- proxy/mocks/app_conn_snapshot.go | 2 +- proxy/mocks/client_creator.go | 5 +- state/execution.go | 3 +- state/state_test.go | 5 +- state/tx_filter_test.go | 5 +- state/txindex/indexer_service_test.go | 5 +- state/txindex/kv/kv_bench_test.go | 4 +- state/txindex/kv/kv_test.go | 18 +- test/maverick/consensus/replay_file.go | 8 +- test/maverick/consensus/replay_stubs.go | 3 +- test/maverick/consensus/wal_generator.go | 4 +- test/maverick/node/node.go | 5 +- tests.mk | 6 +- 37 files changed, 1771 insertions(+), 329 deletions(-) diff --git a/abci/client/client.go b/abci/client/client.go index dd3b8a8b6..48ac778cc 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -9,6 +9,7 @@ import ( tmsync "github.com/line/ostracon/libs/sync" ) +//go:generate mockery --case underscore --name Client const ( dialRetryIntervalSeconds = 3 echoRetryIntervalSeconds = 1 @@ -36,6 +37,8 @@ type Client interface { InitChainAsync(types.RequestInitChain) *ReqRes BeginBlockAsync(types.RequestBeginBlock) *ReqRes EndBlockAsync(types.RequestEndBlock) *ReqRes + BeginRecheckTxAsync(types.RequestBeginRecheckTx) *ReqRes + EndRecheckTxAsync(types.RequestEndRecheckTx) *ReqRes ListSnapshotsAsync(types.RequestListSnapshots) *ReqRes OfferSnapshotAsync(types.RequestOfferSnapshot) *ReqRes LoadSnapshotChunkAsync(types.RequestLoadSnapshotChunk) *ReqRes @@ -52,6 +55,8 @@ type Client interface { InitChainSync(types.RequestInitChain) (*types.ResponseInitChain, error) BeginBlockSync(types.RequestBeginBlock) (*types.ResponseBeginBlock, error) EndBlockSync(types.RequestEndBlock) (*types.ResponseEndBlock, error) + BeginRecheckTxSync(types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) + EndRecheckTxSync(types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) ListSnapshotsSync(types.RequestListSnapshots) (*types.ResponseListSnapshots, error) OfferSnapshotSync(types.RequestOfferSnapshot) (*types.ResponseOfferSnapshot, error) LoadSnapshotChunkSync(types.RequestLoadSnapshotChunk) (*types.ResponseLoadSnapshotChunk, error) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index a041c6523..605cb72a3 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -266,6 +266,24 @@ func (cli *grpcClient) EndBlockAsync(params types.RequestEndBlock) *ReqRes { return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_EndBlock{EndBlock: res}}) } +func (cli *grpcClient) BeginRecheckTxAsync(params types.RequestBeginRecheckTx) *ReqRes { + req := types.ToRequestBeginRecheckTx(params) + res, err := cli.client.BeginRecheckTx(context.Background(), req.GetBeginRecheckTx(), grpc.WaitForReady(true)) + if err != nil { + cli.StopForError(err) + } + return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_BeginRecheckTx{BeginRecheckTx: res}}) +} + +func (cli *grpcClient) EndRecheckTxAsync(params types.RequestEndRecheckTx) *ReqRes { + req := types.ToRequestEndRecheckTx(params) + res, err := cli.client.EndRecheckTx(context.Background(), req.GetEndRecheckTx(), grpc.WaitForReady(true)) + if err != nil { + cli.StopForError(err) + } + return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_EndRecheckTx{EndRecheckTx: res}}) +} + func (cli *grpcClient) ListSnapshotsAsync(params types.RequestListSnapshots) *ReqRes { req := types.ToRequestListSnapshots(params) res, err := cli.client.ListSnapshots(context.Background(), req.GetListSnapshots(), grpc.WaitForReady(true)) @@ -396,6 +414,16 @@ func (cli *grpcClient) EndBlockSync(params types.RequestEndBlock) (*types.Respon return cli.finishSyncCall(reqres).GetEndBlock(), cli.Error() } +func (cli *grpcClient) BeginRecheckTxSync(params types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + reqres := cli.BeginRecheckTxAsync(params) + return reqres.Response.GetBeginRecheckTx(), cli.Error() +} + +func (cli *grpcClient) EndRecheckTxSync(params types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + reqres := cli.EndRecheckTxAsync(params) + return reqres.Response.GetEndRecheckTx(), cli.Error() +} + func (cli *grpcClient) ListSnapshotsSync(params types.RequestListSnapshots) (*types.ResponseListSnapshots, error) { reqres := cli.ListSnapshotsAsync(params) return cli.finishSyncCall(reqres).GetListSnapshots(), cli.Error() diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 5bc0ec0fb..27883ee1f 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -92,8 +92,8 @@ func (app *localClient) DeliverTxAsync(params types.RequestDeliverTx) *ReqRes { } func (app *localClient) CheckTxAsync(req types.RequestCheckTx) *ReqRes { - app.mtx.Lock() - defer app.mtx.Unlock() + // CONTRACT: Application should handle concurrent `CheckTx` + // In this abci client layer, we don't protect `CheckTx` with a mutex for concurrency res := app.Application.CheckTx(req) return app.callback( @@ -102,6 +102,28 @@ func (app *localClient) CheckTxAsync(req types.RequestCheckTx) *ReqRes { ) } +func (app *localClient) BeginRecheckTxAsync(req types.RequestBeginRecheckTx) *ReqRes { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.BeginRecheckTx(req) + return app.callback( + types.ToRequestBeginRecheckTx(req), + types.ToResponseBeginRecheckTx(res), + ) +} + +func (app *localClient) EndRecheckTxAsync(req types.RequestEndRecheckTx) *ReqRes { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.EndRecheckTx(req) + return app.callback( + types.ToRequestEndRecheckTx(req), + types.ToResponseEndRecheckTx(res), + ) +} + func (app *localClient) QueryAsync(req types.RequestQuery) *ReqRes { app.mtx.Lock() defer app.mtx.Unlock() @@ -236,8 +258,8 @@ func (app *localClient) DeliverTxSync(req types.RequestDeliverTx) (*types.Respon } func (app *localClient) CheckTxSync(req types.RequestCheckTx) (*types.ResponseCheckTx, error) { - app.mtx.Lock() - defer app.mtx.Unlock() + // CONTRACT: Application should handle concurrent `CheckTx` + // In this abci client layer, we don't protect `CheckTx` with a mutex for concurrency res := app.Application.CheckTx(req) return &res, nil @@ -283,6 +305,22 @@ func (app *localClient) EndBlockSync(req types.RequestEndBlock) (*types.Response return &res, nil } +func (app *localClient) BeginRecheckTxSync(req types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.BeginRecheckTx(req) + return &res, nil +} + +func (app *localClient) EndRecheckTxSync(req types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.EndRecheckTx(req) + return &res, nil +} + func (app *localClient) ListSnapshotsSync(req types.RequestListSnapshots) (*types.ResponseListSnapshots, error) { app.mtx.Lock() defer app.mtx.Unlock() diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 9b4a046b0..031e983b4 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 2.7.4. DO NOT EDIT. package mocks @@ -94,6 +94,45 @@ func (_m *Client) BeginBlockSync(_a0 types.RequestBeginBlock) (*types.ResponseBe return r0, r1 } +// BeginRecheckTxAsync provides a mock function with given fields: _a0 +func (_m *Client) BeginRecheckTxAsync(_a0 types.RequestBeginRecheckTx) *abcicli.ReqRes { + ret := _m.Called(_a0) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(types.RequestBeginRecheckTx) *abcicli.ReqRes); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + return r0 +} + +// BeginRecheckTxSync provides a mock function with given fields: _a0 +func (_m *Client) BeginRecheckTxSync(_a0 types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseBeginRecheckTx + if rf, ok := ret.Get(0).(func(types.RequestBeginRecheckTx) *types.ResponseBeginRecheckTx); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseBeginRecheckTx) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestBeginRecheckTx) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // CheckTxAsync provides a mock function with given fields: _a0 func (_m *Client) CheckTxAsync(_a0 types.RequestCheckTx) *abcicli.ReqRes { ret := _m.Called(_a0) @@ -289,6 +328,45 @@ func (_m *Client) EndBlockSync(_a0 types.RequestEndBlock) (*types.ResponseEndBlo return r0, r1 } +// EndRecheckTxAsync provides a mock function with given fields: _a0 +func (_m *Client) EndRecheckTxAsync(_a0 types.RequestEndRecheckTx) *abcicli.ReqRes { + ret := _m.Called(_a0) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(types.RequestEndRecheckTx) *abcicli.ReqRes); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + return r0 +} + +// EndRecheckTxSync provides a mock function with given fields: _a0 +func (_m *Client) EndRecheckTxSync(_a0 types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseEndRecheckTx + if rf, ok := ret.Get(0).(func(types.RequestEndRecheckTx) *types.ResponseEndRecheckTx); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseEndRecheckTx) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestEndRecheckTx) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Error provides a mock function with given fields: func (_m *Client) Error() error { ret := _m.Called() diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 736a9a1d6..d70441993 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -263,6 +263,14 @@ func (cli *socketClient) EndBlockAsync(req types.RequestEndBlock) *ReqRes { return cli.queueRequest(types.ToRequestEndBlock(req)) } +func (cli *socketClient) BeginRecheckTxAsync(req types.RequestBeginRecheckTx) *ReqRes { + return cli.queueRequest(types.ToRequestBeginRecheckTx(req)) +} + +func (cli *socketClient) EndRecheckTxAsync(req types.RequestEndRecheckTx) *ReqRes { + return cli.queueRequest(types.ToRequestEndRecheckTx(req)) +} + func (cli *socketClient) ListSnapshotsAsync(req types.RequestListSnapshots) *ReqRes { return cli.queueRequest(types.ToRequestListSnapshots(req)) } @@ -380,6 +388,24 @@ func (cli *socketClient) EndBlockSync(req types.RequestEndBlock) (*types.Respons return reqres.Response.GetEndBlock(), cli.Error() } +func (cli *socketClient) BeginRecheckTxSync(req types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + reqres := cli.queueRequest(types.ToRequestBeginRecheckTx(req)) + if err := cli.FlushSync(); err != nil { + return nil, err + } + + return reqres.Response.GetBeginRecheckTx(), cli.Error() +} + +func (cli *socketClient) EndRecheckTxSync(req types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + reqres := cli.queueRequest(types.ToRequestEndRecheckTx(req)) + if err := cli.FlushSync(); err != nil { + return nil, err + } + + return reqres.Response.GetEndRecheckTx(), cli.Error() +} + func (cli *socketClient) ListSnapshotsSync(req types.RequestListSnapshots) (*types.ResponseListSnapshots, error) { reqres := cli.queueRequest(types.ToRequestListSnapshots(req)) if err := cli.FlushSync(); err != nil { diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 2b10b5d10..255298862 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -83,6 +83,14 @@ func (app *PersistentKVStoreApplication) CheckTx(req types.RequestCheckTx) types return app.app.CheckTx(req) } +func (app *PersistentKVStoreApplication) BeginRecheckTx(req types.RequestBeginRecheckTx) types.ResponseBeginRecheckTx { + return app.app.BeginRecheckTx(req) +} + +func (app *PersistentKVStoreApplication) EndRecheckTx(req types.RequestEndRecheckTx) types.ResponseEndRecheckTx { + return app.app.EndRecheckTx(req) +} + // Commit will panic if InitChain was not called func (app *PersistentKVStoreApplication) Commit() types.ResponseCommit { return app.app.Commit() diff --git a/abci/types/application.go b/abci/types/application.go index 65cc78b8c..9d93f8e2a 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -15,7 +15,9 @@ type Application interface { Query(RequestQuery) ResponseQuery // Query for state // Mempool Connection - CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool + CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool + BeginRecheckTx(RequestBeginRecheckTx) ResponseBeginRecheckTx // Signals the beginning of rechecking + EndRecheckTx(RequestEndRecheckTx) ResponseEndRecheckTx // Signals the end of rechecking // Consensus Connection InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore @@ -79,6 +81,14 @@ func (BaseApplication) EndBlock(req RequestEndBlock) ResponseEndBlock { return ResponseEndBlock{} } +func (BaseApplication) BeginRecheckTx(req RequestBeginRecheckTx) ResponseBeginRecheckTx { + return ResponseBeginRecheckTx{Code: CodeTypeOK} +} + +func (BaseApplication) EndRecheckTx(req RequestEndRecheckTx) ResponseEndRecheckTx { + return ResponseEndRecheckTx{Code: CodeTypeOK} +} + func (BaseApplication) ListSnapshots(req RequestListSnapshots) ResponseListSnapshots { return ResponseListSnapshots{} } @@ -159,6 +169,17 @@ func (app *GRPCApplication) EndBlock(ctx context.Context, req *RequestEndBlock) return &res, nil } +func (app *GRPCApplication) BeginRecheckTx(ctx context.Context, req *RequestBeginRecheckTx) ( + *ResponseBeginRecheckTx, error) { + res := app.app.BeginRecheckTx(*req) + return &res, nil +} + +func (app *GRPCApplication) EndRecheckTx(ctx context.Context, req *RequestEndRecheckTx) (*ResponseEndRecheckTx, error) { + res := app.app.EndRecheckTx(*req) + return &res, nil +} + func (app *GRPCApplication) ListSnapshots( ctx context.Context, req *RequestListSnapshots) (*ResponseListSnapshots, error) { res := app.app.ListSnapshots(*req) diff --git a/abci/types/messages.go b/abci/types/messages.go index 531f75fed..e617f8593 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -135,6 +135,18 @@ func ToRequestEndBlock(req RequestEndBlock) *Request { } } +func ToRequestBeginRecheckTx(req RequestBeginRecheckTx) *Request { + return &Request{ + Value: &Request_BeginRecheckTx{&req}, + } +} + +func ToRequestEndRecheckTx(req RequestEndRecheckTx) *Request { + return &Request{ + Value: &Request_EndRecheckTx{&req}, + } +} + func ToRequestListSnapshots(req RequestListSnapshots) *Request { return &Request{ Value: &Request_ListSnapshots{&req}, @@ -233,6 +245,18 @@ func ToResponseEndBlock(res ResponseEndBlock) *Response { } } +func ToResponseBeginRecheckTx(res ResponseBeginRecheckTx) *Response { + return &Response{ + Value: &Response_BeginRecheckTx{&res}, + } +} + +func ToResponseEndRecheckTx(res ResponseEndRecheckTx) *Response { + return &Response{ + Value: &Response_EndRecheckTx{&res}, + } +} + func ToResponseListSnapshots(res ResponseListSnapshots) *Response { return &Response{ Value: &Response_ListSnapshots{&res}, diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index d3501f910..8f1ae41d4 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_addf585b2317eb36, []int{30, 0} + return fileDescriptor_addf585b2317eb36, []int{32, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_addf585b2317eb36, []int{32, 0} + return fileDescriptor_addf585b2317eb36, []int{34, 0} } type Request struct { @@ -177,6 +177,8 @@ type Request struct { // *Request_OfferSnapshot // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk + // *Request_BeginRecheckTx + // *Request_EndRecheckTx Value isRequest_Value `protobuf_oneof:"value"` } @@ -264,6 +266,12 @@ 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_BeginRecheckTx struct { + BeginRecheckTx *RequestBeginRecheckTx `protobuf:"bytes,100,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` +} +type Request_EndRecheckTx struct { + EndRecheckTx *RequestEndRecheckTx `protobuf:"bytes,101,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` +} func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} @@ -280,6 +288,8 @@ func (*Request_ListSnapshots) isRequest_Value() {} func (*Request_OfferSnapshot) isRequest_Value() {} func (*Request_LoadSnapshotChunk) isRequest_Value() {} func (*Request_ApplySnapshotChunk) isRequest_Value() {} +func (*Request_BeginRecheckTx) isRequest_Value() {} +func (*Request_EndRecheckTx) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -393,6 +403,20 @@ func (m *Request) GetApplySnapshotChunk() *RequestApplySnapshotChunk { return nil } +func (m *Request) GetBeginRecheckTx() *RequestBeginRecheckTx { + if x, ok := m.GetValue().(*Request_BeginRecheckTx); ok { + return x.BeginRecheckTx + } + return nil +} + +func (m *Request) GetEndRecheckTx() *RequestEndRecheckTx { + if x, ok := m.GetValue().(*Request_EndRecheckTx); ok { + return x.EndRecheckTx + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -411,6 +435,8 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_OfferSnapshot)(nil), (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), + (*Request_BeginRecheckTx)(nil), + (*Request_EndRecheckTx)(nil), } } @@ -1215,6 +1241,94 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } +type RequestBeginRecheckTx struct { + Header types1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` +} + +func (m *RequestBeginRecheckTx) Reset() { *m = RequestBeginRecheckTx{} } +func (m *RequestBeginRecheckTx) String() string { return proto.CompactTextString(m) } +func (*RequestBeginRecheckTx) ProtoMessage() {} +func (*RequestBeginRecheckTx) Descriptor() ([]byte, []int) { + return fileDescriptor_addf585b2317eb36, []int{16} +} +func (m *RequestBeginRecheckTx) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestBeginRecheckTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestBeginRecheckTx.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 *RequestBeginRecheckTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestBeginRecheckTx.Merge(m, src) +} +func (m *RequestBeginRecheckTx) XXX_Size() int { + return m.Size() +} +func (m *RequestBeginRecheckTx) XXX_DiscardUnknown() { + xxx_messageInfo_RequestBeginRecheckTx.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestBeginRecheckTx proto.InternalMessageInfo + +func (m *RequestBeginRecheckTx) GetHeader() types1.Header { + if m != nil { + return m.Header + } + return types1.Header{} +} + +type RequestEndRecheckTx struct { + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` +} + +func (m *RequestEndRecheckTx) Reset() { *m = RequestEndRecheckTx{} } +func (m *RequestEndRecheckTx) String() string { return proto.CompactTextString(m) } +func (*RequestEndRecheckTx) ProtoMessage() {} +func (*RequestEndRecheckTx) Descriptor() ([]byte, []int) { + return fileDescriptor_addf585b2317eb36, []int{17} +} +func (m *RequestEndRecheckTx) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestEndRecheckTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestEndRecheckTx.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 *RequestEndRecheckTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestEndRecheckTx.Merge(m, src) +} +func (m *RequestEndRecheckTx) XXX_Size() int { + return m.Size() +} +func (m *RequestEndRecheckTx) XXX_DiscardUnknown() { + xxx_messageInfo_RequestEndRecheckTx.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestEndRecheckTx proto.InternalMessageInfo + +func (m *RequestEndRecheckTx) GetHeight() int64 { + if m != nil { + return m.Height + } + return 0 +} + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -1233,6 +1347,8 @@ type Response struct { // *Response_OfferSnapshot // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk + // *Response_BeginRecheckTx + // *Response_EndRecheckTx Value isResponse_Value `protobuf_oneof:"value"` } @@ -1240,7 +1356,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_addf585b2317eb36, []int{16} + return fileDescriptor_addf585b2317eb36, []int{18} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1323,6 +1439,12 @@ 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_BeginRecheckTx struct { + BeginRecheckTx *ResponseBeginRecheckTx `protobuf:"bytes,100,opt,name=begin_recheck_tx,json=beginRecheckTx,proto3,oneof" json:"begin_recheck_tx,omitempty"` +} +type Response_EndRecheckTx struct { + EndRecheckTx *ResponseEndRecheckTx `protobuf:"bytes,101,opt,name=end_recheck_tx,json=endRecheckTx,proto3,oneof" json:"end_recheck_tx,omitempty"` +} func (*Response_Exception) isResponse_Value() {} func (*Response_Echo) isResponse_Value() {} @@ -1340,6 +1462,8 @@ func (*Response_ListSnapshots) isResponse_Value() {} func (*Response_OfferSnapshot) isResponse_Value() {} func (*Response_LoadSnapshotChunk) isResponse_Value() {} func (*Response_ApplySnapshotChunk) isResponse_Value() {} +func (*Response_BeginRecheckTx) isResponse_Value() {} +func (*Response_EndRecheckTx) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1460,6 +1584,20 @@ func (m *Response) GetApplySnapshotChunk() *ResponseApplySnapshotChunk { return nil } +func (m *Response) GetBeginRecheckTx() *ResponseBeginRecheckTx { + if x, ok := m.GetValue().(*Response_BeginRecheckTx); ok { + return x.BeginRecheckTx + } + return nil +} + +func (m *Response) GetEndRecheckTx() *ResponseEndRecheckTx { + if x, ok := m.GetValue().(*Response_EndRecheckTx); ok { + return x.EndRecheckTx + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1479,6 +1617,8 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_OfferSnapshot)(nil), (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), + (*Response_BeginRecheckTx)(nil), + (*Response_EndRecheckTx)(nil), } } @@ -1491,7 +1631,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_addf585b2317eb36, []int{17} + return fileDescriptor_addf585b2317eb36, []int{19} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1535,7 +1675,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_addf585b2317eb36, []int{18} + return fileDescriptor_addf585b2317eb36, []int{20} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1578,7 +1718,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_addf585b2317eb36, []int{19} + return fileDescriptor_addf585b2317eb36, []int{21} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1619,7 +1759,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_addf585b2317eb36, []int{20} + return fileDescriptor_addf585b2317eb36, []int{22} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1695,7 +1835,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_addf585b2317eb36, []int{21} + return fileDescriptor_addf585b2317eb36, []int{23} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1755,7 +1895,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_addf585b2317eb36, []int{22} + return fileDescriptor_addf585b2317eb36, []int{24} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1822,7 +1962,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_addf585b2317eb36, []int{23} + return fileDescriptor_addf585b2317eb36, []int{25} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1922,7 +2062,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_addf585b2317eb36, []int{24} + return fileDescriptor_addf585b2317eb36, []int{26} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1973,7 +2113,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_addf585b2317eb36, []int{25} + return fileDescriptor_addf585b2317eb36, []int{27} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2073,7 +2213,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_addf585b2317eb36, []int{26} + return fileDescriptor_addf585b2317eb36, []int{28} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2168,7 +2308,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_addf585b2317eb36, []int{27} + return fileDescriptor_addf585b2317eb36, []int{29} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2228,7 +2368,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_addf585b2317eb36, []int{28} + return fileDescriptor_addf585b2317eb36, []int{30} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2279,7 +2419,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_addf585b2317eb36, []int{29} + return fileDescriptor_addf585b2317eb36, []int{31} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2323,7 +2463,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_addf585b2317eb36, []int{30} + return fileDescriptor_addf585b2317eb36, []int{32} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2367,7 +2507,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_addf585b2317eb36, []int{31} + return fileDescriptor_addf585b2317eb36, []int{33} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2413,7 +2553,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_addf585b2317eb36, []int{32} + return fileDescriptor_addf585b2317eb36, []int{34} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2463,6 +2603,94 @@ func (m *ResponseApplySnapshotChunk) GetRejectSenders() []string { return nil } +type ResponseBeginRecheckTx struct { + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` +} + +func (m *ResponseBeginRecheckTx) Reset() { *m = ResponseBeginRecheckTx{} } +func (m *ResponseBeginRecheckTx) String() string { return proto.CompactTextString(m) } +func (*ResponseBeginRecheckTx) ProtoMessage() {} +func (*ResponseBeginRecheckTx) Descriptor() ([]byte, []int) { + return fileDescriptor_addf585b2317eb36, []int{35} +} +func (m *ResponseBeginRecheckTx) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseBeginRecheckTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseBeginRecheckTx.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 *ResponseBeginRecheckTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseBeginRecheckTx.Merge(m, src) +} +func (m *ResponseBeginRecheckTx) XXX_Size() int { + return m.Size() +} +func (m *ResponseBeginRecheckTx) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseBeginRecheckTx.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseBeginRecheckTx proto.InternalMessageInfo + +func (m *ResponseBeginRecheckTx) GetCode() uint32 { + if m != nil { + return m.Code + } + return 0 +} + +type ResponseEndRecheckTx struct { + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` +} + +func (m *ResponseEndRecheckTx) Reset() { *m = ResponseEndRecheckTx{} } +func (m *ResponseEndRecheckTx) String() string { return proto.CompactTextString(m) } +func (*ResponseEndRecheckTx) ProtoMessage() {} +func (*ResponseEndRecheckTx) Descriptor() ([]byte, []int) { + return fileDescriptor_addf585b2317eb36, []int{36} +} +func (m *ResponseEndRecheckTx) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseEndRecheckTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseEndRecheckTx.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 *ResponseEndRecheckTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseEndRecheckTx.Merge(m, src) +} +func (m *ResponseEndRecheckTx) XXX_Size() int { + return m.Size() +} +func (m *ResponseEndRecheckTx) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseEndRecheckTx.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseEndRecheckTx proto.InternalMessageInfo + +func (m *ResponseEndRecheckTx) GetCode() uint32 { + if m != nil { + return m.Code + } + return 0 +} + // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app type ConsensusParams struct { @@ -2476,7 +2704,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_addf585b2317eb36, []int{33} + return fileDescriptor_addf585b2317eb36, []int{37} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2545,7 +2773,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_addf585b2317eb36, []int{34} + return fileDescriptor_addf585b2317eb36, []int{38} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2597,7 +2825,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_addf585b2317eb36, []int{35} + return fileDescriptor_addf585b2317eb36, []int{39} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2652,7 +2880,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_addf585b2317eb36, []int{36} + return fileDescriptor_addf585b2317eb36, []int{40} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2706,7 +2934,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_addf585b2317eb36, []int{37} + return fileDescriptor_addf585b2317eb36, []int{41} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2770,7 +2998,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_addf585b2317eb36, []int{38} + return fileDescriptor_addf585b2317eb36, []int{42} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2838,7 +3066,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_addf585b2317eb36, []int{39} + return fileDescriptor_addf585b2317eb36, []int{43} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2891,7 +3119,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_addf585b2317eb36, []int{40} + return fileDescriptor_addf585b2317eb36, []int{44} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2946,7 +3174,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_addf585b2317eb36, []int{41} + return fileDescriptor_addf585b2317eb36, []int{45} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3014,7 +3242,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_addf585b2317eb36, []int{42} + return fileDescriptor_addf585b2317eb36, []int{46} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3090,7 +3318,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_addf585b2317eb36, []int{43} + return fileDescriptor_addf585b2317eb36, []int{47} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3175,6 +3403,8 @@ func init() { proto.RegisterType((*RequestOfferSnapshot)(nil), "ostracon.abci.RequestOfferSnapshot") proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "ostracon.abci.RequestLoadSnapshotChunk") proto.RegisterType((*RequestApplySnapshotChunk)(nil), "ostracon.abci.RequestApplySnapshotChunk") + proto.RegisterType((*RequestBeginRecheckTx)(nil), "ostracon.abci.RequestBeginRecheckTx") + proto.RegisterType((*RequestEndRecheckTx)(nil), "ostracon.abci.RequestEndRecheckTx") proto.RegisterType((*Response)(nil), "ostracon.abci.Response") proto.RegisterType((*ResponseException)(nil), "ostracon.abci.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "ostracon.abci.ResponseEcho") @@ -3192,6 +3422,8 @@ func init() { proto.RegisterType((*ResponseOfferSnapshot)(nil), "ostracon.abci.ResponseOfferSnapshot") proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "ostracon.abci.ResponseLoadSnapshotChunk") proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "ostracon.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ResponseBeginRecheckTx)(nil), "ostracon.abci.ResponseBeginRecheckTx") + proto.RegisterType((*ResponseEndRecheckTx)(nil), "ostracon.abci.ResponseEndRecheckTx") proto.RegisterType((*ConsensusParams)(nil), "ostracon.abci.ConsensusParams") proto.RegisterType((*BlockParams)(nil), "ostracon.abci.BlockParams") proto.RegisterType((*LastCommitInfo)(nil), "ostracon.abci.LastCommitInfo") @@ -3208,180 +3440,188 @@ func init() { func init() { proto.RegisterFile("ostracon/abci/types.proto", fileDescriptor_addf585b2317eb36) } var fileDescriptor_addf585b2317eb36 = []byte{ - // 2759 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x93, 0x1b, 0x47, - 0x15, 0xd7, 0xe8, 0x5b, 0x4f, 0x2b, 0xad, 0xb6, 0xbd, 0xb1, 0xe5, 0x71, 0xb2, 0x6b, 0xc6, 0x84, - 0x24, 0x26, 0xec, 0xc6, 0x1f, 0x24, 0xc4, 0xc1, 0x21, 0x92, 0x2c, 0x47, 0xcb, 0xae, 0x77, 0xd7, - 0xb3, 0xf2, 0xa6, 0xe2, 0x04, 0x26, 0x23, 0xa9, 0x57, 0x1a, 0x2c, 0xcd, 0x4c, 0x34, 0xad, 0xf5, - 0x2e, 0x37, 0xa0, 0xa8, 0xa2, 0x72, 0xca, 0x89, 0xe2, 0x92, 0xff, 0x83, 0x03, 0x55, 0x9c, 0xa8, - 0xe4, 0x98, 0x23, 0xa7, 0x40, 0xd9, 0x17, 0x8a, 0x2b, 0x45, 0x51, 0x5c, 0x28, 0xaa, 0x3f, 0xe6, - 0x73, 0x35, 0x92, 0x9c, 0x70, 0xe3, 0x36, 0xfd, 0xe6, 0xbd, 0x37, 0xdd, 0xad, 0x7e, 0xbf, 0xf7, - 0x7b, 0xaf, 0x05, 0x17, 0x2d, 0x87, 0x8c, 0xf5, 0xae, 0x65, 0x6e, 0xea, 0x9d, 0xae, 0xb1, 0x49, - 0x4e, 0x6d, 0xec, 0x6c, 0xd8, 0x63, 0x8b, 0x58, 0xa8, 0xe4, 0xbe, 0xda, 0xa0, 0xaf, 0xe4, 0x4b, - 0x9e, 0x66, 0x77, 0x7c, 0x6a, 0x13, 0x6b, 0xd3, 0x1e, 0x5b, 0xd6, 0x11, 0xd7, 0x95, 0x65, 0xef, - 0x25, 0xf3, 0x10, 0xf4, 0x13, 0x78, 0x27, 0x0c, 0x1f, 0xe1, 0x53, 0xf7, 0xdd, 0xa5, 0x88, 0x9d, - 0xad, 0x8f, 0xf5, 0x91, 0xfb, 0x72, 0xbd, 0x6f, 0x59, 0xfd, 0x21, 0xde, 0x64, 0xa3, 0xce, 0xe4, - 0x68, 0x93, 0x18, 0x23, 0xec, 0x10, 0x7d, 0x64, 0x0b, 0x85, 0xd5, 0xbe, 0xd5, 0xb7, 0xd8, 0xe3, - 0x26, 0x7d, 0xe2, 0x52, 0xe5, 0x1f, 0x39, 0xc8, 0xa9, 0xf8, 0xe3, 0x09, 0x76, 0x08, 0x7a, 0x0d, - 0xd2, 0xb8, 0x3b, 0xb0, 0xaa, 0xd2, 0x65, 0xe9, 0xe5, 0xe2, 0x75, 0x79, 0x23, 0xb4, 0xa4, 0x0d, - 0xa1, 0xd5, 0xec, 0x0e, 0xac, 0x56, 0x42, 0x65, 0x9a, 0xe8, 0x06, 0x64, 0x8e, 0x86, 0x13, 0x67, - 0x50, 0x4d, 0x32, 0x93, 0x4b, 0xd3, 0x4d, 0xee, 0x52, 0x95, 0x56, 0x42, 0xe5, 0xba, 0xf4, 0x33, - 0x86, 0x79, 0x64, 0x55, 0x53, 0xb3, 0x3e, 0xb3, 0x65, 0x1e, 0xb1, 0xcf, 0x50, 0x4d, 0xf4, 0x0e, - 0x80, 0x83, 0x89, 0x66, 0xd9, 0xc4, 0xb0, 0xcc, 0x6a, 0x9a, 0xd9, 0xad, 0x4f, 0xb7, 0x3b, 0xc0, - 0x64, 0x8f, 0xa9, 0xb5, 0x12, 0x6a, 0xc1, 0x71, 0x07, 0xd4, 0x83, 0x61, 0x1a, 0x44, 0xeb, 0x0e, - 0x74, 0xc3, 0xac, 0x66, 0x66, 0x79, 0xd8, 0x32, 0x0d, 0xd2, 0xa0, 0x6a, 0xd4, 0x83, 0xe1, 0x0e, - 0xe8, 0x52, 0x3f, 0x9e, 0xe0, 0xf1, 0x69, 0x35, 0x3b, 0x6b, 0xa9, 0xf7, 0xa9, 0x0a, 0x5d, 0x2a, - 0xd3, 0x45, 0x0d, 0x28, 0x76, 0x70, 0xdf, 0x30, 0xb5, 0xce, 0xd0, 0xea, 0x3e, 0xaa, 0xe6, 0x98, - 0xe9, 0xe5, 0xe9, 0xa6, 0x75, 0xaa, 0x58, 0xa7, 0x7a, 0xad, 0x84, 0x0a, 0x1d, 0x6f, 0x84, 0x6e, - 0x41, 0xbe, 0x3b, 0xc0, 0xdd, 0x47, 0x1a, 0x39, 0xa9, 0xe6, 0x99, 0x87, 0x17, 0xa6, 0x7b, 0x68, - 0x50, 0xad, 0xf6, 0x49, 0x2b, 0xa1, 0xe6, 0xba, 0xfc, 0x91, 0xae, 0xbb, 0x87, 0x87, 0xc6, 0x31, - 0x1e, 0x53, 0xeb, 0xc2, 0xac, 0x75, 0xdf, 0xe1, 0x7a, 0xcc, 0xbe, 0xd0, 0x73, 0x07, 0xe8, 0x36, - 0x14, 0xb0, 0xd9, 0x13, 0x0b, 0x00, 0xe6, 0x60, 0x2d, 0xe6, 0x64, 0x98, 0x3d, 0x77, 0xfa, 0x79, - 0x2c, 0x9e, 0xd1, 0xeb, 0x90, 0xed, 0x5a, 0xa3, 0x91, 0x41, 0xaa, 0x45, 0x66, 0xfb, 0x7c, 0xcc, - 0xd4, 0x99, 0x4e, 0x2b, 0xa1, 0x0a, 0x6d, 0xb4, 0x03, 0xe5, 0xa1, 0xe1, 0x10, 0xcd, 0x31, 0x75, - 0xdb, 0x19, 0x58, 0xc4, 0xa9, 0x2e, 0x31, 0xfb, 0x2b, 0xd3, 0xed, 0x77, 0x0c, 0x87, 0x1c, 0xb8, - 0xaa, 0xad, 0x84, 0x5a, 0x1a, 0x06, 0x05, 0xd4, 0x9b, 0x75, 0x74, 0x84, 0xc7, 0x9e, 0xbb, 0x6a, - 0x69, 0x96, 0xb7, 0x3d, 0xaa, 0xeb, 0x5a, 0x53, 0x6f, 0x56, 0x50, 0x80, 0xde, 0x87, 0x73, 0x43, - 0x4b, 0xef, 0x79, 0xce, 0xb4, 0xee, 0x60, 0x62, 0x3e, 0xaa, 0x96, 0x99, 0xcb, 0x97, 0x62, 0x26, - 0x68, 0xe9, 0x3d, 0xd7, 0x41, 0x83, 0xaa, 0xb7, 0x12, 0xea, 0xca, 0x30, 0x2a, 0x44, 0x1f, 0xc2, - 0xaa, 0x6e, 0xdb, 0xc3, 0xd3, 0xa8, 0xef, 0x65, 0xe6, 0xfb, 0xe5, 0xe9, 0xbe, 0x6b, 0xd4, 0x22, - 0xea, 0x1c, 0xe9, 0x67, 0xa4, 0xf5, 0x1c, 0x64, 0x8e, 0xf5, 0xe1, 0x04, 0x2b, 0x2f, 0x41, 0x31, - 0x10, 0xce, 0xa8, 0x0a, 0xb9, 0x11, 0x76, 0x1c, 0xbd, 0x8f, 0x59, 0xec, 0x17, 0x54, 0x77, 0xa8, - 0x94, 0x61, 0x29, 0x18, 0xc4, 0xca, 0xc8, 0x33, 0xa4, 0x01, 0x4a, 0x0d, 0x8f, 0xf1, 0xd8, 0xa1, - 0x51, 0x29, 0x0c, 0xc5, 0x10, 0x5d, 0x81, 0x12, 0x3b, 0x32, 0x9a, 0xfb, 0x9e, 0x22, 0x44, 0x5a, - 0x5d, 0x62, 0xc2, 0x43, 0xa1, 0xb4, 0x0e, 0x45, 0xfb, 0xba, 0xed, 0xa9, 0xa4, 0x98, 0x0a, 0xd8, - 0xd7, 0x6d, 0xa1, 0xa0, 0xdc, 0x82, 0x4a, 0x34, 0xae, 0x51, 0x05, 0x52, 0x8f, 0xf0, 0xa9, 0xf8, - 0x1e, 0x7d, 0x44, 0xab, 0x62, 0x59, 0xec, 0x1b, 0x05, 0x55, 0xac, 0xf1, 0xf3, 0xa4, 0x67, 0xec, - 0x85, 0x34, 0xfa, 0x01, 0xa4, 0x29, 0x2e, 0x7a, 0x10, 0xc7, 0x41, 0x73, 0xc3, 0x05, 0xcd, 0x8d, - 0xb6, 0x0b, 0x9a, 0xf5, 0xfc, 0x17, 0x5f, 0xad, 0x27, 0x3e, 0xfd, 0xcb, 0xba, 0xa4, 0x32, 0x0b, - 0x74, 0x91, 0x46, 0xa1, 0x6e, 0x98, 0x9a, 0xd1, 0x13, 0xdf, 0xc9, 0xb1, 0xf1, 0x56, 0x0f, 0x6d, - 0x41, 0xa5, 0x6b, 0x99, 0x0e, 0x36, 0x9d, 0x89, 0xa3, 0x71, 0x50, 0x16, 0xe0, 0x16, 0x8d, 0x94, - 0x86, 0xab, 0xb6, 0xcf, 0xb4, 0xd4, 0xe5, 0x6e, 0x58, 0x80, 0xee, 0x00, 0x1c, 0xeb, 0x43, 0xa3, - 0xa7, 0x13, 0x6b, 0xec, 0x54, 0xd3, 0x97, 0x53, 0x53, 0x9c, 0x1c, 0xba, 0x0a, 0x0f, 0xec, 0x9e, - 0x4e, 0x70, 0x3d, 0x4d, 0x67, 0xaa, 0x06, 0xec, 0xd0, 0x77, 0x60, 0x59, 0xb7, 0x6d, 0xcd, 0x21, - 0x3a, 0xc1, 0x5a, 0xe7, 0x94, 0x60, 0x87, 0x41, 0xde, 0x92, 0x5a, 0xd2, 0x6d, 0xfb, 0x80, 0x4a, - 0xeb, 0x54, 0x88, 0x5e, 0x84, 0x32, 0x05, 0x38, 0x43, 0x1f, 0x6a, 0x03, 0x6c, 0xf4, 0x07, 0x84, - 0x81, 0x5b, 0x4a, 0x2d, 0x09, 0x69, 0x8b, 0x09, 0x95, 0x9e, 0x77, 0x08, 0x18, 0xbc, 0x21, 0x04, - 0xe9, 0x9e, 0x4e, 0x74, 0xb6, 0x89, 0x4b, 0x2a, 0x7b, 0xa6, 0x32, 0x5b, 0x27, 0x03, 0xb1, 0x35, - 0xec, 0x19, 0x9d, 0x87, 0xac, 0x70, 0x9b, 0x62, 0x6e, 0xc5, 0x88, 0xfe, 0x5e, 0xf6, 0xd8, 0x3a, - 0xc6, 0x0c, 0xc9, 0xf3, 0x2a, 0x1f, 0x28, 0xff, 0x91, 0x60, 0xe5, 0x0c, 0x14, 0x52, 0xbf, 0x03, - 0xdd, 0x19, 0xb8, 0xdf, 0xa2, 0xcf, 0xe8, 0x26, 0xf5, 0xab, 0xf7, 0xf0, 0x58, 0xa4, 0x9d, 0xf3, - 0xfe, 0x06, 0xf1, 0x54, 0xda, 0x62, 0x6f, 0xc5, 0xc6, 0x08, 0x5d, 0x74, 0x0f, 0x2a, 0x43, 0xdd, - 0x21, 0x1a, 0x07, 0x18, 0x2d, 0x90, 0x82, 0xa2, 0x70, 0xba, 0xa3, 0xbb, 0x80, 0x44, 0x0f, 0xb9, - 0x70, 0x53, 0x1e, 0x86, 0xa4, 0x68, 0x1f, 0x56, 0x3b, 0xa7, 0x3f, 0xd7, 0x4d, 0x62, 0x98, 0x58, - 0x3b, 0xf3, 0x9b, 0x5d, 0x88, 0xb8, 0x6c, 0x1e, 0x1b, 0x3d, 0x6c, 0x76, 0xdd, 0x1f, 0xeb, 0x9c, - 0x67, 0xea, 0xfd, 0x98, 0x8e, 0xb2, 0x0f, 0xe5, 0x30, 0x90, 0xa3, 0x32, 0x24, 0xc9, 0x89, 0x58, - 0x7a, 0x92, 0x9c, 0xa0, 0x0d, 0x48, 0xd3, 0x05, 0xb2, 0x65, 0x97, 0xcf, 0x64, 0x4e, 0x61, 0xd5, - 0x3e, 0xb5, 0xb1, 0xca, 0xf4, 0x14, 0xc5, 0x8b, 0x00, 0x0f, 0xdc, 0xa3, 0x3e, 0x95, 0x57, 0x60, - 0x39, 0x82, 0xdf, 0x81, 0xdf, 0x4d, 0x0a, 0xfe, 0x6e, 0xca, 0x32, 0x94, 0x42, 0x70, 0xad, 0x9c, - 0x87, 0xd5, 0x69, 0xf8, 0xab, 0x1c, 0x79, 0xf2, 0x10, 0x92, 0xa2, 0x1b, 0x90, 0xf7, 0x00, 0x98, - 0x47, 0x60, 0x74, 0x9f, 0x5c, 0x55, 0xd5, 0x53, 0xa4, 0x81, 0x47, 0x0f, 0x33, 0x3b, 0x05, 0x49, - 0x36, 0xed, 0x9c, 0x6e, 0xdb, 0x2d, 0xdd, 0x19, 0x28, 0x1f, 0x41, 0x35, 0x0e, 0x5e, 0x23, 0x8b, - 0x48, 0x7b, 0x87, 0xef, 0x3c, 0x64, 0x8f, 0xac, 0xf1, 0x48, 0x27, 0xcc, 0x59, 0x49, 0x15, 0x23, - 0x7a, 0x28, 0x39, 0xd4, 0xa6, 0x98, 0x98, 0x0f, 0x14, 0x0d, 0x2e, 0xc6, 0x82, 0x2c, 0x35, 0x31, - 0xcc, 0x1e, 0xe6, 0xbb, 0x59, 0x52, 0xf9, 0xc0, 0x77, 0xc4, 0x27, 0xcb, 0x07, 0xf4, 0xb3, 0x0e, - 0x36, 0xe9, 0x99, 0x4d, 0xb1, 0x08, 0x11, 0x23, 0xe5, 0x4f, 0x79, 0xc8, 0xab, 0xd8, 0xb1, 0x29, - 0x0e, 0xa0, 0x77, 0xa0, 0x80, 0x4f, 0xba, 0x98, 0xd3, 0x1c, 0x29, 0x86, 0x2c, 0x70, 0xdd, 0xa6, - 0xab, 0x47, 0xb3, 0xb5, 0x67, 0x84, 0xae, 0x09, 0x0a, 0x17, 0xc7, 0xc7, 0x84, 0x71, 0x90, 0xc3, - 0xdd, 0x74, 0x39, 0x5c, 0x2a, 0x26, 0x41, 0x73, 0x9b, 0x08, 0x89, 0xbb, 0x26, 0x48, 0x5c, 0x7a, - 0xe6, 0x87, 0x42, 0x2c, 0xae, 0x16, 0x62, 0x71, 0x99, 0x99, 0xcb, 0x8b, 0xa1, 0x71, 0xb5, 0x10, - 0x8d, 0xcb, 0xce, 0x74, 0x11, 0xc3, 0xe3, 0x6e, 0xba, 0x3c, 0x2e, 0x37, 0x73, 0xb9, 0x11, 0x22, - 0x77, 0x27, 0x4c, 0xe4, 0x38, 0x0d, 0xfb, 0x56, 0x8c, 0x6d, 0x2c, 0x93, 0x7b, 0x2b, 0xc0, 0xe4, - 0x0a, 0x31, 0x54, 0x8a, 0xbb, 0x98, 0x42, 0xe5, 0x6a, 0x21, 0x2a, 0x07, 0x33, 0xd7, 0x1e, 0xc3, - 0xe5, 0xde, 0x0e, 0x72, 0xb9, 0x62, 0x0c, 0x19, 0x14, 0x47, 0x64, 0x1a, 0x99, 0x7b, 0xc3, 0x23, - 0x73, 0x4b, 0x31, 0x3c, 0x54, 0xcc, 0x3e, 0xca, 0xe6, 0xee, 0x9d, 0x61, 0x73, 0x9c, 0x7f, 0x7d, - 0x3b, 0xc6, 0xc1, 0x1c, 0x3a, 0x77, 0xef, 0x0c, 0x9d, 0x2b, 0xcf, 0x74, 0x37, 0x87, 0xcf, 0x3d, - 0x9c, 0xce, 0xe7, 0xe2, 0x38, 0x97, 0x98, 0xe2, 0x62, 0x84, 0xee, 0x27, 0x31, 0x84, 0xae, 0xc2, - 0x9c, 0xbf, 0x12, 0xe3, 0xfc, 0xd9, 0x19, 0xdd, 0x2b, 0x34, 0x79, 0x46, 0xa0, 0x81, 0x42, 0x11, - 0x1e, 0x8f, 0xad, 0xb1, 0x20, 0x4b, 0x7c, 0xa0, 0xbc, 0x4c, 0xd3, 0xb9, 0x0f, 0x04, 0x33, 0xd8, - 0x1f, 0x03, 0xfc, 0x40, 0xf8, 0x2b, 0xbf, 0x97, 0x7c, 0x5b, 0x96, 0x05, 0x83, 0x54, 0xa0, 0x20, - 0xa8, 0x40, 0x80, 0x14, 0x26, 0xc3, 0xa4, 0x70, 0x1d, 0x8a, 0x14, 0xca, 0x23, 0x7c, 0x4f, 0xb7, - 0x5d, 0xbe, 0x87, 0xae, 0xc2, 0x0a, 0xcb, 0xd1, 0x9c, 0x3a, 0x0a, 0xfc, 0x4e, 0xb3, 0x24, 0xb4, - 0x4c, 0x5f, 0xf0, 0x23, 0xc9, 0x81, 0xfc, 0x7b, 0x70, 0x2e, 0xa0, 0xeb, 0xa5, 0x08, 0x4e, 0x74, - 0x2a, 0x9e, 0x76, 0x4d, 0xe4, 0x8a, 0x7b, 0xfe, 0x06, 0xf9, 0x5c, 0x12, 0x41, 0xba, 0x6b, 0xf5, - 0xb0, 0x00, 0x70, 0xf6, 0x4c, 0xf9, 0xe5, 0xd0, 0xea, 0x0b, 0x98, 0xa6, 0x8f, 0x54, 0xcb, 0xc3, - 0xba, 0x02, 0x07, 0x33, 0xe5, 0x8f, 0x92, 0xef, 0xcf, 0xa7, 0x97, 0xd3, 0x98, 0xa0, 0xf4, 0xbf, - 0x60, 0x82, 0xc9, 0xaf, 0xc9, 0x04, 0x83, 0xc9, 0x33, 0x15, 0x4e, 0x9e, 0xff, 0x94, 0xfc, 0x5f, - 0xd7, 0xe3, 0x75, 0x5f, 0x6f, 0x37, 0xfc, 0x4c, 0x98, 0x61, 0xbf, 0x95, 0xc8, 0x84, 0x82, 0xa9, - 0x67, 0xd9, 0x77, 0xc3, 0x4c, 0x3d, 0xc7, 0x73, 0x23, 0x1b, 0xa0, 0xd7, 0xa1, 0xc0, 0xda, 0x23, - 0x9a, 0x65, 0x3b, 0x02, 0x5a, 0x2f, 0xfa, 0x2b, 0xe5, 0x7d, 0x90, 0x8d, 0x7d, 0xaa, 0xb1, 0x67, - 0x3b, 0x6a, 0xde, 0x16, 0x4f, 0x81, 0x14, 0x5f, 0x08, 0xf1, 0xcb, 0xe7, 0xa1, 0x40, 0xe7, 0xee, - 0xd8, 0x7a, 0x17, 0x33, 0xa0, 0x2c, 0xa8, 0xbe, 0x40, 0xf9, 0x10, 0xd0, 0x59, 0xa0, 0x46, 0x77, - 0x21, 0x8b, 0x8f, 0xb1, 0x49, 0xe8, 0xef, 0x45, 0xb7, 0x7a, 0xf5, 0x0c, 0x81, 0xc3, 0x26, 0xa9, - 0x57, 0xe9, 0x06, 0xff, 0xfd, 0xab, 0xf5, 0x0a, 0xd7, 0x7d, 0xd5, 0x1a, 0x19, 0x04, 0x8f, 0x6c, - 0x72, 0xaa, 0x0a, 0x6b, 0xe5, 0x17, 0x49, 0xca, 0xa7, 0x42, 0x20, 0x3e, 0x75, 0x5f, 0xdd, 0xc0, - 0x49, 0x06, 0x38, 0xf4, 0x62, 0x7b, 0xbd, 0x06, 0xd0, 0xd7, 0x1d, 0xed, 0xb1, 0x6e, 0x12, 0xdc, - 0x13, 0x1b, 0x1e, 0x90, 0x20, 0x19, 0xf2, 0x74, 0x34, 0x71, 0x70, 0x4f, 0xd0, 0x79, 0x6f, 0x1c, - 0x58, 0x65, 0xee, 0x9b, 0xac, 0x32, 0xbc, 0xc3, 0xf9, 0xe8, 0x0e, 0xff, 0x2a, 0xe9, 0xc7, 0x86, - 0x4f, 0x3c, 0xff, 0xdf, 0x76, 0xe1, 0xd7, 0xac, 0xfe, 0x0c, 0x67, 0x53, 0x74, 0x1f, 0x56, 0xbc, - 0xe8, 0xd4, 0x26, 0x2c, 0x6a, 0xdd, 0x13, 0xb7, 0x58, 0x70, 0x57, 0x8e, 0xc3, 0x62, 0x07, 0x1d, - 0xc2, 0x85, 0x08, 0xe6, 0x78, 0x8e, 0x93, 0x0b, 0x41, 0xcf, 0x73, 0x61, 0xe8, 0x71, 0xfd, 0xfa, - 0xbb, 0x94, 0xfa, 0x46, 0x11, 0xb1, 0x45, 0xcb, 0x9a, 0x20, 0x2f, 0x98, 0xfa, 0xab, 0x5f, 0x81, - 0xd2, 0x18, 0x13, 0x5a, 0x5f, 0x87, 0x4a, 0xc6, 0x25, 0x2e, 0x14, 0x85, 0xe8, 0x2e, 0x3c, 0x37, - 0x95, 0x21, 0xa0, 0xef, 0x43, 0xc1, 0xa7, 0x16, 0xd2, 0xd4, 0x0a, 0xcc, 0xab, 0x2c, 0x7c, 0x4d, - 0xe5, 0x0f, 0x92, 0xef, 0x30, 0x5c, 0xa9, 0x34, 0x20, 0x3b, 0xc6, 0xce, 0x64, 0xc8, 0xab, 0x87, - 0xf2, 0xf5, 0xef, 0x2e, 0xc2, 0x2c, 0xa8, 0x74, 0x32, 0x24, 0xaa, 0x30, 0x55, 0x7e, 0x0a, 0x59, - 0x2e, 0x41, 0x45, 0xc8, 0x3d, 0xd8, 0xdd, 0xde, 0xdd, 0x7b, 0x6f, 0xb7, 0x92, 0x40, 0x00, 0xd9, - 0x5a, 0xa3, 0xd1, 0xdc, 0x6f, 0x57, 0x24, 0x54, 0x80, 0x4c, 0xad, 0xbe, 0xa7, 0xb6, 0x2b, 0x49, - 0x2a, 0x56, 0x9b, 0x3f, 0x6e, 0x36, 0xda, 0x95, 0x14, 0x5a, 0x81, 0x12, 0x7f, 0xd6, 0xee, 0xee, - 0xa9, 0xf7, 0x6a, 0xed, 0x4a, 0x3a, 0x20, 0x3a, 0x68, 0xee, 0xde, 0x69, 0xaa, 0x95, 0x8c, 0x72, - 0x8d, 0x16, 0x27, 0x31, 0x6c, 0xc4, 0x2f, 0x43, 0xa4, 0x40, 0x19, 0xa2, 0xfc, 0x36, 0x09, 0x72, - 0x3c, 0xc9, 0x40, 0xad, 0xc8, 0xb2, 0x5f, 0x5b, 0x98, 0x9f, 0x44, 0xd6, 0x8e, 0x5e, 0x84, 0xf2, - 0x18, 0x1f, 0x61, 0xd2, 0x1d, 0x70, 0xc2, 0xc3, 0x53, 0x58, 0x49, 0x2d, 0x09, 0x29, 0x33, 0x72, - 0xb8, 0xda, 0xcf, 0x70, 0x97, 0x68, 0xbc, 0x1e, 0xe2, 0x87, 0xad, 0x40, 0xd5, 0xa8, 0xf4, 0x80, - 0x0b, 0x95, 0x8f, 0x9e, 0x69, 0x27, 0x0b, 0x90, 0x51, 0x9b, 0x6d, 0xf5, 0xfd, 0x4a, 0x0a, 0x21, - 0x28, 0xb3, 0x47, 0xed, 0x60, 0xb7, 0xb6, 0x7f, 0xd0, 0xda, 0xa3, 0x3b, 0x79, 0x0e, 0x96, 0xdd, - 0x9d, 0x74, 0x85, 0x19, 0xe5, 0x5f, 0x12, 0x2c, 0x47, 0x02, 0x03, 0xbd, 0x06, 0x19, 0x4e, 0x95, - 0xa7, 0x37, 0xc4, 0x59, 0x44, 0x8b, 0x18, 0xe2, 0x8a, 0xe8, 0x16, 0xe4, 0xb1, 0xa8, 0xf4, 0xcf, - 0x06, 0x1f, 0xef, 0x4d, 0xb8, 0x9d, 0x00, 0x61, 0xe8, 0xe9, 0xa3, 0xdb, 0x50, 0xf0, 0x62, 0x5b, - 0xd4, 0x62, 0xeb, 0x51, 0x63, 0x0f, 0x13, 0x84, 0xb5, 0x6f, 0x81, 0xde, 0xf0, 0x59, 0x57, 0x3a, - 0x4a, 0xce, 0x85, 0x31, 0x7f, 0x2d, 0x4c, 0x5d, 0x6d, 0xa5, 0x01, 0xc5, 0xc0, 0x4a, 0xd0, 0x25, - 0x28, 0x8c, 0xf4, 0x13, 0xd1, 0x35, 0xe2, 0xf5, 0x7f, 0x7e, 0xa4, 0x9f, 0xf0, 0x86, 0xd1, 0x05, - 0xc8, 0xd1, 0x97, 0x7d, 0x9d, 0x63, 0x4b, 0x4a, 0xcd, 0x8e, 0xf4, 0x93, 0x77, 0x75, 0x47, 0xf9, - 0x00, 0xca, 0xe1, 0xae, 0x09, 0x3d, 0x7f, 0x63, 0x6b, 0x62, 0xf6, 0x98, 0x8f, 0x8c, 0xca, 0x07, - 0xe8, 0x06, 0x64, 0x8e, 0x2d, 0x0e, 0x4d, 0xd3, 0x82, 0xf4, 0xd0, 0x22, 0x38, 0xd0, 0x73, 0xe1, - 0xba, 0xca, 0x09, 0x64, 0x18, 0xd8, 0x50, 0xe0, 0x60, 0xfd, 0x0f, 0xc1, 0x36, 0xe9, 0x33, 0xfa, - 0x00, 0x40, 0x27, 0x64, 0x6c, 0x74, 0x26, 0xbe, 0xdb, 0x17, 0xa6, 0x41, 0x55, 0xcd, 0xd5, 0xaa, - 0x3f, 0x2f, 0x30, 0x6b, 0xd5, 0x37, 0x0c, 0xe0, 0x56, 0xc0, 0x9d, 0xb2, 0x0b, 0xe5, 0xb0, 0x6d, - 0xb0, 0xfb, 0xb8, 0x34, 0xa5, 0xfb, 0xe8, 0x71, 0x1a, 0x8f, 0x11, 0xa5, 0x78, 0x8f, 0x8b, 0x0d, - 0x94, 0xdf, 0x48, 0x90, 0x6f, 0x9f, 0x88, 0xa3, 0x1c, 0xd3, 0x66, 0xf1, 0x4d, 0x93, 0xc1, 0xb6, - 0x02, 0xef, 0xdb, 0xa4, 0xbc, 0x5e, 0xd0, 0xdb, 0x5e, 0xa8, 0xa6, 0x17, 0x2b, 0x05, 0xdd, 0x76, - 0x98, 0x00, 0xa7, 0xb7, 0xa0, 0xe0, 0x9d, 0x26, 0x4a, 0xd9, 0xf5, 0x5e, 0x6f, 0x8c, 0x1d, 0x47, - 0xac, 0xcc, 0x1d, 0xb2, 0x5e, 0x9d, 0xf5, 0x58, 0xb4, 0x2d, 0x52, 0x2a, 0x1f, 0x28, 0x1d, 0x58, - 0x8e, 0xa4, 0x27, 0xf4, 0x26, 0xe4, 0xec, 0x49, 0x47, 0x73, 0x37, 0x27, 0x14, 0x2e, 0x2e, 0x85, - 0x9b, 0x74, 0x86, 0x46, 0x77, 0x1b, 0x9f, 0xba, 0x53, 0xb1, 0x27, 0x9d, 0x6d, 0xbe, 0x83, 0xfc, - 0x1b, 0xc9, 0xe0, 0x37, 0x7e, 0x27, 0x41, 0xde, 0x3d, 0x0f, 0xe8, 0x87, 0xc1, 0xe0, 0xe0, 0xfe, - 0xab, 0x71, 0xf9, 0x52, 0x78, 0x0f, 0xc4, 0xc6, 0x55, 0x58, 0x71, 0x8c, 0xbe, 0x89, 0x7b, 0x9a, - 0x5f, 0x31, 0xb0, 0x8f, 0xe5, 0xd5, 0x65, 0xfe, 0x62, 0xc7, 0x2d, 0x17, 0x90, 0x02, 0x4b, 0xc7, - 0x16, 0x31, 0xcc, 0xbe, 0xc6, 0xe7, 0xf4, 0xb7, 0x1c, 0x9b, 0x54, 0x91, 0x0b, 0xf7, 0xd9, 0xd4, - 0xfe, 0x2d, 0x41, 0xde, 0x8d, 0x63, 0xb4, 0x19, 0x38, 0x94, 0xe5, 0x33, 0x9d, 0x10, 0x57, 0xcd, - 0xef, 0xca, 0x85, 0xd7, 0x92, 0x7c, 0xd6, 0xb5, 0xc4, 0x35, 0x55, 0xdd, 0xce, 0x76, 0xfa, 0x99, - 0x3b, 0xdb, 0xaf, 0x02, 0x22, 0x16, 0xd1, 0x87, 0x5a, 0x68, 0xdd, 0x9c, 0x52, 0x55, 0xd8, 0x9b, - 0xc3, 0xc0, 0xda, 0x7f, 0x29, 0x41, 0xde, 0x4b, 0x93, 0xcf, 0xda, 0x64, 0x3b, 0x0f, 0x59, 0x91, - 0x0d, 0x78, 0x97, 0x4d, 0x8c, 0xbc, 0x2e, 0x6f, 0x3a, 0xd0, 0xe5, 0x95, 0x21, 0x3f, 0xc2, 0x44, - 0x67, 0x4c, 0x81, 0x17, 0x75, 0xde, 0xf8, 0xea, 0x9b, 0x50, 0x0c, 0x74, 0x3b, 0x69, 0x50, 0xee, - 0x36, 0xdf, 0xab, 0x24, 0xe4, 0xdc, 0x27, 0x9f, 0x5d, 0x4e, 0xed, 0xe2, 0xc7, 0xf4, 0x40, 0xab, - 0xcd, 0x46, 0xab, 0xd9, 0xd8, 0xae, 0x48, 0x72, 0xf1, 0x93, 0xcf, 0x2e, 0xe7, 0x54, 0xcc, 0x1a, - 0x29, 0x57, 0x5b, 0xb0, 0x14, 0xfc, 0x4d, 0xc2, 0x09, 0x05, 0x41, 0xf9, 0xce, 0x83, 0xfd, 0x9d, - 0xad, 0x46, 0xad, 0xdd, 0xd4, 0x0e, 0xf7, 0xda, 0xcd, 0x8a, 0x84, 0x2e, 0xc0, 0xb9, 0x9d, 0xad, - 0x77, 0x5b, 0x6d, 0xad, 0xb1, 0xb3, 0xd5, 0xdc, 0x6d, 0x6b, 0xb5, 0x76, 0xbb, 0xd6, 0xd8, 0xae, - 0x24, 0xaf, 0x7f, 0x5e, 0x80, 0xe5, 0x5a, 0xbd, 0xb1, 0x45, 0x93, 0xa1, 0xd1, 0xd5, 0x59, 0x41, - 0xf9, 0x23, 0x48, 0xb3, 0x9a, 0x7a, 0xc6, 0xe5, 0xa9, 0x3c, 0xab, 0x2b, 0x87, 0xea, 0x90, 0x61, - 0xa5, 0x36, 0x9a, 0x75, 0x97, 0x2a, 0xcf, 0x6c, 0xd2, 0xd1, 0x49, 0xb0, 0xa0, 0x99, 0x71, 0xb5, - 0x2a, 0xcf, 0xea, 0xd8, 0xa1, 0x5d, 0x28, 0xf8, 0x35, 0xf2, 0xbc, 0x8b, 0x56, 0x79, 0x6e, 0x0f, - 0x8f, 0xfa, 0xf3, 0xeb, 0x80, 0x79, 0xd7, 0x8f, 0xf2, 0x5c, 0x24, 0x43, 0x2d, 0xc8, 0xb9, 0xb5, - 0xd5, 0xec, 0xab, 0x50, 0x79, 0x4e, 0x7f, 0x8d, 0x6e, 0x37, 0xaf, 0x7d, 0x67, 0xdd, 0xe7, 0xca, - 0x33, 0x9b, 0x84, 0xa8, 0x09, 0x59, 0x41, 0x6c, 0x67, 0x5e, 0x6e, 0xca, 0xb3, 0xbb, 0x65, 0x74, - 0x93, 0xfc, 0x46, 0xc2, 0xbc, 0xbb, 0x69, 0x79, 0x6e, 0xd7, 0x13, 0xdd, 0x07, 0x08, 0xd4, 0xb7, - 0x73, 0x2f, 0x9d, 0xe5, 0xf9, 0xdd, 0x4c, 0xb4, 0x0d, 0x79, 0xaf, 0x92, 0x99, 0x73, 0x09, 0x2c, - 0xcf, 0x6b, 0x2c, 0xa2, 0x87, 0x50, 0x0a, 0x93, 0xf8, 0x45, 0xae, 0x76, 0xe5, 0x85, 0x3a, 0x86, - 0xd4, 0x77, 0x98, 0xcf, 0x2f, 0x72, 0xd1, 0x2b, 0x2f, 0xd4, 0x3e, 0x44, 0x47, 0xb0, 0x72, 0x96, - 0x6d, 0x2f, 0x7a, 0xeb, 0x2b, 0x2f, 0xdc, 0x4e, 0x44, 0x06, 0xa0, 0x29, 0x0c, 0x7d, 0xe1, 0x2b, - 0x60, 0x79, 0xf1, 0xde, 0x62, 0xfd, 0xf6, 0x17, 0x4f, 0xd6, 0xa4, 0x2f, 0x9f, 0xac, 0x49, 0x7f, - 0x7d, 0xb2, 0x26, 0x7d, 0xfa, 0x74, 0x2d, 0xf1, 0xe5, 0xd3, 0xb5, 0xc4, 0x9f, 0x9f, 0xae, 0x25, - 0x1e, 0x5e, 0xe9, 0x1b, 0x64, 0x30, 0xe9, 0x6c, 0x74, 0xad, 0xd1, 0xe6, 0xd0, 0x30, 0xf1, 0xe6, - 0x94, 0x7f, 0xc0, 0x74, 0xb2, 0x2c, 0xc9, 0xdc, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9b, - 0x97, 0x59, 0xff, 0x1f, 0x23, 0x00, 0x00, + // 2889 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcb, 0x73, 0xe3, 0xc6, + 0xd1, 0x27, 0xf8, 0x46, 0x4b, 0xa4, 0xa8, 0x59, 0x79, 0x97, 0x8b, 0xb5, 0xa5, 0xfd, 0xb0, 0x9f, + 0x63, 0x7b, 0x63, 0x4b, 0xf6, 0xae, 0x63, 0xc7, 0x76, 0xec, 0x98, 0xe2, 0xd2, 0xa6, 0x2c, 0xad, + 0xa4, 0x85, 0x68, 0xb9, 0xfc, 0x0a, 0x0c, 0x82, 0x23, 0x12, 0x59, 0x12, 0x80, 0x09, 0x50, 0x96, + 0x72, 0x4b, 0x52, 0xa9, 0x4a, 0xf9, 0xe4, 0x5c, 0x52, 0xb9, 0xf8, 0xff, 0xc8, 0x21, 0x55, 0x39, + 0xc6, 0x47, 0x1f, 0x73, 0x72, 0x52, 0xde, 0x4a, 0x55, 0x2a, 0xf7, 0x54, 0x2a, 0x97, 0x24, 0x35, + 0x0f, 0x3c, 0x05, 0x80, 0x5c, 0x3b, 0xb7, 0xdc, 0x66, 0x1a, 0xdd, 0x8d, 0xe9, 0x41, 0x4f, 0xf7, + 0xaf, 0x7b, 0x00, 0x57, 0x2d, 0xc7, 0x9d, 0x6a, 0xba, 0x65, 0x6e, 0x69, 0x7d, 0xdd, 0xd8, 0x72, + 0xcf, 0x6d, 0xec, 0x6c, 0xda, 0x53, 0xcb, 0xb5, 0x50, 0xcd, 0x7b, 0xb4, 0x49, 0x1e, 0x49, 0xd7, + 0x7c, 0x4e, 0x7d, 0x7a, 0x6e, 0xbb, 0xd6, 0x96, 0x3d, 0xb5, 0xac, 0x13, 0xc6, 0x2b, 0x49, 0xfe, + 0x43, 0xaa, 0x21, 0xac, 0x27, 0xf4, 0x8c, 0x0b, 0xde, 0xc7, 0xe7, 0xde, 0xb3, 0x6b, 0x31, 0x39, + 0x5b, 0x9b, 0x6a, 0x13, 0xef, 0xe1, 0xc6, 0xd0, 0xb2, 0x86, 0x63, 0xbc, 0x45, 0x67, 0xfd, 0xd9, + 0xc9, 0x96, 0x6b, 0x4c, 0xb0, 0xe3, 0x6a, 0x13, 0x9b, 0x33, 0xac, 0x0d, 0xad, 0xa1, 0x45, 0x87, + 0x5b, 0x64, 0xc4, 0xa8, 0xf2, 0xaf, 0x44, 0xa8, 0x28, 0xf8, 0xe3, 0x19, 0x76, 0x5c, 0xf4, 0x2c, + 0x14, 0xb1, 0x3e, 0xb2, 0x9a, 0xc2, 0x75, 0xe1, 0xc9, 0xa5, 0x5b, 0xd2, 0x66, 0xc4, 0xa4, 0x4d, + 0xce, 0xd5, 0xd1, 0x47, 0x56, 0x37, 0xa7, 0x50, 0x4e, 0x74, 0x1b, 0x4a, 0x27, 0xe3, 0x99, 0x33, + 0x6a, 0xe6, 0xa9, 0xc8, 0xb5, 0x64, 0x91, 0x37, 0x08, 0x4b, 0x37, 0xa7, 0x30, 0x5e, 0xf2, 0x1a, + 0xc3, 0x3c, 0xb1, 0x9a, 0x85, 0xac, 0xd7, 0xec, 0x98, 0x27, 0xf4, 0x35, 0x84, 0x13, 0xbd, 0x0e, + 0xe0, 0x60, 0x57, 0xb5, 0x6c, 0xd7, 0xb0, 0xcc, 0x66, 0x91, 0xca, 0x6d, 0x24, 0xcb, 0x1d, 0x61, + 0xf7, 0x80, 0xb2, 0x75, 0x73, 0x8a, 0xe8, 0x78, 0x13, 0xa2, 0xc1, 0x30, 0x0d, 0x57, 0xd5, 0x47, + 0x9a, 0x61, 0x36, 0x4b, 0x59, 0x1a, 0x76, 0x4c, 0xc3, 0x6d, 0x13, 0x36, 0xa2, 0xc1, 0xf0, 0x26, + 0xc4, 0xd4, 0x8f, 0x67, 0x78, 0x7a, 0xde, 0x2c, 0x67, 0x99, 0x7a, 0x8f, 0xb0, 0x10, 0x53, 0x29, + 0x2f, 0x6a, 0xc3, 0x52, 0x1f, 0x0f, 0x0d, 0x53, 0xed, 0x8f, 0x2d, 0xfd, 0x7e, 0xb3, 0x42, 0x45, + 0xaf, 0x27, 0x8b, 0x6e, 0x13, 0xc6, 0x6d, 0xc2, 0xd7, 0xcd, 0x29, 0xd0, 0xf7, 0x67, 0xe8, 0x65, + 0xa8, 0xea, 0x23, 0xac, 0xdf, 0x57, 0xdd, 0xb3, 0x66, 0x95, 0x6a, 0x78, 0x2c, 0x59, 0x43, 0x9b, + 0x70, 0xf5, 0xce, 0xba, 0x39, 0xa5, 0xa2, 0xb3, 0x21, 0xb1, 0x7b, 0x80, 0xc7, 0xc6, 0x29, 0x9e, + 0x12, 0x69, 0x31, 0xcb, 0xee, 0x3b, 0x8c, 0x8f, 0xca, 0x8b, 0x03, 0x6f, 0x82, 0x5e, 0x05, 0x11, + 0x9b, 0x03, 0x6e, 0x00, 0x50, 0x05, 0xeb, 0x29, 0x9e, 0x61, 0x0e, 0xbc, 0xe5, 0x57, 0x31, 0x1f, + 0xa3, 0x17, 0xa0, 0xac, 0x5b, 0x93, 0x89, 0xe1, 0x36, 0x97, 0xa8, 0xec, 0xa3, 0x29, 0x4b, 0xa7, + 0x3c, 0xdd, 0x9c, 0xc2, 0xb9, 0xd1, 0x1e, 0xd4, 0xc7, 0x86, 0xe3, 0xaa, 0x8e, 0xa9, 0xd9, 0xce, + 0xc8, 0x72, 0x9d, 0xe6, 0x32, 0x95, 0xbf, 0x91, 0x2c, 0xbf, 0x67, 0x38, 0xee, 0x91, 0xc7, 0xda, + 0xcd, 0x29, 0xb5, 0x71, 0x98, 0x40, 0xb4, 0x59, 0x27, 0x27, 0x78, 0xea, 0xab, 0x6b, 0xd6, 0xb2, + 0xb4, 0x1d, 0x10, 0x5e, 0x4f, 0x9a, 0x68, 0xb3, 0xc2, 0x04, 0xf4, 0x2e, 0x5c, 0x1a, 0x5b, 0xda, + 0xc0, 0x57, 0xa6, 0xea, 0xa3, 0x99, 0x79, 0xbf, 0x59, 0xa7, 0x2a, 0x9f, 0x48, 0x59, 0xa0, 0xa5, + 0x0d, 0x3c, 0x05, 0x6d, 0xc2, 0xde, 0xcd, 0x29, 0xab, 0xe3, 0x38, 0x11, 0x7d, 0x00, 0x6b, 0x9a, + 0x6d, 0x8f, 0xcf, 0xe3, 0xba, 0x57, 0xa8, 0xee, 0x27, 0x93, 0x75, 0xb7, 0x88, 0x44, 0x5c, 0x39, + 0xd2, 0x2e, 0x50, 0xd1, 0x21, 0x34, 0x98, 0x3b, 0x4e, 0xb1, 0xef, 0x51, 0x03, 0xaa, 0xf9, 0xff, + 0x33, 0x7c, 0x52, 0xc1, 0xba, 0xef, 0x58, 0xf5, 0x7e, 0x84, 0x82, 0xde, 0x82, 0x3a, 0xf1, 0x8e, + 0x90, 0x3e, 0x4c, 0xf5, 0xc9, 0xa9, 0x2e, 0x12, 0xd6, 0xb6, 0x8c, 0x43, 0xf3, 0xed, 0x0a, 0x94, + 0x4e, 0xb5, 0xf1, 0x0c, 0xcb, 0x4f, 0xc0, 0x52, 0x28, 0xd8, 0xa0, 0x26, 0x54, 0x26, 0xd8, 0x71, + 0xb4, 0x21, 0xa6, 0x91, 0x49, 0x54, 0xbc, 0xa9, 0x5c, 0x87, 0xe5, 0x70, 0x88, 0x91, 0x27, 0xbe, + 0x20, 0x09, 0x1f, 0x44, 0xf0, 0x14, 0x4f, 0x1d, 0x12, 0x33, 0xb8, 0x20, 0x9f, 0xa2, 0x1b, 0x50, + 0xa3, 0x0e, 0xad, 0x7a, 0xcf, 0x49, 0xfc, 0x2a, 0x2a, 0xcb, 0x94, 0x78, 0xcc, 0x99, 0x36, 0x60, + 0xc9, 0xbe, 0x65, 0xfb, 0x2c, 0x05, 0xca, 0x02, 0xf6, 0x2d, 0x9b, 0x33, 0xc8, 0x2f, 0x43, 0x23, + 0x1e, 0x75, 0x50, 0x03, 0x0a, 0xf7, 0xf1, 0x39, 0x7f, 0x1f, 0x19, 0xa2, 0x35, 0x6e, 0x16, 0x7d, + 0x87, 0xa8, 0x70, 0x1b, 0xff, 0x90, 0xf7, 0x85, 0xfd, 0x80, 0x83, 0xbe, 0x0f, 0x45, 0x12, 0xb5, + 0xfd, 0x00, 0xcc, 0x42, 0xfa, 0xa6, 0x17, 0xd2, 0x37, 0x7b, 0x5e, 0x48, 0xdf, 0xae, 0x7e, 0xf1, + 0xd5, 0x46, 0xee, 0xb3, 0x3f, 0x6d, 0x08, 0x0a, 0x95, 0x40, 0x57, 0x49, 0x8c, 0xd0, 0x0c, 0x53, + 0x35, 0x06, 0xfc, 0x3d, 0x15, 0x3a, 0xdf, 0x19, 0xa0, 0x1d, 0x68, 0xe8, 0x96, 0xe9, 0x60, 0xd3, + 0x99, 0x39, 0x2a, 0x4b, 0x19, 0x3c, 0xf4, 0xc6, 0xcf, 0x71, 0xdb, 0x63, 0x3b, 0xa4, 0x5c, 0xca, + 0x8a, 0x1e, 0x25, 0xa0, 0x3b, 0x00, 0xa7, 0xda, 0xd8, 0x18, 0x68, 0xae, 0x35, 0x75, 0x9a, 0xc5, + 0xeb, 0x85, 0x04, 0x25, 0xc7, 0x1e, 0xc3, 0xdb, 0xf6, 0x40, 0x73, 0xf1, 0x76, 0x91, 0xac, 0x54, + 0x09, 0xc9, 0xa1, 0xef, 0xc0, 0x8a, 0x66, 0xdb, 0xaa, 0xe3, 0x6a, 0x2e, 0x56, 0xfb, 0xe7, 0x2e, + 0x76, 0x68, 0x40, 0x5e, 0x56, 0x6a, 0x9a, 0x6d, 0x1f, 0x11, 0xea, 0x36, 0x21, 0xa2, 0xc7, 0xa1, + 0x4e, 0xc2, 0xaf, 0xa1, 0x8d, 0xd5, 0x11, 0x36, 0x86, 0x23, 0x97, 0x86, 0xde, 0x82, 0x52, 0xe3, + 0xd4, 0x2e, 0x25, 0xca, 0x03, 0xdf, 0x09, 0x68, 0xf0, 0x45, 0x08, 0x8a, 0x03, 0xcd, 0xd5, 0xe8, + 0x26, 0x2e, 0x2b, 0x74, 0x4c, 0x68, 0xb6, 0xe6, 0x8e, 0xf8, 0xd6, 0xd0, 0x31, 0xba, 0x0c, 0x65, + 0xae, 0xb6, 0x40, 0xd5, 0xf2, 0x19, 0xf9, 0x5e, 0xf6, 0xd4, 0x3a, 0xc5, 0x34, 0xcf, 0x54, 0x15, + 0x36, 0x91, 0xff, 0x25, 0xc0, 0xea, 0x85, 0x40, 0x4d, 0xf4, 0x8e, 0x34, 0x67, 0xe4, 0xbd, 0x8b, + 0x8c, 0xd1, 0xf3, 0x44, 0xaf, 0x36, 0xc0, 0x53, 0x9e, 0x14, 0x2f, 0x07, 0x1b, 0xc4, 0x12, 0x7d, + 0x97, 0x3e, 0xe5, 0x1b, 0xc3, 0x79, 0xd1, 0x5d, 0x68, 0x8c, 0x35, 0xc7, 0x55, 0x59, 0xf8, 0x53, + 0x43, 0x09, 0x32, 0x1e, 0xec, 0xf7, 0x34, 0x2f, 0x5c, 0x12, 0x27, 0xe7, 0x6a, 0xea, 0xe3, 0x08, + 0x15, 0x1d, 0xc2, 0x5a, 0xff, 0xfc, 0x27, 0x9a, 0xe9, 0x1a, 0x26, 0x56, 0x2f, 0x7c, 0xb3, 0x2b, + 0x31, 0x95, 0x9d, 0x53, 0x63, 0x80, 0x4d, 0xdd, 0xfb, 0x58, 0x97, 0x7c, 0x51, 0xff, 0x63, 0x3a, + 0xf2, 0x21, 0xd4, 0xa3, 0x69, 0x06, 0xd5, 0x21, 0xef, 0x9e, 0x71, 0xd3, 0xf3, 0xee, 0x19, 0xda, + 0x84, 0x22, 0x31, 0x90, 0x9a, 0x5d, 0xbf, 0x90, 0xd7, 0xb9, 0x54, 0xef, 0xdc, 0xc6, 0x0a, 0xe5, + 0x93, 0x65, 0xff, 0x04, 0xf8, 0xa9, 0x27, 0xae, 0x53, 0x7e, 0x0a, 0x56, 0x62, 0xd9, 0x25, 0xf4, + 0xdd, 0x84, 0xf0, 0x77, 0x93, 0x57, 0xa0, 0x16, 0x49, 0x26, 0xf2, 0x65, 0x58, 0x4b, 0xca, 0x0e, + 0xf2, 0x89, 0x4f, 0x8f, 0xc4, 0x79, 0x74, 0x1b, 0xaa, 0x7e, 0x7a, 0x60, 0x27, 0x30, 0xbe, 0x4f, + 0x1e, 0xab, 0xe2, 0x33, 0x92, 0x83, 0x47, 0x9c, 0x99, 0x7a, 0x41, 0x9e, 0x2e, 0xbb, 0xa2, 0xd9, + 0x76, 0x57, 0x73, 0x46, 0xf2, 0x47, 0xd0, 0x4c, 0x0b, 0xfe, 0x31, 0x23, 0x8a, 0xbe, 0xf3, 0x5d, + 0x86, 0xf2, 0x89, 0x35, 0x9d, 0x68, 0x2e, 0x55, 0x56, 0x53, 0xf8, 0x8c, 0x38, 0x25, 0x4b, 0x04, + 0x05, 0x4a, 0x66, 0x13, 0x59, 0x85, 0xab, 0xa9, 0x29, 0x80, 0x88, 0x18, 0xe6, 0x00, 0xb3, 0xdd, + 0xac, 0x29, 0x6c, 0x12, 0x28, 0x62, 0x8b, 0x65, 0x13, 0xf2, 0x5a, 0x07, 0x9b, 0xc4, 0x67, 0x0b, + 0xf4, 0x84, 0xf0, 0x99, 0x7c, 0x17, 0x1e, 0x49, 0xcc, 0x04, 0x21, 0x27, 0x17, 0x16, 0x77, 0x72, + 0xf9, 0x19, 0xb8, 0x94, 0x90, 0x08, 0x52, 0xbf, 0xe8, 0x5f, 0x44, 0xa8, 0x2a, 0xd8, 0xb1, 0x49, + 0x14, 0x42, 0xaf, 0x83, 0x88, 0xcf, 0x74, 0xcc, 0x20, 0xa0, 0x90, 0x02, 0xa4, 0x18, 0x6f, 0xc7, + 0xe3, 0x23, 0x48, 0xc6, 0x17, 0x42, 0xcf, 0x71, 0x78, 0x9b, 0x86, 0x55, 0xb9, 0x70, 0x18, 0xdf, + 0x3e, 0xef, 0xe1, 0xdb, 0x42, 0x0a, 0x78, 0x61, 0x32, 0x31, 0x80, 0xfb, 0x1c, 0x07, 0xb8, 0xc5, + 0xcc, 0x17, 0x45, 0x10, 0x6e, 0x2b, 0x82, 0x70, 0x4b, 0x99, 0xe6, 0xa5, 0x40, 0xdc, 0x56, 0x04, + 0xe2, 0x96, 0x33, 0x55, 0xa4, 0x60, 0xdc, 0xe7, 0x3d, 0x8c, 0x5b, 0xc9, 0x34, 0x37, 0x06, 0x72, + 0xef, 0x44, 0x41, 0x2e, 0x83, 0xa8, 0xff, 0x97, 0x22, 0x9b, 0x8a, 0x72, 0x5f, 0x09, 0xa1, 0x5c, + 0x31, 0x05, 0x66, 0x32, 0x15, 0x09, 0x30, 0xb7, 0x15, 0x81, 0xb9, 0x90, 0x69, 0x7b, 0x0a, 0xce, + 0x7d, 0x2d, 0x8c, 0x73, 0x97, 0x52, 0x80, 0x32, 0x77, 0x91, 0x24, 0xa0, 0xfb, 0xa2, 0x0f, 0x74, + 0x97, 0x53, 0x30, 0x3a, 0x5f, 0x7d, 0x1c, 0xe9, 0xde, 0xbd, 0x80, 0x74, 0x6b, 0x29, 0x90, 0x8c, + 0x29, 0x98, 0x03, 0x75, 0xef, 0x5e, 0x80, 0xba, 0xf5, 0x4c, 0x75, 0x73, 0xb0, 0xee, 0x7b, 0xc9, + 0x58, 0x37, 0x0d, 0x8f, 0xf2, 0x25, 0x2e, 0x06, 0x76, 0x3f, 0x4c, 0x01, 0xbb, 0x0d, 0xaa, 0xfc, + 0xa9, 0x14, 0xe5, 0x0b, 0xa3, 0xdd, 0x7b, 0xa9, 0x68, 0xf7, 0xf1, 0x2c, 0xe7, 0xcc, 0x82, 0xbb, + 0xbb, 0x29, 0x70, 0xf7, 0x46, 0xba, 0xa7, 0x2c, 0x80, 0x77, 0x9f, 0x22, 0xd0, 0x22, 0x16, 0xba, + 0x48, 0xa0, 0xc6, 0xd3, 0xa9, 0x35, 0xe5, 0x50, 0x92, 0x4d, 0xe4, 0x27, 0x09, 0xd8, 0x09, 0x02, + 0x55, 0x06, 0x36, 0xa6, 0xe9, 0x30, 0x14, 0x9e, 0xe4, 0xdf, 0x0a, 0x81, 0x2c, 0xc5, 0x08, 0x61, + 0xa0, 0x24, 0x72, 0xa0, 0x14, 0x82, 0xcc, 0xf9, 0x28, 0x64, 0xde, 0x80, 0x25, 0x92, 0xe8, 0x62, + 0x68, 0x58, 0xb3, 0x3d, 0x34, 0x8c, 0x6e, 0xc2, 0x2a, 0x45, 0x30, 0x0c, 0x58, 0xf3, 0x80, 0x5e, + 0xa4, 0x01, 0x7d, 0x85, 0x3c, 0x60, 0x47, 0x86, 0xa5, 0xb9, 0x67, 0xe0, 0x52, 0x88, 0xd7, 0x4f, + 0xa0, 0x0c, 0x06, 0x36, 0x7c, 0xee, 0x16, 0xcf, 0xa4, 0x77, 0x83, 0x0d, 0x0a, 0x90, 0x36, 0x82, + 0xa2, 0x6e, 0x0d, 0x30, 0x4f, 0x6f, 0x74, 0x4c, 0xd0, 0xf7, 0xd8, 0x1a, 0xf2, 0x24, 0x46, 0x86, + 0x84, 0xcb, 0x8f, 0xc5, 0x22, 0x0b, 0xb6, 0xf2, 0xef, 0x85, 0x40, 0x5f, 0x00, 0xbe, 0x93, 0x70, + 0xb2, 0xf0, 0xdf, 0xc0, 0xc9, 0xf9, 0x6f, 0x88, 0x93, 0xc3, 0xd0, 0xa2, 0x10, 0x85, 0x16, 0x7f, + 0x17, 0x82, 0xaf, 0xeb, 0xa3, 0xde, 0x6f, 0xb6, 0x1b, 0x01, 0x4e, 0x28, 0xd1, 0x6f, 0xc5, 0x71, + 0x02, 0xaf, 0x63, 0xca, 0xf4, 0xbd, 0xd1, 0x3a, 0xa6, 0xc2, 0x90, 0x03, 0x9d, 0xa0, 0x17, 0x40, + 0xa4, 0xad, 0x2d, 0xd5, 0xb2, 0x1d, 0x1e, 0xfa, 0xaf, 0x06, 0x96, 0xb2, 0x1e, 0xd6, 0xe6, 0x21, + 0xe1, 0x38, 0xb0, 0x1d, 0xa5, 0x6a, 0xf3, 0x51, 0x28, 0xe7, 0x8b, 0x11, 0xf4, 0xfd, 0x28, 0x88, + 0x64, 0xed, 0x8e, 0xad, 0xe9, 0x98, 0x06, 0x72, 0x51, 0x09, 0x08, 0xf2, 0x07, 0x80, 0x2e, 0x26, + 0x12, 0xf4, 0x06, 0x94, 0xf1, 0x29, 0x36, 0x5d, 0xf2, 0xbd, 0xc8, 0x56, 0xaf, 0x5d, 0x80, 0xb7, + 0xd8, 0x74, 0xb7, 0x9b, 0x64, 0x83, 0xff, 0xf6, 0xd5, 0x46, 0x83, 0xf1, 0x3e, 0x6d, 0x4d, 0x0c, + 0x17, 0x4f, 0x6c, 0xf7, 0x5c, 0xe1, 0xd2, 0xf2, 0x4f, 0xf3, 0x04, 0x6d, 0x46, 0x92, 0x4c, 0xe2, + 0xbe, 0x7a, 0x07, 0x27, 0x1f, 0xaa, 0x30, 0x16, 0xdb, 0xeb, 0x75, 0x80, 0xa1, 0xe6, 0xa8, 0x9f, + 0x68, 0xa6, 0x8b, 0x07, 0x7c, 0xc3, 0x43, 0x14, 0x24, 0x41, 0x95, 0xcc, 0x66, 0x0e, 0x1e, 0xf0, + 0x62, 0xc7, 0x9f, 0x87, 0xac, 0xac, 0x7c, 0x1b, 0x2b, 0xa3, 0x3b, 0x5c, 0x8d, 0xef, 0xf0, 0xcf, + 0xf3, 0xc1, 0xd9, 0x08, 0x60, 0xf9, 0xff, 0xda, 0x2e, 0xfc, 0x82, 0x56, 0xe7, 0xd1, 0x6c, 0x8f, + 0xee, 0xc1, 0xaa, 0x7f, 0x3a, 0xd5, 0x19, 0x3d, 0xb5, 0x9e, 0xc7, 0x2d, 0x76, 0xb8, 0x1b, 0xa7, + 0x51, 0xb2, 0x83, 0x8e, 0xe1, 0x4a, 0x2c, 0xe6, 0xf8, 0x8a, 0xf3, 0x0b, 0x85, 0x9e, 0x47, 0xa2, + 0xa1, 0xc7, 0xd3, 0x1b, 0xec, 0x52, 0xe1, 0x5b, 0x9d, 0x88, 0x1d, 0x52, 0xf4, 0x85, 0x71, 0x4b, + 0xe2, 0x57, 0xbf, 0x01, 0xb5, 0x29, 0x76, 0x35, 0xc3, 0x54, 0x23, 0x05, 0xf5, 0x32, 0x23, 0xf2, + 0x32, 0x7d, 0x9f, 0x94, 0x12, 0x09, 0x08, 0x06, 0x7d, 0x0f, 0xc4, 0x00, 0xfa, 0x08, 0x89, 0xf5, + 0xa9, 0x5f, 0x77, 0x05, 0x9c, 0xf2, 0xef, 0x84, 0x40, 0x61, 0xb4, 0x8e, 0x6b, 0x43, 0x79, 0x8a, + 0x9d, 0xd9, 0x98, 0x95, 0x13, 0xf5, 0x5b, 0xdf, 0x5d, 0x04, 0xf9, 0x10, 0xea, 0x6c, 0xec, 0x2a, + 0x5c, 0x54, 0xfe, 0x11, 0x94, 0x19, 0x05, 0x2d, 0x41, 0xe5, 0xed, 0xfd, 0xdd, 0xfd, 0x83, 0x77, + 0xf6, 0x1b, 0x39, 0x04, 0x50, 0x6e, 0xb5, 0xdb, 0x9d, 0xc3, 0x5e, 0x43, 0x40, 0x22, 0x94, 0x5a, + 0xdb, 0x07, 0x4a, 0xaf, 0x91, 0x27, 0x64, 0xa5, 0xf3, 0x56, 0xa7, 0xdd, 0x6b, 0x14, 0xd0, 0x2a, + 0xd4, 0xd8, 0x58, 0x7d, 0xe3, 0x40, 0xb9, 0xdb, 0xea, 0x35, 0x8a, 0x21, 0xd2, 0x51, 0x67, 0xff, + 0x4e, 0x47, 0x69, 0x94, 0xe4, 0xe7, 0x48, 0xe9, 0x96, 0x82, 0x96, 0x82, 0x22, 0x4d, 0x08, 0x15, + 0x69, 0xf2, 0xaf, 0xf3, 0x20, 0xa5, 0x83, 0x20, 0xd4, 0x8d, 0x99, 0xfd, 0xec, 0xc2, 0xf8, 0x29, + 0x66, 0x3b, 0x7a, 0x1c, 0xea, 0x53, 0x7c, 0x82, 0x5d, 0x7d, 0xc4, 0x00, 0x19, 0x4b, 0x61, 0x35, + 0xa5, 0xc6, 0xa9, 0x54, 0xc8, 0x61, 0x6c, 0x3f, 0xc6, 0xba, 0xab, 0xb2, 0x6a, 0x91, 0x39, 0x9b, + 0x48, 0xd8, 0x08, 0xf5, 0x88, 0x11, 0xe5, 0x8f, 0x1e, 0x6a, 0x27, 0x45, 0x28, 0x29, 0x9d, 0x9e, + 0xf2, 0x6e, 0xa3, 0x80, 0x10, 0xd4, 0xe9, 0x50, 0x3d, 0xda, 0x6f, 0x1d, 0x1e, 0x75, 0x0f, 0xc8, + 0x4e, 0x5e, 0x82, 0x15, 0x6f, 0x27, 0x3d, 0x62, 0x49, 0x7e, 0x1a, 0x2e, 0x27, 0x23, 0xb8, 0xa4, + 0xb8, 0x25, 0xdf, 0x24, 0xe5, 0xff, 0x45, 0x78, 0x96, 0xc8, 0xfb, 0x0f, 0x01, 0x56, 0x62, 0x47, + 0x0e, 0x3d, 0x0b, 0x25, 0x56, 0x24, 0x24, 0x5f, 0x93, 0xd0, 0x58, 0xc1, 0x4f, 0x27, 0x63, 0x44, + 0x2f, 0x43, 0x15, 0xf3, 0x0e, 0xcb, 0xc5, 0x63, 0xcd, 0xca, 0x65, 0xaf, 0x03, 0xc3, 0x05, 0x7d, + 0x7e, 0xf4, 0x2a, 0x88, 0x7e, 0xd4, 0xe0, 0x55, 0xe8, 0x46, 0x5c, 0xd8, 0x8f, 0x36, 0x5c, 0x3a, + 0x90, 0x40, 0x2f, 0x06, 0x78, 0xae, 0x18, 0x2f, 0x4b, 0xb8, 0x30, 0x7b, 0xcc, 0x45, 0x3d, 0x6e, + 0xb9, 0x0d, 0x4b, 0x21, 0x4b, 0xd0, 0x35, 0x10, 0x27, 0xda, 0x19, 0xef, 0xd6, 0xb1, 0x2a, 0xbd, + 0x3a, 0xd1, 0xce, 0x58, 0xa3, 0xee, 0x0a, 0x54, 0xc8, 0xc3, 0xa1, 0xc6, 0xa2, 0x56, 0x41, 0x29, + 0x4f, 0xb4, 0xb3, 0x37, 0x35, 0x47, 0x7e, 0x1f, 0xea, 0xd1, 0x6e, 0x15, 0xf1, 0xec, 0xa9, 0x35, + 0x33, 0x07, 0x54, 0x47, 0x49, 0x61, 0x13, 0x74, 0x1b, 0x4a, 0xa7, 0x16, 0x0b, 0x7a, 0x49, 0xc7, + 0xff, 0xd8, 0x72, 0x71, 0xa8, 0xd7, 0xc5, 0x78, 0xe5, 0x33, 0x28, 0xd1, 0x30, 0x46, 0x3e, 0x1c, + 0xed, 0x3b, 0x71, 0x1c, 0x4b, 0xc6, 0xe8, 0x7d, 0x00, 0xcd, 0x75, 0xa7, 0x46, 0x7f, 0x16, 0xa8, + 0x7d, 0x2c, 0x29, 0x08, 0xb6, 0x3c, 0xae, 0xed, 0x47, 0x79, 0x34, 0x5c, 0x0b, 0x04, 0x43, 0x11, + 0x31, 0xa4, 0x4e, 0xde, 0x87, 0x7a, 0x54, 0x36, 0xdc, 0xf5, 0x5d, 0x4e, 0xe8, 0xfa, 0xfa, 0x68, + 0xc9, 0xc7, 0x5a, 0x05, 0xd6, 0x5b, 0xa4, 0x13, 0xf9, 0x97, 0x02, 0x54, 0x7b, 0x67, 0xfc, 0x90, + 0xa4, 0x34, 0x43, 0x02, 0xd1, 0x7c, 0xb8, 0x9d, 0xc3, 0xfa, 0x65, 0x05, 0xbf, 0x07, 0xf7, 0x9a, + 0x1f, 0x04, 0x8a, 0x8b, 0x15, 0xc1, 0x5e, 0x87, 0x86, 0x87, 0xbd, 0x57, 0x40, 0xf4, 0xbd, 0x89, + 0x14, 0x03, 0xda, 0x60, 0x30, 0xc5, 0x8e, 0xc3, 0x2d, 0xf3, 0xa6, 0xb4, 0x47, 0x6a, 0x7d, 0xc2, + 0xdb, 0x45, 0x05, 0x85, 0x4d, 0xe4, 0x3e, 0xac, 0xc4, 0x12, 0x1f, 0x7a, 0x09, 0x2a, 0xf6, 0xac, + 0xaf, 0x7a, 0x9b, 0x13, 0x39, 0x2e, 0x1e, 0x38, 0x9c, 0xf5, 0xc7, 0x86, 0xbe, 0x8b, 0xcf, 0xbd, + 0xa5, 0xd8, 0xb3, 0xfe, 0x2e, 0xdb, 0x41, 0xf6, 0x8e, 0x7c, 0xf8, 0x1d, 0xbf, 0x11, 0xa0, 0xea, + 0xf9, 0x03, 0xfa, 0x41, 0xf8, 0x70, 0x30, 0xfd, 0xcd, 0xb4, 0x4c, 0xcc, 0xb5, 0x87, 0xce, 0xc6, + 0x4d, 0x58, 0x75, 0x8c, 0xa1, 0x89, 0x07, 0x6a, 0x50, 0x8b, 0xd0, 0x97, 0x55, 0x95, 0x15, 0xf6, + 0x60, 0xcf, 0x2b, 0x44, 0x90, 0x0c, 0xcb, 0xa7, 0x96, 0x6b, 0x98, 0x43, 0x95, 0xad, 0xe9, 0xaf, + 0x15, 0xba, 0xa8, 0x25, 0x46, 0x3c, 0xa4, 0x4b, 0xfb, 0xa7, 0x00, 0x55, 0xef, 0x1c, 0xa3, 0xad, + 0x90, 0x53, 0xd6, 0x2f, 0xf4, 0x80, 0x3c, 0xb6, 0xa0, 0x1b, 0x1a, 0xb5, 0x25, 0xff, 0xb0, 0xb6, + 0xa4, 0x35, 0xb3, 0xbd, 0x1b, 0x85, 0xe2, 0x43, 0xdf, 0x28, 0x3c, 0x0d, 0xc8, 0xb5, 0x5c, 0x6d, + 0xac, 0x46, 0xec, 0x66, 0x60, 0xad, 0x41, 0x9f, 0x1c, 0x87, 0x6c, 0xff, 0x99, 0x00, 0x55, 0x3f, + 0x01, 0x3f, 0x6c, 0x73, 0xf3, 0x32, 0x94, 0x79, 0x9e, 0x61, 0xdd, 0x4d, 0x3e, 0xf3, 0xbb, 0xeb, + 0xc5, 0x50, 0x77, 0x5d, 0x82, 0xea, 0x04, 0xbb, 0x1a, 0xc5, 0x20, 0xac, 0x5c, 0xf4, 0xe7, 0x37, + 0x5f, 0x82, 0xa5, 0x50, 0x97, 0x99, 0x1c, 0xca, 0xfd, 0xce, 0x3b, 0x8d, 0x9c, 0x54, 0xf9, 0xf4, + 0xf3, 0xeb, 0x85, 0x7d, 0xfc, 0x09, 0x71, 0x68, 0xa5, 0xd3, 0xee, 0x76, 0xda, 0xbb, 0x0d, 0x41, + 0x5a, 0xfa, 0xf4, 0xf3, 0xeb, 0x15, 0x1e, 0xfe, 0x6f, 0x76, 0x61, 0x39, 0xfc, 0x4d, 0xa2, 0xa9, + 0x0a, 0x41, 0xfd, 0xce, 0xdb, 0x87, 0x7b, 0x3b, 0xed, 0x56, 0xaf, 0xa3, 0x1e, 0x1f, 0xf4, 0x3a, + 0x0d, 0x01, 0x5d, 0x81, 0x4b, 0x7b, 0x3b, 0x6f, 0x76, 0x7b, 0x6a, 0x7b, 0x6f, 0xa7, 0xb3, 0xdf, + 0x53, 0x5b, 0xbd, 0x5e, 0xab, 0xbd, 0xdb, 0xc8, 0xdf, 0xfa, 0x37, 0xc0, 0x4a, 0x6b, 0xbb, 0xbd, + 0x43, 0xd2, 0xac, 0xa1, 0x6b, 0xb4, 0x54, 0xfd, 0x21, 0x14, 0x69, 0xb5, 0x9e, 0x71, 0xa5, 0x2e, + 0x65, 0xf5, 0x23, 0xd1, 0x36, 0x94, 0x68, 0x11, 0x8f, 0xb2, 0x6e, 0xd8, 0xa5, 0xcc, 0xf6, 0x24, + 0x59, 0x04, 0x3d, 0x34, 0x19, 0x17, 0xee, 0x52, 0x56, 0xaf, 0x12, 0xed, 0x83, 0x18, 0x54, 0xdf, + 0xf3, 0xae, 0xdf, 0xa5, 0xb9, 0xdd, 0x4b, 0xa2, 0x2f, 0xa8, 0x30, 0xe6, 0x5d, 0x4a, 0x4b, 0x73, + 0x23, 0x19, 0xea, 0x42, 0xc5, 0xab, 0xda, 0xb2, 0x2f, 0xc8, 0xa5, 0x39, 0x9d, 0x45, 0xb2, 0xdd, + 0xac, 0xaa, 0xce, 0xba, 0xe5, 0x97, 0x32, 0xdb, 0xa3, 0xa8, 0x03, 0x65, 0x0e, 0x99, 0x33, 0xaf, + 0xbc, 0xa5, 0xec, 0x3e, 0x21, 0xd9, 0xa4, 0xa0, 0x45, 0x31, 0xef, 0x8f, 0x05, 0x69, 0x6e, 0xbf, + 0x17, 0xdd, 0x03, 0x08, 0x55, 0xce, 0x73, 0x7f, 0x45, 0x90, 0xe6, 0xf7, 0x71, 0xd1, 0x2e, 0x54, + 0xfd, 0x1a, 0x69, 0xce, 0xaf, 0x01, 0xd2, 0xbc, 0x96, 0x2a, 0x7a, 0x0f, 0x6a, 0xd1, 0xf2, 0x60, + 0x91, 0x0b, 0x7f, 0x69, 0xa1, 0x5e, 0x29, 0xd1, 0x1d, 0xad, 0x14, 0x16, 0xb9, 0xfe, 0x97, 0x16, + 0x6a, 0x9c, 0xa2, 0x13, 0x58, 0xbd, 0x88, 0xe3, 0x17, 0xfd, 0x17, 0x40, 0x5a, 0xb8, 0x91, 0x8a, + 0x0c, 0x40, 0x09, 0xd8, 0x7f, 0xe1, 0x1f, 0x03, 0xa4, 0xc5, 0xbb, 0xaa, 0xe8, 0x43, 0xa8, 0xc7, + 0xe0, 0xf4, 0x42, 0x7f, 0x09, 0x48, 0x8b, 0x75, 0x57, 0xd1, 0x3b, 0xb0, 0x1c, 0xc1, 0xdf, 0x0b, + 0xfc, 0x32, 0x20, 0x2d, 0xd2, 0x67, 0xdd, 0x7e, 0xf5, 0x8b, 0xaf, 0xd7, 0x85, 0x2f, 0xbf, 0x5e, + 0x17, 0xfe, 0xfc, 0xf5, 0xba, 0xf0, 0xd9, 0x83, 0xf5, 0xdc, 0x97, 0x0f, 0xd6, 0x73, 0x7f, 0x7c, + 0xb0, 0x9e, 0x7b, 0xef, 0xc6, 0xd0, 0x70, 0x47, 0xb3, 0xfe, 0xa6, 0x6e, 0x4d, 0xb6, 0xc6, 0x86, + 0x89, 0xb7, 0x12, 0xfe, 0xe7, 0xea, 0x97, 0x69, 0x72, 0xbc, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xce, 0x35, 0xbc, 0x15, 0xed, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3411,6 +3651,8 @@ type ABCIApplicationClient interface { OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) + BeginRecheckTx(ctx context.Context, in *RequestBeginRecheckTx, opts ...grpc.CallOption) (*ResponseBeginRecheckTx, error) + EndRecheckTx(ctx context.Context, in *RequestEndRecheckTx, opts ...grpc.CallOption) (*ResponseEndRecheckTx, error) } type aBCIApplicationClient struct { @@ -3556,6 +3798,24 @@ func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *Requ return out, nil } +func (c *aBCIApplicationClient) BeginRecheckTx(ctx context.Context, in *RequestBeginRecheckTx, opts ...grpc.CallOption) (*ResponseBeginRecheckTx, error) { + out := new(ResponseBeginRecheckTx) + err := c.cc.Invoke(ctx, "/ostracon.abci.ABCIApplication/BeginRecheckTx", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *aBCIApplicationClient) EndRecheckTx(ctx context.Context, in *RequestEndRecheckTx, opts ...grpc.CallOption) (*ResponseEndRecheckTx, error) { + out := new(ResponseEndRecheckTx) + err := c.cc.Invoke(ctx, "/ostracon.abci.ABCIApplication/EndRecheckTx", 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) @@ -3573,6 +3833,8 @@ type ABCIApplicationServer interface { OfferSnapshot(context.Context, *RequestOfferSnapshot) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(context.Context, *RequestLoadSnapshotChunk) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(context.Context, *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) + BeginRecheckTx(context.Context, *RequestBeginRecheckTx) (*ResponseBeginRecheckTx, error) + EndRecheckTx(context.Context, *RequestEndRecheckTx) (*ResponseEndRecheckTx, error) } // UnimplementedABCIApplicationServer can be embedded to have forward compatible implementations. @@ -3624,6 +3886,12 @@ 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) BeginRecheckTx(ctx context.Context, req *RequestBeginRecheckTx) (*ResponseBeginRecheckTx, error) { + return nil, status.Errorf(codes.Unimplemented, "method BeginRecheckTx not implemented") +} +func (*UnimplementedABCIApplicationServer) EndRecheckTx(ctx context.Context, req *RequestEndRecheckTx) (*ResponseEndRecheckTx, error) { + return nil, status.Errorf(codes.Unimplemented, "method EndRecheckTx not implemented") +} func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { s.RegisterService(&_ABCIApplication_serviceDesc, srv) @@ -3899,6 +4167,42 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +func _ABCIApplication_BeginRecheckTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestBeginRecheckTx) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).BeginRecheckTx(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ostracon.abci.ABCIApplication/BeginRecheckTx", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).BeginRecheckTx(ctx, req.(*RequestBeginRecheckTx)) + } + return interceptor(ctx, in, info, handler) +} + +func _ABCIApplication_EndRecheckTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestEndRecheckTx) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).EndRecheckTx(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ostracon.abci.ABCIApplication/EndRecheckTx", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).EndRecheckTx(ctx, req.(*RequestEndRecheckTx)) + } + return interceptor(ctx, in, info, handler) +} + var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ ServiceName: "ostracon.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), @@ -3963,6 +4267,14 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "ApplySnapshotChunk", Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, + { + MethodName: "BeginRecheckTx", + Handler: _ABCIApplication_BeginRecheckTx_Handler, + }, + { + MethodName: "EndRecheckTx", + Handler: _ABCIApplication_EndRecheckTx_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "ostracon/abci/types.proto", @@ -4315,22 +4627,68 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } -func (m *RequestEcho) Marshal() (dAtA []byte, err error) { +func (m *Request_BeginRecheckTx) MarshalTo(dAtA []byte) (int, error) { size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestEcho) MarshalTo(dAtA []byte) (int, error) { +func (m *Request_BeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.BeginRecheckTx != nil { + { + size, err := m.BeginRecheckTx.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6 + i-- + dAtA[i] = 0xa2 + } + return len(dAtA) - i, nil +} +func (m *Request_EndRecheckTx) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Request_EndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.EndRecheckTx != nil { + { + size, err := m.EndRecheckTx.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6 + i-- + dAtA[i] = 0xaa + } + return len(dAtA) - i, nil +} +func (m *RequestEcho) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RequestEcho) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4510,12 +4868,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err17 != nil { - return 0, err17 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err19 != nil { + return 0, err19 } - i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i -= n19 + i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4898,6 +5256,67 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } +func (m *RequestBeginRecheckTx) 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 *RequestBeginRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestBeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Header.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *RequestEndRecheckTx) 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 *RequestEndRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestEndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Height != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *Response) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5268,6 +5687,52 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } +func (m *Response_BeginRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_BeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.BeginRecheckTx != nil { + { + size, err := m.BeginRecheckTx.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6 + i-- + dAtA[i] = 0xa2 + } + return len(dAtA) - i, nil +} +func (m *Response_EndRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_EndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.EndRecheckTx != nil { + { + size, err := m.EndRecheckTx.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6 + i-- + dAtA[i] = 0xaa + } + return len(dAtA) - i, nil +} func (m *ResponseException) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6008,20 +6473,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA41 := make([]byte, len(m.RefetchChunks)*10) - var j40 int + dAtA46 := make([]byte, len(m.RefetchChunks)*10) + var j45 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA46[j45] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j45++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA46[j45] = uint8(num) + j45++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i -= j45 + copy(dAtA[i:], dAtA46[:j45]) + i = encodeVarintTypes(dAtA, i, uint64(j45)) i-- dAtA[i] = 0x12 } @@ -6033,6 +6498,62 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *ResponseBeginRecheckTx) 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 *ResponseBeginRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseBeginRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Code != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *ResponseEndRecheckTx) 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 *ResponseEndRecheckTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseEndRecheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Code != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *ConsensusParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6468,12 +6989,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 + n54, err54 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err54 != nil { + return 0, err54 } - i -= n49 - i = encodeVarintTypes(dAtA, i, uint64(n49)) + i -= n54 + i = encodeVarintTypes(dAtA, i, uint64(n54)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6754,6 +7275,30 @@ func (m *Request_ApplySnapshotChunk) Size() (n int) { } return n } +func (m *Request_BeginRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BeginRecheckTx != nil { + l = m.BeginRecheckTx.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Request_EndRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.EndRecheckTx != nil { + l = m.EndRecheckTx.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *RequestEcho) Size() (n int) { if m == nil { return 0 @@ -7004,6 +7549,29 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } +func (m *RequestBeginRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Header.Size() + n += 1 + l + sovTypes(uint64(l)) + return n +} + +func (m *RequestEndRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Height != 0 { + n += 1 + sovTypes(uint64(m.Height)) + } + return n +} + func (m *Response) Size() (n int) { if m == nil { return 0 @@ -7208,6 +7776,30 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { } return n } +func (m *Response_BeginRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BeginRecheckTx != nil { + l = m.BeginRecheckTx.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Response_EndRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.EndRecheckTx != nil { + l = m.EndRecheckTx.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *ResponseException) Size() (n int) { if m == nil { return 0 @@ -7556,6 +8148,30 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } +func (m *ResponseBeginRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Code != 0 { + n += 1 + sovTypes(uint64(m.Code)) + } + return n +} + +func (m *ResponseEndRecheckTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Code != 0 { + n += 1 + sovTypes(uint64(m.Code)) + } + return n +} + func (m *ConsensusParams) Size() (n int) { if m == nil { return 0 @@ -8329,14 +8945,84 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_ApplySnapshotChunk{v} iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes + case 100: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BeginRecheckTx", 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 := &RequestBeginRecheckTx{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_BeginRecheckTx{v} + iNdEx = postIndex + case 101: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EndRecheckTx", 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 := &RequestEndRecheckTx{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_EndRecheckTx{v} + 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 @@ -10011,6 +10697,158 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *RequestBeginRecheckTx) 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: RequestBeginRecheckTx: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestBeginRecheckTx: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Header.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + 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 *RequestEndRecheckTx) 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: RequestEndRecheckTx: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestEndRecheckTx: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= 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 @@ -10600,6 +11438,76 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_ApplySnapshotChunk{v} iNdEx = postIndex + case 100: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BeginRecheckTx", 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 := &ResponseBeginRecheckTx{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_BeginRecheckTx{v} + iNdEx = postIndex + case 101: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EndRecheckTx", 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 := &ResponseEndRecheckTx{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_EndRecheckTx{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -12912,6 +13820,144 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *ResponseBeginRecheckTx) 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: ResponseBeginRecheckTx: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseBeginRecheckTx: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) + } + m.Code = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Code |= uint32(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 *ResponseEndRecheckTx) 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: ResponseEndRecheckTx: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseEndRecheckTx: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) + } + m.Code = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Code |= uint32(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 *ConsensusParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 7752014d8..ee36d419b 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -4,6 +4,7 @@ import ( "encoding/binary" "fmt" "os" + "sync" "testing" "time" @@ -152,6 +153,14 @@ func TestMempoolRmBadTx(t *testing.T) { resCommit := app.Commit() assert.True(t, len(resCommit.Data) > 0) + resBeginRecheckTx := app.BeginRecheckTx(abci.RequestBeginRecheckTx{}) + assert.Equal(t, code.CodeTypeOK, resBeginRecheckTx.Code) + + // There is no tx to recheck + + resEndRecheckTx := app.EndRecheckTx(abci.RequestEndRecheckTx{}) + assert.Equal(t, code.CodeTypeOK, resEndRecheckTx.Code) + emptyMempoolCh := make(chan struct{}) checkTxRespCh := make(chan struct{}) go func() { @@ -206,8 +215,9 @@ func TestMempoolRmBadTx(t *testing.T) { type CounterApplication struct { abci.BaseApplication - txCount int - mempoolTxCount int + txCount int + mempoolTxCount int + mempoolTxCountMtx sync.Mutex } func NewCounterApplication() *CounterApplication { @@ -231,6 +241,8 @@ func (app *CounterApplication) DeliverTx(req abci.RequestDeliverTx) abci.Respons func (app *CounterApplication) CheckTx(req abci.RequestCheckTx) abci.ResponseCheckTx { txValue := txAsUint64(req.Tx) + app.mempoolTxCountMtx.Lock() + defer app.mempoolTxCountMtx.Unlock() if txValue != uint64(app.mempoolTxCount) { return abci.ResponseCheckTx{ Code: code.CodeTypeBadNonce, @@ -240,6 +252,11 @@ func (app *CounterApplication) CheckTx(req abci.RequestCheckTx) abci.ResponseChe return abci.ResponseCheckTx{Code: code.CodeTypeOK} } +func (app *CounterApplication) BeginRecheckTx(abci.RequestBeginRecheckTx) abci.ResponseBeginRecheckTx { + app.mempoolTxCount = app.txCount + return abci.ResponseBeginRecheckTx{Code: code.CodeTypeOK} +} + func txAsUint64(tx []byte) uint64 { tx8 := make([]byte, 8) copy(tx8[len(tx8)-len(tx):], tx) @@ -247,7 +264,6 @@ func txAsUint64(tx []byte) uint64 { } func (app *CounterApplication) Commit() abci.ResponseCommit { - app.mempoolTxCount = app.txCount if app.txCount == 0 { return abci.ResponseCommit{} } diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go index 39c84b578..5c94c9fce 100644 --- a/consensus/replay_stubs.go +++ b/consensus/replay_stubs.go @@ -24,8 +24,7 @@ func (emptyMempool) CheckTx(_ types.Tx, _ func(*abci.Response), _ mempl.TxInfo) func (emptyMempool) ReapMaxBytesMaxGas(_, _ int64) types.Txs { return types.Txs{} } func (emptyMempool) ReapMaxTxs(n int) types.Txs { return types.Txs{} } func (emptyMempool) Update( - _ int64, - _ types.Txs, + _ *types.Block, _ []*abci.ResponseDeliverTx, _ mempl.PreCheckFunc, _ mempl.PostCheckFunc, diff --git a/light/example_test.go b/light/example_test.go index 2b16d95e5..b0ef159bd 100644 --- a/light/example_test.go +++ b/light/example_test.go @@ -10,8 +10,7 @@ import ( "time" "github.com/line/ostracon/types" - - dbm "github.com/line/tm-db/v2" + "github.com/line/tm-db/v2/goleveldb" "github.com/line/ostracon/abci/example/kvstore" "github.com/line/ostracon/libs/log" @@ -48,7 +47,7 @@ func ExampleClient_Update() { stdlog.Fatal(err) } - db, err := dbm.NewGoLevelDB("light-client-db", dbDir) + db, err := goleveldb.NewDB("light-client-db", dbDir) if err != nil { stdlog.Fatal(err) } @@ -117,7 +116,7 @@ func ExampleClient_VerifyLightBlockAtHeight() { stdlog.Fatal(err) } - db, err := dbm.NewGoLevelDB("light-client-db", dbDir) + db, err := goleveldb.NewDB("light-client-db", dbDir) if err != nil { stdlog.Fatal(err) } diff --git a/mempool/cache_test.go b/mempool/cache_test.go index 2187fed45..e36f36740 100644 --- a/mempool/cache_test.go +++ b/mempool/cache_test.go @@ -68,7 +68,8 @@ func TestCacheAfterUpdate(t *testing.T) { tx := types.Tx{byte(v)} updateTxs = append(updateTxs, tx) } - err := mempool.Update(int64(tcIndex), updateTxs, abciResponses(len(updateTxs), abci.CodeTypeOK), nil, nil) + err := mempool.Update(newTestBlock(int64(tcIndex), updateTxs), + abciResponses(len(updateTxs), abci.CodeTypeOK), nil, nil) require.NoError(t, err) for _, v := range tc.reAddIndices { diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index 6ea78cf6b..7c6f8acb8 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -20,6 +20,7 @@ import ( "github.com/line/ostracon/p2p" "github.com/line/ostracon/proxy" "github.com/line/ostracon/types" + "github.com/pkg/errors" ) // TxKeySize is the size of the transaction key index @@ -568,14 +569,13 @@ func (mem *CListMempool) ReapMaxTxs(max int) types.Txs { // Lock() must be help by the caller during execution. func (mem *CListMempool) Update( - height int64, - txs types.Txs, + block *types.Block, deliverTxResponses []*abci.ResponseDeliverTx, preCheck PreCheckFunc, postCheck PostCheckFunc, ) error { // Set height - mem.height = height + mem.height = block.Height mem.notifiedTxsAvailable = false if preCheck != nil { @@ -585,7 +585,7 @@ func (mem *CListMempool) Update( mem.postCheck = postCheck } - for i, tx := range txs { + for i, tx := range block.Txs { if deliverTxResponses[i].Code == abci.CodeTypeOK { // Add valid committed tx to the cache (if missing). _ = mem.cache.Push(tx) @@ -614,8 +614,28 @@ func (mem *CListMempool) Update( recheckStartTime := time.Now().UnixNano() if mem.Size() > 0 { if mem.config.Recheck { - mem.logger.Info("Recheck txs", "numtxs", mem.Size(), "height", height) - mem.recheckTxs() + mem.logger.Info("recheck txs", "numtxs", mem.Size(), "height", block.Height) + res, err := mem.proxyAppConn.BeginRecheckTxSync(abci.RequestBeginRecheckTx{ + Header: types.TM2PB.Header(&block.Header), + }) + if res.Code == abci.CodeTypeOK && err == nil { + mem.recheckTxs() + res2, err2 := mem.proxyAppConn.EndRecheckTxSync(abci.RequestEndRecheckTx{Height: block.Height}) + if res2.Code != abci.CodeTypeOK { + return errors.New("the function EndRecheckTxSync does not respond CodeTypeOK") + } + if err2 != nil { + return errors.Wrap(err2, "the function EndRecheckTxSync returns an error") + } + } else { + if res.Code != abci.CodeTypeOK { + return errors.New("the function BeginRecheckTxSync does not respond CodeTypeOK") + } + if err != nil { + return errors.Wrap(err, "the function BeginRecheckTxSync returns an error") + } + } + // At this point, mem.txs are being rechecked. // mem.recheckCursor re-scans mem.txs and possibly removes some txs. // Before mem.Reap(), we should wait for mem.recheckCursor to be nil. diff --git a/mempool/clist_mempool_test.go b/mempool/clist_mempool_test.go index 776064cc1..3eb804710 100644 --- a/mempool/clist_mempool_test.go +++ b/mempool/clist_mempool_test.go @@ -170,7 +170,7 @@ func TestMempoolFilters(t *testing.T) { {10, PreCheckMaxBytes(22), PostCheckMaxGas(0), 0}, } for tcIndex, tt := range tests { - err := mempool.Update(1, emptyTxArr, abciResponses(len(emptyTxArr), abci.CodeTypeOK), tt.preFilter, tt.postFilter) + err := mempool.Update(newTestBlock(1, emptyTxArr), abciResponses(len(emptyTxArr), abci.CodeTypeOK), tt.preFilter, tt.postFilter) require.NoError(t, err) checkTxs(t, mempool, tt.numTxsToCreate, UnknownPeerID) require.Equal(t, tt.expectedNumTxs, mempool.Size(), "mempool had the incorrect size, on test case %d", tcIndex) @@ -186,7 +186,8 @@ func TestMempoolUpdate(t *testing.T) { // 1. Adds valid txs to the cache { - err := mempool.Update(1, []types.Tx{[]byte{0x01}}, abciResponses(1, abci.CodeTypeOK), nil, nil) + err := mempool.Update(newTestBlock(1, []types.Tx{[]byte{0x01}}), + abciResponses(1, abci.CodeTypeOK), nil, nil) require.NoError(t, err) err = mempool.CheckTx([]byte{0x01}, nil, TxInfo{}) if assert.Error(t, err) { @@ -198,7 +199,7 @@ func TestMempoolUpdate(t *testing.T) { { err := mempool.CheckTx([]byte{0x02}, nil, TxInfo{}) require.NoError(t, err) - err = mempool.Update(1, []types.Tx{[]byte{0x02}}, abciResponses(1, abci.CodeTypeOK), nil, nil) + err = mempool.Update(newTestBlock(1, []types.Tx{[]byte{0x02}}), abciResponses(1, abci.CodeTypeOK), nil, nil) require.NoError(t, err) assert.Zero(t, mempool.Size()) } @@ -207,7 +208,7 @@ func TestMempoolUpdate(t *testing.T) { { err := mempool.CheckTx([]byte{0x03}, nil, TxInfo{}) require.NoError(t, err) - err = mempool.Update(1, []types.Tx{[]byte{0x03}}, abciResponses(1, 1), nil, nil) + err = mempool.Update(newTestBlock(1, []types.Tx{[]byte{0x03}}), abciResponses(1, 1), nil, nil) require.NoError(t, err) assert.Zero(t, mempool.Size()) @@ -238,7 +239,7 @@ func TestMempool_KeepInvalidTxsInCache(t *testing.T) { // simulate new block _ = app.DeliverTx(abci.RequestDeliverTx{Tx: a}) _ = app.DeliverTx(abci.RequestDeliverTx{Tx: b}) - err = mempool.Update(1, []types.Tx{a, b}, + err = mempool.Update(newTestBlock(1, []types.Tx{a, b}), []*abci.ResponseDeliverTx{{Code: abci.CodeTypeOK}, {Code: 2}}, nil, nil) require.NoError(t, err) @@ -294,7 +295,8 @@ func TestTxsAvailable(t *testing.T) { // it should fire once now for the new height // since there are still txs left committedTxs, txs := txs[:50], txs[50:] - if err := mempool.Update(1, committedTxs, abciResponses(len(committedTxs), abci.CodeTypeOK), nil, nil); err != nil { + if err := mempool.Update(newTestBlock(1, committedTxs), + abciResponses(len(committedTxs), abci.CodeTypeOK), nil, nil); err != nil { t.Error(err) } ensureFire(t, mempool.TxsAvailable(), timeoutMS) @@ -306,7 +308,8 @@ func TestTxsAvailable(t *testing.T) { // now call update with all the txs. it should not fire as there are no txs left committedTxs = append(txs, moreTxs...) //nolint: gocritic - if err := mempool.Update(2, committedTxs, abciResponses(len(committedTxs), abci.CodeTypeOK), nil, nil); err != nil { + if err := mempool.Update(newTestBlock(2, committedTxs), + abciResponses(len(committedTxs), abci.CodeTypeOK), nil, nil); err != nil { t.Error(err) } ensureNoFire(t, mempool.TxsAvailable(), timeoutMS) @@ -365,7 +368,8 @@ func TestSerialReap(t *testing.T) { binary.BigEndian.PutUint64(txBytes, uint64(i)) txs = append(txs, txBytes) } - if err := mempool.Update(0, txs, abciResponses(len(txs), abci.CodeTypeOK), nil, nil); err != nil { + if err := mempool.Update(newTestBlock(0, txs), + abciResponses(len(txs), abci.CodeTypeOK), nil, nil); err != nil { t.Error(err) } } @@ -536,7 +540,8 @@ func TestMempoolTxsBytes(t *testing.T) { assert.EqualValues(t, 1, mempool.TxsBytes()) // 3. zero again after tx is removed by Update - err = mempool.Update(1, []types.Tx{[]byte{0x01}}, abciResponses(1, abci.CodeTypeOK), nil, nil) + err = mempool.Update(newTestBlock(1, []types.Tx{[]byte{0x01}}), + abciResponses(1, abci.CodeTypeOK), nil, nil) require.NoError(t, err) assert.EqualValues(t, 0, mempool.TxsBytes()) @@ -586,7 +591,7 @@ func TestMempoolTxsBytes(t *testing.T) { require.NotEmpty(t, res2.Data) // Pretend like we committed nothing so txBytes gets rechecked and removed. - err = mempool.Update(1, []types.Tx{}, abciResponses(0, abci.CodeTypeOK), nil, nil) + err = mempool.Update(newTestBlock(1, []types.Tx{}), abciResponses(0, abci.CodeTypeOK), nil, nil) require.NoError(t, err) assert.EqualValues(t, 0, mempool.TxsBytes()) @@ -641,6 +646,17 @@ func TestMempoolRemoteAppConcurrency(t *testing.T) { require.NoError(t, err) } +func newTestBlock(height int64, txs types.Txs) *types.Block { + return &types.Block{ + Header: types.Header{ + Height: height, + }, + Data: types.Data{ + Txs: txs, + }, + } +} + // caller must close server func newRemoteApp( t *testing.T, diff --git a/mempool/mempool.go b/mempool/mempool.go index cef9c64bf..217b29540 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -39,8 +39,7 @@ type Mempool interface { // NOTE: this should be called *after* block is committed by consensus. // NOTE: Lock/Unlock must be managed by caller Update( - blockHeight int64, - blockTxs types.Txs, + block *types.Block, deliverTxResponses []*abci.ResponseDeliverTx, newPreFn PreCheckFunc, newPostFn PostCheckFunc, diff --git a/mempool/mock/mempool.go b/mempool/mock/mempool.go index c8b328194..de0b65d4c 100644 --- a/mempool/mock/mempool.go +++ b/mempool/mock/mempool.go @@ -21,8 +21,7 @@ func (Mempool) CheckTx(_ types.Tx, _ func(*abci.Response), _ mempl.TxInfo) error func (Mempool) ReapMaxBytesMaxGas(_, _ int64) types.Txs { return types.Txs{} } func (Mempool) ReapMaxTxs(n int) types.Txs { return types.Txs{} } func (Mempool) Update( - _ int64, - _ types.Txs, + _ *types.Block, _ []*abci.ResponseDeliverTx, _ mempl.PreCheckFunc, _ mempl.PostCheckFunc, diff --git a/mempool/reactor_test.go b/mempool/reactor_test.go index 03a7801c6..42ee46c5b 100644 --- a/mempool/reactor_test.go +++ b/mempool/reactor_test.go @@ -107,7 +107,7 @@ func TestReactorConcurrency(t *testing.T) { for i := range txs { deliverTxResponses[i] = &abci.ResponseDeliverTx{Code: 0} } - err := reactors[0].mempool.Update(1, txs, deliverTxResponses, nil, nil) + err := reactors[0].mempool.Update(newTestBlock(1, txs), deliverTxResponses, nil, nil) assert.NoError(t, err) }() @@ -119,7 +119,8 @@ func TestReactorConcurrency(t *testing.T) { reactors[1].mempool.Lock() defer reactors[1].mempool.Unlock() - err := reactors[1].mempool.Update(1, []types.Tx{}, make([]*abci.ResponseDeliverTx, 0), nil, nil) + err := reactors[1].mempool.Update(newTestBlock(1, []types.Tx{}), + make([]*abci.ResponseDeliverTx, 0), nil, nil) assert.NoError(t, err) }() diff --git a/p2p/trust/store_test.go b/p2p/trust/store_test.go index 21f350774..ea07f6a36 100644 --- a/p2p/trust/store_test.go +++ b/p2p/trust/store_test.go @@ -9,11 +9,10 @@ import ( "os" "testing" + "github.com/line/ostracon/libs/log" + "github.com/line/tm-db/v2/metadb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/line/tm-db/v2" - - "github.com/line/ostracon/libs/log" ) func TestTrustMetricStoreSaveLoad(t *testing.T) { @@ -21,7 +20,7 @@ func TestTrustMetricStoreSaveLoad(t *testing.T) { require.NoError(t, err) defer os.Remove(dir) - historyDB, err := dbm.NewDB("trusthistory", "goleveldb", dir) + historyDB, err := metadb.NewDB("trusthistory", "goleveldb", dir) require.NoError(t, err) // 0 peers saved @@ -84,7 +83,7 @@ func TestTrustMetricStoreSaveLoad(t *testing.T) { } func TestTrustMetricStoreConfig(t *testing.T) { - historyDB, err := dbm.NewDB("", "memdb", "") + historyDB, err := metadb.NewDB("", "memdb", "") require.NoError(t, err) config := MetricConfig{ @@ -109,7 +108,7 @@ func TestTrustMetricStoreConfig(t *testing.T) { } func TestTrustMetricStoreLookup(t *testing.T) { - historyDB, err := dbm.NewDB("", "memdb", "") + historyDB, err := metadb.NewDB("", "memdb", "") require.NoError(t, err) store := NewTrustMetricStore(historyDB, DefaultConfig()) @@ -132,7 +131,7 @@ func TestTrustMetricStoreLookup(t *testing.T) { } func TestTrustMetricStorePeerScore(t *testing.T) { - historyDB, err := dbm.NewDB("", "memdb", "") + historyDB, err := metadb.NewDB("", "memdb", "") require.NoError(t, err) store := NewTrustMetricStore(historyDB, DefaultConfig()) diff --git a/proto/ostracon/abci/types.proto b/proto/ostracon/abci/types.proto index cedff0a9c..eeced832e 100644 --- a/proto/ostracon/abci/types.proto +++ b/proto/ostracon/abci/types.proto @@ -36,6 +36,8 @@ message Request { RequestOfferSnapshot offer_snapshot = 13; RequestLoadSnapshotChunk load_snapshot_chunk = 14; RequestApplySnapshotChunk apply_snapshot_chunk = 15; + RequestBeginRecheckTx begin_recheck_tx = 100; // 16~99 are reserved for merging original tendermint + RequestEndRecheckTx end_recheck_tx = 101; } } @@ -125,6 +127,14 @@ message RequestApplySnapshotChunk { string sender = 3; } +message RequestBeginRecheckTx { + ostracon.types.Header header = 1 [(gogoproto.nullable) = false]; +} + +message RequestEndRecheckTx { + int64 height = 1; +} + //---------------------------------------- // Response types @@ -146,6 +156,8 @@ message Response { ResponseOfferSnapshot offer_snapshot = 14; ResponseLoadSnapshotChunk load_snapshot_chunk = 15; ResponseApplySnapshotChunk apply_snapshot_chunk = 16; + ResponseBeginRecheckTx begin_recheck_tx = 100; // 17~99 are reserved for merging original tendermint + ResponseEndRecheckTx end_recheck_tx = 101; } } @@ -276,6 +288,14 @@ message ResponseApplySnapshotChunk { } } +message ResponseBeginRecheckTx { + uint32 code = 1; +} + +message ResponseEndRecheckTx { + uint32 code = 1; +} + //---------------------------------------- // Misc. @@ -407,4 +427,6 @@ service ABCIApplication { rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); + rpc BeginRecheckTx(RequestBeginRecheckTx) returns (ResponseBeginRecheckTx); + rpc EndRecheckTx(RequestEndRecheckTx) returns (ResponseEndRecheckTx); } diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 931662433..e012acb36 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -5,7 +5,8 @@ import ( "github.com/line/ostracon/abci/types" ) -//go:generate mockery --case underscore --name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot +//nolint +//go:generate mockery --case underscore --name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot|ClientCreator //---------------------------------------------------------------------------------------- // Enforce which abci msgs can be sent on a connection at the type level @@ -27,7 +28,12 @@ type AppConnMempool interface { Error() error CheckTxAsync(types.RequestCheckTx) *abcicli.ReqRes + BeginRecheckTxAsync(types.RequestBeginRecheckTx) *abcicli.ReqRes + EndRecheckTxAsync(types.RequestEndRecheckTx) *abcicli.ReqRes + CheckTxSync(types.RequestCheckTx) (*types.ResponseCheckTx, error) + BeginRecheckTxSync(types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) + EndRecheckTxSync(types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) FlushAsync() *abcicli.ReqRes FlushSync() error @@ -126,10 +132,26 @@ func (app *appConnMempool) CheckTxAsync(req types.RequestCheckTx) *abcicli.ReqRe return app.appConn.CheckTxAsync(req) } +func (app *appConnMempool) BeginRecheckTxAsync(req types.RequestBeginRecheckTx) *abcicli.ReqRes { + return app.appConn.BeginRecheckTxAsync(req) +} + +func (app *appConnMempool) EndRecheckTxAsync(req types.RequestEndRecheckTx) *abcicli.ReqRes { + return app.appConn.EndRecheckTxAsync(req) +} + func (app *appConnMempool) CheckTxSync(req types.RequestCheckTx) (*types.ResponseCheckTx, error) { return app.appConn.CheckTxSync(req) } +func (app *appConnMempool) BeginRecheckTxSync(req types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + return app.appConn.BeginRecheckTxSync(req) +} + +func (app *appConnMempool) EndRecheckTxSync(req types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + return app.appConn.EndRecheckTxSync(req) +} + //------------------------------------------------ // Implements AppConnQuery (subset of abcicli.Client) diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 601e71ec9..35b4677a7 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -1,10 +1,10 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery 2.7.4. DO NOT EDIT. package mocks import ( - mock "github.com/stretchr/testify/mock" abcicli "github.com/line/ostracon/abci/client" + mock "github.com/stretchr/testify/mock" types "github.com/line/ostracon/abci/types" ) diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index 38a87cf79..f64942ccd 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -1,10 +1,10 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery 2.7.4. DO NOT EDIT. package mocks import ( - mock "github.com/stretchr/testify/mock" abcicli "github.com/line/ostracon/abci/client" + mock "github.com/stretchr/testify/mock" types "github.com/line/ostracon/abci/types" ) @@ -14,6 +14,45 @@ type AppConnMempool struct { mock.Mock } +// BeginRecheckTxAsync provides a mock function with given fields: _a0 +func (_m *AppConnMempool) BeginRecheckTxAsync(_a0 types.RequestBeginRecheckTx) *abcicli.ReqRes { + ret := _m.Called(_a0) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(types.RequestBeginRecheckTx) *abcicli.ReqRes); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + return r0 +} + +// BeginRecheckTxSync provides a mock function with given fields: _a0 +func (_m *AppConnMempool) BeginRecheckTxSync(_a0 types.RequestBeginRecheckTx) (*types.ResponseBeginRecheckTx, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseBeginRecheckTx + if rf, ok := ret.Get(0).(func(types.RequestBeginRecheckTx) *types.ResponseBeginRecheckTx); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseBeginRecheckTx) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestBeginRecheckTx) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // CheckTxAsync provides a mock function with given fields: _a0 func (_m *AppConnMempool) CheckTxAsync(_a0 types.RequestCheckTx) *abcicli.ReqRes { ret := _m.Called(_a0) @@ -53,6 +92,45 @@ func (_m *AppConnMempool) CheckTxSync(_a0 types.RequestCheckTx) (*types.Response return r0, r1 } +// EndRecheckTxAsync provides a mock function with given fields: _a0 +func (_m *AppConnMempool) EndRecheckTxAsync(_a0 types.RequestEndRecheckTx) *abcicli.ReqRes { + ret := _m.Called(_a0) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(types.RequestEndRecheckTx) *abcicli.ReqRes); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + return r0 +} + +// EndRecheckTxSync provides a mock function with given fields: _a0 +func (_m *AppConnMempool) EndRecheckTxSync(_a0 types.RequestEndRecheckTx) (*types.ResponseEndRecheckTx, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseEndRecheckTx + if rf, ok := ret.Get(0).(func(types.RequestEndRecheckTx) *types.ResponseEndRecheckTx); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseEndRecheckTx) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestEndRecheckTx) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Error provides a mock function with given fields: func (_m *AppConnMempool) Error() error { ret := _m.Called() diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index 1c93936e4..eec6053ed 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery 2.7.4. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index 85189ffad..0c37135a9 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.9.0. DO NOT EDIT. +// Code generated by mockery 2.7.4. DO NOT EDIT. package mocks diff --git a/proxy/mocks/client_creator.go b/proxy/mocks/client_creator.go index f6aa04c06..69f80af56 100644 --- a/proxy/mocks/client_creator.go +++ b/proxy/mocks/client_creator.go @@ -1,11 +1,10 @@ -// Code generated by mockery v1.1.1. DO NOT EDIT. +// Code generated by mockery 2.7.4. DO NOT EDIT. package mocks import ( - mock "github.com/stretchr/testify/mock" - abcicli "github.com/line/ostracon/abci/client" + mock "github.com/stretchr/testify/mock" ) // ClientCreator is an autogenerated mock type for the ClientCreator type diff --git a/state/execution.go b/state/execution.go index 586f3ecf8..afaff2562 100644 --- a/state/execution.go +++ b/state/execution.go @@ -261,8 +261,7 @@ func (blockExec *BlockExecutor) Commit( // Update mempool. updateMempoolStartTime := time.Now().UnixNano() err = blockExec.mempool.Update( - block.Height, - block.Txs, + block, deliverTxResponses, TxPreCheck(state), TxPostCheck(state), diff --git a/state/state_test.go b/state/state_test.go index 25ee7df17..3e6cb195a 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/line/tm-db/v2/metadb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -30,8 +31,8 @@ import ( // setupTestCase does setup common to all test cases. func setupTestCase(t *testing.T) (func(t *testing.T), dbm.DB, sm.State) { config := cfg.ResetTestRoot("state_") - dbType := dbm.BackendType(config.DBBackend) - stateDB, err := dbm.NewDB("state", dbType, config.DBDir()) + dbType := metadb.BackendType(config.DBBackend) + stateDB, err := metadb.NewDB("state", dbType, config.DBDir()) stateStore := sm.NewStore(stateDB) require.NoError(t, err) state, err := stateStore.LoadFromDBOrGenesisFile(config.GenesisFile()) diff --git a/state/tx_filter_test.go b/state/tx_filter_test.go index c427a142d..a1446be39 100644 --- a/state/tx_filter_test.go +++ b/state/tx_filter_test.go @@ -4,11 +4,10 @@ import ( "os" "testing" + "github.com/line/tm-db/v2/metadb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/line/tm-db/v2" - tmrand "github.com/line/ostracon/libs/rand" sm "github.com/line/ostracon/state" "github.com/line/ostracon/types" @@ -31,7 +30,7 @@ func TestTxFilter(t *testing.T) { } for i, tc := range testCases { - stateDB, err := dbm.NewDB("state", "memdb", os.TempDir()) + stateDB, err := metadb.NewDB("state", "memdb", os.TempDir()) require.NoError(t, err) stateStore := sm.NewStore(stateDB) state, err := stateStore.LoadFromDBOrGenesisDoc(genDoc) diff --git a/state/txindex/indexer_service_test.go b/state/txindex/indexer_service_test.go index bb08ca318..941768625 100644 --- a/state/txindex/indexer_service_test.go +++ b/state/txindex/indexer_service_test.go @@ -4,11 +4,10 @@ import ( "testing" "time" + "github.com/line/tm-db/v2/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - db "github.com/line/tm-db/v2" - abci "github.com/line/ostracon/abci/types" "github.com/line/ostracon/libs/log" "github.com/line/ostracon/state/txindex" @@ -29,7 +28,7 @@ func TestIndexerServiceIndexesBlocks(t *testing.T) { }) // tx indexer - store := db.NewMemDB() + store := memdb.NewDB() txIndexer := kv.NewTxIndex(store) service := txindex.NewIndexerService(txIndexer, eventBus) diff --git a/state/txindex/kv/kv_bench_test.go b/state/txindex/kv/kv_bench_test.go index 881f27d02..0471089d8 100644 --- a/state/txindex/kv/kv_bench_test.go +++ b/state/txindex/kv/kv_bench_test.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "testing" - dbm "github.com/line/tm-db/v2" + "github.com/line/tm-db/v2/goleveldb" abci "github.com/line/ostracon/abci/types" "github.com/line/ostracon/libs/pubsub/query" @@ -20,7 +20,7 @@ func BenchmarkTxSearch(b *testing.B) { b.Errorf("failed to create temporary directory: %s", err) } - db, err := dbm.NewGoLevelDB("benchmark_tx_search_test", dbDir) + db, err := goleveldb.NewDB("benchmark_tx_search_test", dbDir) if err != nil { b.Errorf("failed to create database: %s", err) } diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index 763bb3a0f..eff276d41 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/gogo/protobuf/proto" + "github.com/line/tm-db/v2/memdb" + "github.com/line/tm-db/v2/metadb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - db "github.com/line/tm-db/v2" - abci "github.com/line/ostracon/abci/types" "github.com/line/ostracon/libs/pubsub/query" tmrand "github.com/line/ostracon/libs/rand" @@ -21,7 +21,7 @@ import ( ) func TestTxIndex(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) tx := types.Tx("HELLO WORLD") txResult := &abci.TxResult{ @@ -67,7 +67,7 @@ func TestTxIndex(t *testing.T) { } func TestTxSearch(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) txResult := txResultWithEvents([]abci.Event{ {Type: "account", Attributes: []abci.EventAttribute{{Key: []byte("number"), Value: []byte("1"), Index: true}}}, @@ -141,7 +141,7 @@ func TestTxSearch(t *testing.T) { } func TestTxSearchWithCancelation(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) txResult := txResultWithEvents([]abci.Event{ {Type: "account", Attributes: []abci.EventAttribute{{Key: []byte("number"), Value: []byte("1"), Index: true}}}, @@ -159,7 +159,7 @@ func TestTxSearchWithCancelation(t *testing.T) { } func TestTxSearchDeprecatedIndexing(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) // index tx using events indexing (composite key) txResult1 := txResultWithEvents([]abci.Event{ @@ -238,7 +238,7 @@ func TestTxSearchDeprecatedIndexing(t *testing.T) { } func TestTxSearchOneTxWithMultipleSameTagsButDifferentValues(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) txResult := txResultWithEvents([]abci.Event{ {Type: "account", Attributes: []abci.EventAttribute{{Key: []byte("number"), Value: []byte("1"), Index: true}}}, @@ -260,7 +260,7 @@ func TestTxSearchOneTxWithMultipleSameTagsButDifferentValues(t *testing.T) { } func TestTxSearchMultipleTxs(t *testing.T) { - indexer := NewTxIndex(db.NewMemDB()) + indexer := NewTxIndex(memdb.NewDB()) // indexed first, but bigger height (to test the order of transactions) txResult := txResultWithEvents([]abci.Event{ @@ -333,7 +333,7 @@ func benchmarkTxIndex(txsCount int64, b *testing.B) { require.NoError(b, err) defer os.RemoveAll(dir) - store, err := db.NewDB("tx_index", "goleveldb", dir) + store, err := metadb.NewDB("tx_index", "goleveldb", dir) require.NoError(b, err) indexer := NewTxIndex(store) diff --git a/test/maverick/consensus/replay_file.go b/test/maverick/consensus/replay_file.go index ee4861062..b60dfc803 100644 --- a/test/maverick/consensus/replay_file.go +++ b/test/maverick/consensus/replay_file.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - dbm "github.com/line/tm-db/v2" + "github.com/line/tm-db/v2/metadb" cfg "github.com/line/ostracon/config" tmcon "github.com/line/ostracon/consensus" @@ -285,16 +285,16 @@ func (pb *playback) replayConsoleLoop() int { // convenience for replay mode func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusConfig) *State { - dbType := dbm.BackendType(config.DBBackend) + dbType := metadb.BackendType(config.DBBackend) // Get BlockStore - blockStoreDB, err := dbm.NewDB("blockstore", dbType, config.DBDir()) + blockStoreDB, err := metadb.NewDB("blockstore", dbType, config.DBDir()) if err != nil { tmos.Exit(err.Error()) } blockStore := store.NewBlockStore(blockStoreDB) // Get State - stateDB, err := dbm.NewDB("state", dbType, config.DBDir()) + stateDB, err := metadb.NewDB("state", dbType, config.DBDir()) if err != nil { tmos.Exit(err.Error()) } diff --git a/test/maverick/consensus/replay_stubs.go b/test/maverick/consensus/replay_stubs.go index 39c84b578..5c94c9fce 100644 --- a/test/maverick/consensus/replay_stubs.go +++ b/test/maverick/consensus/replay_stubs.go @@ -24,8 +24,7 @@ func (emptyMempool) CheckTx(_ types.Tx, _ func(*abci.Response), _ mempl.TxInfo) func (emptyMempool) ReapMaxBytesMaxGas(_, _ int64) types.Txs { return types.Txs{} } func (emptyMempool) ReapMaxTxs(n int) types.Txs { return types.Txs{} } func (emptyMempool) Update( - _ int64, - _ types.Txs, + _ *types.Block, _ []*abci.ResponseDeliverTx, _ mempl.PreCheckFunc, _ mempl.PostCheckFunc, diff --git a/test/maverick/consensus/wal_generator.go b/test/maverick/consensus/wal_generator.go index 143f82e40..e5cac8a57 100644 --- a/test/maverick/consensus/wal_generator.go +++ b/test/maverick/consensus/wal_generator.go @@ -9,7 +9,7 @@ import ( "testing" "time" - db "github.com/line/tm-db/v2" + "github.com/line/tm-db/v2/memdb" "github.com/line/ostracon/abci/example/kvstore" cfg "github.com/line/ostracon/config" @@ -50,7 +50,7 @@ func WALGenerateNBlocks(t *testing.T, wr io.Writer, numBlocks int) (err error) { if err != nil { return fmt.Errorf("failed to read genesis file: %w", err) } - blockStoreDB := db.NewMemDB() + blockStoreDB := memdb.NewDB() stateDB := blockStoreDB stateStore := sm.NewStore(stateDB) state, err := sm.MakeGenesisState(genDoc) diff --git a/test/maverick/node/node.go b/test/maverick/node/node.go index c497bf8c3..fdb7f6b92 100644 --- a/test/maverick/node/node.go +++ b/test/maverick/node/node.go @@ -12,6 +12,7 @@ import ( "strings" "time" + "github.com/line/tm-db/v2/metadb" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/cors" @@ -95,8 +96,8 @@ type DBProvider func(*DBContext) (dbm.DB, error) // DefaultDBProvider returns a database using the DBBackend and DBDir // specified in the ctx.Config. func DefaultDBProvider(ctx *DBContext) (dbm.DB, error) { - dbType := dbm.BackendType(ctx.Config.DBBackend) - return dbm.NewDB(ctx.ID, dbType, ctx.Config.DBDir()) + dbType := metadb.BackendType(ctx.Config.DBBackend) + return metadb.NewDB(ctx.ID, dbType, ctx.Config.DBDir()) } // GenesisDocProvider returns a GenesisDoc. diff --git a/tests.mk b/tests.mk index 224a3874b..204ce8d3f 100644 --- a/tests.mk +++ b/tests.mk @@ -61,17 +61,17 @@ vagrant_test: ### go tests test: @echo "--> Running go test" - @go test -p 1 $(PACKAGES) -tags deadlock + @go test -p 1 $(PACKAGES) -tags 'deadlock memdb goleveldb' .PHONY: test test_race: @echo "--> Running go test --race" - @go test -p 1 -v -race $(PACKAGES) + @go test -p 1 -v -race $(PACKAGES) -tags 'memdb goleveldb' .PHONY: test_race test_deadlock: @echo "--> Running go test --deadlock" - @go test -p 1 -v $(PACKAGES) -tags deadlock + @go test -p 1 -v $(PACKAGES) -tags 'deadlock memdb goleveldb' .PHONY: test_race ###