diff --git a/CHANGELOG.md b/CHANGELOG.md index 627e23c3f..c2b183f1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 0.9.0 (TBD) BREAKING CHANGES: - - [types] ResponseEndBlock: renamed Diffs field to ValidatorSetUpdates + - [types] ResponseEndBlock: renamed Diffs field to ValidatorUpdates FEATURES: - [types] ResponseEndBlock: added ConsensusParamUpdates diff --git a/Makefile b/Makefile index d5fe913b2..8487febf1 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,12 @@ GOTOOLS = \ github.com/mitchellh/gox \ github.com/Masterminds/glide \ github.com/alecthomas/gometalinter \ - github.com/ckaznocha/protoc-gen-lint \ github.com/gogo/protobuf/protoc-gen-gogo \ github.com/gogo/protobuf/gogoproto INCLUDE = -I=. -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf -all: install test +all: protoc install test metalinter PACKAGES=$(shell go list ./... | grep -v '/vendor/') @@ -27,7 +26,7 @@ protoc: ## On "error while loading shared libraries: libprotobuf.so.14: cannot open shared object file: No such file or directory" ## ldconfig (may require sudo) ## https://stackoverflow.com/a/25518702 - protoc $(INCLUDE) --gogo_out=plugins=grpc:. --lint_out=. types/*.proto + protoc $(INCLUDE) --gogo_out=plugins=grpc:. types/*.proto install: @ go install ./cmd/... @@ -41,15 +40,13 @@ dist: test: @ find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \; - @ echo "==> Running linter" - @ make metalinter_test @ echo "==> Running go test" @ go test $(PACKAGES) test_race: @ find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \; @ echo "==> Running go test --race" - @go test -v -race $(PACKAGES) + @ go test -v -race $(PACKAGES) test_integrations: @ bash test.sh @@ -62,19 +59,18 @@ get_deps: ensure_tools: go get -u -v $(GOTOOLS) - @gometalinter --install + @ gometalinter --install get_vendor_deps: ensure_tools @rm -rf vendor/ @echo "--> Running glide install" @ glide install -metalinter: - protoc $(INCLUDE) --lint_out=. types/*.proto +metalinter_all: gometalinter --vendor --deadline=600s --enable-all --disable=lll ./... -metalinter_test: - protoc $(INCLUDE) --lint_out=. types/*.proto +metalinter: + @ echo "==> Running linter" gometalinter --vendor --deadline=600s --disable-all \ --enable=maligned \ --enable=deadcode \ diff --git a/README.md b/README.md index d16792218..546342fc9 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ Here, we describe the requests and responses as function arguments and return va * __Arguments__: * `Height (int64)`: The block height that ended * __Returns__: - * `ValidatorSetUpdates ([]Validator)`: Changes to validator set (set voting power to 0 to remove) + * `ValidatorUpdates ([]Validator)`: Changes to validator set (set voting power to 0 to remove) * `ConsensusParamUpdates (ConsensusParams)`: Changes to consensus-critical time/size parameters * __Usage__:
Signals the end of a block. Called prior to each Commit after all transactions. Validator set is updated with the result. diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go index e3cdfc628..96666547f 100644 --- a/example/dummy/dummy_test.go +++ b/example/dummy/dummy_test.go @@ -107,7 +107,7 @@ func TestPersistentDummyInfo(t *testing.T) { } // add a validator, remove a validator, update a validator -func TestValSetUpdates(t *testing.T) { +func TestValUpdates(t *testing.T) { dir, err := ioutil.TempDir("/tmp", "abci-dummy-test") // TODO if err != nil { t.Fatal(err) @@ -188,7 +188,7 @@ func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff [ resEndBlock := dummy.EndBlock(types.RequestEndBlock{header.Height}) dummy.Commit() - valsEqual(t, diff, resEndBlock.ValidatorSetUpdates) + valsEqual(t, diff, resEndBlock.ValidatorUpdates) } diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go index 47f8630c4..4165b9f71 100644 --- a/example/dummy/persistent_dummy.go +++ b/example/dummy/persistent_dummy.go @@ -28,7 +28,7 @@ type PersistentDummyApplication struct { app *DummyApplication // validator set - valSetUpdates []*types.Validator + ValUpdates []*types.Validator logger log.Logger } @@ -71,7 +71,7 @@ func (app *PersistentDummyApplication) DeliverTx(tx []byte) types.ResponseDelive // format is "val:pubkey/power" if isValidatorTx(tx) { // update validators in the merkle tree - // and in app.valSetUpdates + // and in app.ValUpdates return app.execValidatorTx(tx) } @@ -119,13 +119,13 @@ func (app *PersistentDummyApplication) InitChain(req types.RequestInitChain) typ // Track the block hash and header information func (app *PersistentDummyApplication) BeginBlock(req types.RequestBeginBlock) types.ResponseBeginBlock { // reset valset changes - app.valSetUpdates = make([]*types.Validator, 0) + app.ValUpdates = make([]*types.Validator, 0) return types.ResponseBeginBlock{} } // Update the validator set func (app *PersistentDummyApplication) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock { - return types.ResponseEndBlock{ValidatorSetUpdates: app.valSetUpdates} + return types.ResponseEndBlock{ValidatorUpdates: app.ValUpdates} } //--------------------------------------------- @@ -216,7 +216,7 @@ func (app *PersistentDummyApplication) updateValidator(v *types.Validator) types } // we only update the changes array if we successfully updated the tree - app.valSetUpdates = append(app.valSetUpdates, v) + app.ValUpdates = append(app.ValUpdates, v) return types.ResponseDeliverTx{Code: code.CodeTypeOK} } diff --git a/types/types.pb.go b/types/types.pb.go index 202ab71c5..14026a8b1 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -13,26 +13,26 @@ It has these top-level messages: RequestFlush RequestInfo RequestSetOption - RequestDeliverTx - RequestCheckTx - RequestQuery - RequestCommit RequestInitChain + RequestQuery RequestBeginBlock + RequestCheckTx + RequestDeliverTx RequestEndBlock + RequestCommit Response ResponseException ResponseEcho ResponseFlush ResponseInfo ResponseSetOption - ResponseDeliverTx - ResponseCheckTx - ResponseQuery - ResponseCommit ResponseInitChain + ResponseQuery ResponseBeginBlock + ResponseCheckTx + ResponseDeliverTx ResponseEndBlock + ResponseCommit ConsensusParams BlockSize TxSize @@ -94,13 +94,13 @@ type Request struct { // *Request_Flush // *Request_Info // *Request_SetOption - // *Request_DeliverTx - // *Request_CheckTx - // *Request_Commit - // *Request_Query // *Request_InitChain + // *Request_Query // *Request_BeginBlock + // *Request_CheckTx + // *Request_DeliverTx // *Request_EndBlock + // *Request_Commit Value isRequest_Value `protobuf_oneof:"value"` } @@ -114,50 +114,50 @@ type isRequest_Value interface { } type Request_Echo struct { - Echo *RequestEcho `protobuf:"bytes,1,opt,name=echo,oneof"` + Echo *RequestEcho `protobuf:"bytes,2,opt,name=echo,oneof"` } type Request_Flush struct { - Flush *RequestFlush `protobuf:"bytes,2,opt,name=flush,oneof"` + Flush *RequestFlush `protobuf:"bytes,3,opt,name=flush,oneof"` } type Request_Info struct { - Info *RequestInfo `protobuf:"bytes,3,opt,name=info,oneof"` + Info *RequestInfo `protobuf:"bytes,4,opt,name=info,oneof"` } type Request_SetOption struct { - SetOption *RequestSetOption `protobuf:"bytes,4,opt,name=set_option,json=setOption,oneof"` -} -type Request_DeliverTx struct { - DeliverTx *RequestDeliverTx `protobuf:"bytes,5,opt,name=deliver_tx,json=deliverTx,oneof"` + SetOption *RequestSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,oneof"` } -type Request_CheckTx struct { - CheckTx *RequestCheckTx `protobuf:"bytes,6,opt,name=check_tx,json=checkTx,oneof"` -} -type Request_Commit struct { - Commit *RequestCommit `protobuf:"bytes,7,opt,name=commit,oneof"` +type Request_InitChain struct { + InitChain *RequestInitChain `protobuf:"bytes,6,opt,name=init_chain,json=initChain,oneof"` } type Request_Query struct { - Query *RequestQuery `protobuf:"bytes,8,opt,name=query,oneof"` -} -type Request_InitChain struct { - InitChain *RequestInitChain `protobuf:"bytes,9,opt,name=init_chain,json=initChain,oneof"` + Query *RequestQuery `protobuf:"bytes,7,opt,name=query,oneof"` } type Request_BeginBlock struct { - BeginBlock *RequestBeginBlock `protobuf:"bytes,10,opt,name=begin_block,json=beginBlock,oneof"` + BeginBlock *RequestBeginBlock `protobuf:"bytes,8,opt,name=begin_block,json=beginBlock,oneof"` +} +type Request_CheckTx struct { + CheckTx *RequestCheckTx `protobuf:"bytes,9,opt,name=check_tx,json=checkTx,oneof"` +} +type Request_DeliverTx struct { + DeliverTx *RequestDeliverTx `protobuf:"bytes,19,opt,name=deliver_tx,json=deliverTx,oneof"` } type Request_EndBlock struct { EndBlock *RequestEndBlock `protobuf:"bytes,11,opt,name=end_block,json=endBlock,oneof"` } +type Request_Commit struct { + Commit *RequestCommit `protobuf:"bytes,12,opt,name=commit,oneof"` +} func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} func (*Request_Info) isRequest_Value() {} func (*Request_SetOption) isRequest_Value() {} -func (*Request_DeliverTx) isRequest_Value() {} -func (*Request_CheckTx) isRequest_Value() {} -func (*Request_Commit) isRequest_Value() {} -func (*Request_Query) isRequest_Value() {} func (*Request_InitChain) isRequest_Value() {} +func (*Request_Query) isRequest_Value() {} func (*Request_BeginBlock) isRequest_Value() {} +func (*Request_CheckTx) isRequest_Value() {} +func (*Request_DeliverTx) isRequest_Value() {} func (*Request_EndBlock) isRequest_Value() {} +func (*Request_Commit) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -194,51 +194,51 @@ func (m *Request) GetSetOption() *RequestSetOption { return nil } -func (m *Request) GetDeliverTx() *RequestDeliverTx { - if x, ok := m.GetValue().(*Request_DeliverTx); ok { - return x.DeliverTx +func (m *Request) GetInitChain() *RequestInitChain { + if x, ok := m.GetValue().(*Request_InitChain); ok { + return x.InitChain } return nil } -func (m *Request) GetCheckTx() *RequestCheckTx { - if x, ok := m.GetValue().(*Request_CheckTx); ok { - return x.CheckTx +func (m *Request) GetQuery() *RequestQuery { + if x, ok := m.GetValue().(*Request_Query); ok { + return x.Query } return nil } -func (m *Request) GetCommit() *RequestCommit { - if x, ok := m.GetValue().(*Request_Commit); ok { - return x.Commit +func (m *Request) GetBeginBlock() *RequestBeginBlock { + if x, ok := m.GetValue().(*Request_BeginBlock); ok { + return x.BeginBlock } return nil } -func (m *Request) GetQuery() *RequestQuery { - if x, ok := m.GetValue().(*Request_Query); ok { - return x.Query +func (m *Request) GetCheckTx() *RequestCheckTx { + if x, ok := m.GetValue().(*Request_CheckTx); ok { + return x.CheckTx } return nil } -func (m *Request) GetInitChain() *RequestInitChain { - if x, ok := m.GetValue().(*Request_InitChain); ok { - return x.InitChain +func (m *Request) GetDeliverTx() *RequestDeliverTx { + if x, ok := m.GetValue().(*Request_DeliverTx); ok { + return x.DeliverTx } return nil } -func (m *Request) GetBeginBlock() *RequestBeginBlock { - if x, ok := m.GetValue().(*Request_BeginBlock); ok { - return x.BeginBlock +func (m *Request) GetEndBlock() *RequestEndBlock { + if x, ok := m.GetValue().(*Request_EndBlock); ok { + return x.EndBlock } return nil } -func (m *Request) GetEndBlock() *RequestEndBlock { - if x, ok := m.GetValue().(*Request_EndBlock); ok { - return x.EndBlock +func (m *Request) GetCommit() *RequestCommit { + if x, ok := m.GetValue().(*Request_Commit); ok { + return x.Commit } return nil } @@ -250,13 +250,13 @@ func (*Request) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error (*Request_Flush)(nil), (*Request_Info)(nil), (*Request_SetOption)(nil), - (*Request_DeliverTx)(nil), - (*Request_CheckTx)(nil), - (*Request_Commit)(nil), - (*Request_Query)(nil), (*Request_InitChain)(nil), + (*Request_Query)(nil), (*Request_BeginBlock)(nil), + (*Request_CheckTx)(nil), + (*Request_DeliverTx)(nil), (*Request_EndBlock)(nil), + (*Request_Commit)(nil), } } @@ -265,53 +265,48 @@ func _Request_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { // value switch x := m.Value.(type) { case *Request_Echo: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) + _ = b.EncodeVarint(2<<3 | proto.WireBytes) if err := b.EncodeMessage(x.Echo); err != nil { return err } case *Request_Flush: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) + _ = b.EncodeVarint(3<<3 | proto.WireBytes) if err := b.EncodeMessage(x.Flush); err != nil { return err } case *Request_Info: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) + _ = b.EncodeVarint(4<<3 | proto.WireBytes) if err := b.EncodeMessage(x.Info); err != nil { return err } case *Request_SetOption: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SetOption); err != nil { - return err - } - case *Request_DeliverTx: _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DeliverTx); err != nil { + if err := b.EncodeMessage(x.SetOption); err != nil { return err } - case *Request_CheckTx: + case *Request_InitChain: _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.CheckTx); err != nil { + if err := b.EncodeMessage(x.InitChain); err != nil { return err } - case *Request_Commit: + case *Request_Query: _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Commit); err != nil { + if err := b.EncodeMessage(x.Query); err != nil { return err } - case *Request_Query: + case *Request_BeginBlock: _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Query); err != nil { + if err := b.EncodeMessage(x.BeginBlock); err != nil { return err } - case *Request_InitChain: + case *Request_CheckTx: _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.InitChain); err != nil { + if err := b.EncodeMessage(x.CheckTx); err != nil { return err } - case *Request_BeginBlock: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.BeginBlock); err != nil { + case *Request_DeliverTx: + _ = b.EncodeVarint(19<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.DeliverTx); err != nil { return err } case *Request_EndBlock: @@ -319,6 +314,11 @@ func _Request_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { if err := b.EncodeMessage(x.EndBlock); err != nil { return err } + case *Request_Commit: + _ = b.EncodeVarint(12<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Commit); err != nil { + return err + } case nil: default: return fmt.Errorf("Request.Value has unexpected type %T", x) @@ -329,7 +329,7 @@ func _Request_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { m := msg.(*Request) switch tag { - case 1: // value.echo + case 2: // value.echo if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -337,7 +337,7 @@ func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer err := b.DecodeMessage(msg) m.Value = &Request_Echo{msg} return true, err - case 2: // value.flush + case 3: // value.flush if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -345,7 +345,7 @@ func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer err := b.DecodeMessage(msg) m.Value = &Request_Flush{msg} return true, err - case 3: // value.info + case 4: // value.info if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -353,7 +353,7 @@ func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer err := b.DecodeMessage(msg) m.Value = &Request_Info{msg} return true, err - case 4: // value.set_option + case 5: // value.set_option if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } @@ -361,61 +361,61 @@ func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer err := b.DecodeMessage(msg) m.Value = &Request_SetOption{msg} return true, err - case 5: // value.deliver_tx + case 6: // value.init_chain if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestDeliverTx) + msg := new(RequestInitChain) err := b.DecodeMessage(msg) - m.Value = &Request_DeliverTx{msg} + m.Value = &Request_InitChain{msg} return true, err - case 6: // value.check_tx + case 7: // value.query if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestCheckTx) + msg := new(RequestQuery) err := b.DecodeMessage(msg) - m.Value = &Request_CheckTx{msg} + m.Value = &Request_Query{msg} return true, err - case 7: // value.commit + case 8: // value.begin_block if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestCommit) + msg := new(RequestBeginBlock) err := b.DecodeMessage(msg) - m.Value = &Request_Commit{msg} + m.Value = &Request_BeginBlock{msg} return true, err - case 8: // value.query + case 9: // value.check_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestQuery) + msg := new(RequestCheckTx) err := b.DecodeMessage(msg) - m.Value = &Request_Query{msg} + m.Value = &Request_CheckTx{msg} return true, err - case 9: // value.init_chain + case 19: // value.deliver_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestInitChain) + msg := new(RequestDeliverTx) err := b.DecodeMessage(msg) - m.Value = &Request_InitChain{msg} + m.Value = &Request_DeliverTx{msg} return true, err - case 10: // value.begin_block + case 11: // value.end_block if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestBeginBlock) + msg := new(RequestEndBlock) err := b.DecodeMessage(msg) - m.Value = &Request_BeginBlock{msg} + m.Value = &Request_EndBlock{msg} return true, err - case 11: // value.end_block + case 12: // value.commit if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestEndBlock) + msg := new(RequestCommit) err := b.DecodeMessage(msg) - m.Value = &Request_EndBlock{msg} + m.Value = &Request_Commit{msg} return true, err default: return false, nil @@ -428,52 +428,47 @@ func _Request_OneofSizer(msg proto.Message) (n int) { switch x := m.Value.(type) { case *Request_Echo: s := proto.Size(x.Echo) - n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += proto.SizeVarint(2<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s case *Request_Flush: s := proto.Size(x.Flush) - n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += proto.SizeVarint(3<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s case *Request_Info: s := proto.Size(x.Info) - n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += proto.SizeVarint(4<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s case *Request_SetOption: s := proto.Size(x.SetOption) - n += proto.SizeVarint(4<<3 | proto.WireBytes) - n += proto.SizeVarint(uint64(s)) - n += s - case *Request_DeliverTx: - s := proto.Size(x.DeliverTx) n += proto.SizeVarint(5<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_CheckTx: - s := proto.Size(x.CheckTx) + case *Request_InitChain: + s := proto.Size(x.InitChain) n += proto.SizeVarint(6<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_Commit: - s := proto.Size(x.Commit) + case *Request_Query: + s := proto.Size(x.Query) n += proto.SizeVarint(7<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_Query: - s := proto.Size(x.Query) + case *Request_BeginBlock: + s := proto.Size(x.BeginBlock) n += proto.SizeVarint(8<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_InitChain: - s := proto.Size(x.InitChain) + case *Request_CheckTx: + s := proto.Size(x.CheckTx) n += proto.SizeVarint(9<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_BeginBlock: - s := proto.Size(x.BeginBlock) - n += proto.SizeVarint(10<<3 | proto.WireBytes) + case *Request_DeliverTx: + s := proto.Size(x.DeliverTx) + n += proto.SizeVarint(19<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s case *Request_EndBlock: @@ -481,6 +476,11 @@ func _Request_OneofSizer(msg proto.Message) (n int) { n += proto.SizeVarint(11<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s + case *Request_Commit: + s := proto.Size(x.Commit) + n += proto.SizeVarint(12<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s case nil: default: panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) @@ -552,34 +552,18 @@ func (m *RequestSetOption) GetValue() string { return "" } -type RequestDeliverTx struct { - Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` -} - -func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } -func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } -func (*RequestDeliverTx) ProtoMessage() {} -func (*RequestDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{5} } - -func (m *RequestDeliverTx) GetTx() []byte { - if m != nil { - return m.Tx - } - return nil -} - -type RequestCheckTx struct { - Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +type RequestInitChain struct { + Validators []*Validator `protobuf:"bytes,1,rep,name=validators" json:"validators,omitempty"` } -func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } -func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } -func (*RequestCheckTx) ProtoMessage() {} -func (*RequestCheckTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{6} } +func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } +func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } +func (*RequestInitChain) ProtoMessage() {} +func (*RequestInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{5} } -func (m *RequestCheckTx) GetTx() []byte { +func (m *RequestInitChain) GetValidators() []*Validator { if m != nil { - return m.Tx + return m.Validators } return nil } @@ -594,7 +578,7 @@ type RequestQuery struct { func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} -func (*RequestQuery) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{7} } +func (*RequestQuery) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{6} } func (m *RequestQuery) GetData() []byte { if m != nil { @@ -624,30 +608,6 @@ func (m *RequestQuery) GetProve() bool { return false } -type RequestCommit struct { -} - -func (m *RequestCommit) Reset() { *m = RequestCommit{} } -func (m *RequestCommit) String() string { return proto.CompactTextString(m) } -func (*RequestCommit) ProtoMessage() {} -func (*RequestCommit) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{8} } - -type RequestInitChain struct { - Validators []*Validator `protobuf:"bytes,1,rep,name=validators" json:"validators,omitempty"` -} - -func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } -func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } -func (*RequestInitChain) ProtoMessage() {} -func (*RequestInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{9} } - -func (m *RequestInitChain) GetValidators() []*Validator { - if m != nil { - return m.Validators - } - return nil -} - type RequestBeginBlock struct { Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` Header *Header `protobuf:"bytes,2,opt,name=header" json:"header,omitempty"` @@ -658,7 +618,7 @@ type RequestBeginBlock struct { func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} -func (*RequestBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{10} } +func (*RequestBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{7} } func (m *RequestBeginBlock) GetHash() []byte { if m != nil { @@ -688,6 +648,38 @@ func (m *RequestBeginBlock) GetByzantineValidators() []*Evidence { return nil } +type RequestCheckTx struct { + Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +} + +func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } +func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } +func (*RequestCheckTx) ProtoMessage() {} +func (*RequestCheckTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{8} } + +func (m *RequestCheckTx) GetTx() []byte { + if m != nil { + return m.Tx + } + return nil +} + +type RequestDeliverTx struct { + Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +} + +func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } +func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } +func (*RequestDeliverTx) ProtoMessage() {} +func (*RequestDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{9} } + +func (m *RequestDeliverTx) GetTx() []byte { + if m != nil { + return m.Tx + } + return nil +} + type RequestEndBlock struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` } @@ -695,7 +687,7 @@ type RequestEndBlock struct { func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} -func (*RequestEndBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{11} } +func (*RequestEndBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{10} } func (m *RequestEndBlock) GetHeight() int64 { if m != nil { @@ -704,6 +696,14 @@ func (m *RequestEndBlock) GetHeight() int64 { return 0 } +type RequestCommit struct { +} + +func (m *RequestCommit) Reset() { *m = RequestCommit{} } +func (m *RequestCommit) String() string { return proto.CompactTextString(m) } +func (*RequestCommit) ProtoMessage() {} +func (*RequestCommit) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{11} } + type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception @@ -711,13 +711,13 @@ type Response struct { // *Response_Flush // *Response_Info // *Response_SetOption - // *Response_DeliverTx - // *Response_CheckTx - // *Response_Commit - // *Response_Query // *Response_InitChain + // *Response_Query // *Response_BeginBlock + // *Response_CheckTx + // *Response_DeliverTx // *Response_EndBlock + // *Response_Commit Value isResponse_Value `protobuf_oneof:"value"` } @@ -745,26 +745,26 @@ type Response_Info struct { type Response_SetOption struct { SetOption *ResponseSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,oneof"` } -type Response_DeliverTx struct { - DeliverTx *ResponseDeliverTx `protobuf:"bytes,6,opt,name=deliver_tx,json=deliverTx,oneof"` -} -type Response_CheckTx struct { - CheckTx *ResponseCheckTx `protobuf:"bytes,7,opt,name=check_tx,json=checkTx,oneof"` -} -type Response_Commit struct { - Commit *ResponseCommit `protobuf:"bytes,8,opt,name=commit,oneof"` +type Response_InitChain struct { + InitChain *ResponseInitChain `protobuf:"bytes,6,opt,name=init_chain,json=initChain,oneof"` } type Response_Query struct { - Query *ResponseQuery `protobuf:"bytes,9,opt,name=query,oneof"` -} -type Response_InitChain struct { - InitChain *ResponseInitChain `protobuf:"bytes,10,opt,name=init_chain,json=initChain,oneof"` + Query *ResponseQuery `protobuf:"bytes,7,opt,name=query,oneof"` } type Response_BeginBlock struct { - BeginBlock *ResponseBeginBlock `protobuf:"bytes,11,opt,name=begin_block,json=beginBlock,oneof"` + BeginBlock *ResponseBeginBlock `protobuf:"bytes,8,opt,name=begin_block,json=beginBlock,oneof"` +} +type Response_CheckTx struct { + CheckTx *ResponseCheckTx `protobuf:"bytes,9,opt,name=check_tx,json=checkTx,oneof"` +} +type Response_DeliverTx struct { + DeliverTx *ResponseDeliverTx `protobuf:"bytes,10,opt,name=deliver_tx,json=deliverTx,oneof"` } type Response_EndBlock struct { - EndBlock *ResponseEndBlock `protobuf:"bytes,12,opt,name=end_block,json=endBlock,oneof"` + EndBlock *ResponseEndBlock `protobuf:"bytes,11,opt,name=end_block,json=endBlock,oneof"` +} +type Response_Commit struct { + Commit *ResponseCommit `protobuf:"bytes,12,opt,name=commit,oneof"` } func (*Response_Exception) isResponse_Value() {} @@ -772,13 +772,13 @@ func (*Response_Echo) isResponse_Value() {} func (*Response_Flush) isResponse_Value() {} func (*Response_Info) isResponse_Value() {} func (*Response_SetOption) isResponse_Value() {} -func (*Response_DeliverTx) isResponse_Value() {} -func (*Response_CheckTx) isResponse_Value() {} -func (*Response_Commit) isResponse_Value() {} -func (*Response_Query) isResponse_Value() {} func (*Response_InitChain) isResponse_Value() {} +func (*Response_Query) isResponse_Value() {} func (*Response_BeginBlock) isResponse_Value() {} +func (*Response_CheckTx) isResponse_Value() {} +func (*Response_DeliverTx) isResponse_Value() {} func (*Response_EndBlock) isResponse_Value() {} +func (*Response_Commit) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -822,44 +822,37 @@ func (m *Response) GetSetOption() *ResponseSetOption { return nil } -func (m *Response) GetDeliverTx() *ResponseDeliverTx { - if x, ok := m.GetValue().(*Response_DeliverTx); ok { - return x.DeliverTx - } - return nil -} - -func (m *Response) GetCheckTx() *ResponseCheckTx { - if x, ok := m.GetValue().(*Response_CheckTx); ok { - return x.CheckTx +func (m *Response) GetInitChain() *ResponseInitChain { + if x, ok := m.GetValue().(*Response_InitChain); ok { + return x.InitChain } return nil } -func (m *Response) GetCommit() *ResponseCommit { - if x, ok := m.GetValue().(*Response_Commit); ok { - return x.Commit +func (m *Response) GetQuery() *ResponseQuery { + if x, ok := m.GetValue().(*Response_Query); ok { + return x.Query } return nil } -func (m *Response) GetQuery() *ResponseQuery { - if x, ok := m.GetValue().(*Response_Query); ok { - return x.Query +func (m *Response) GetBeginBlock() *ResponseBeginBlock { + if x, ok := m.GetValue().(*Response_BeginBlock); ok { + return x.BeginBlock } return nil } -func (m *Response) GetInitChain() *ResponseInitChain { - if x, ok := m.GetValue().(*Response_InitChain); ok { - return x.InitChain +func (m *Response) GetCheckTx() *ResponseCheckTx { + if x, ok := m.GetValue().(*Response_CheckTx); ok { + return x.CheckTx } return nil } -func (m *Response) GetBeginBlock() *ResponseBeginBlock { - if x, ok := m.GetValue().(*Response_BeginBlock); ok { - return x.BeginBlock +func (m *Response) GetDeliverTx() *ResponseDeliverTx { + if x, ok := m.GetValue().(*Response_DeliverTx); ok { + return x.DeliverTx } return nil } @@ -871,6 +864,13 @@ func (m *Response) GetEndBlock() *ResponseEndBlock { return nil } +func (m *Response) GetCommit() *ResponseCommit { + if x, ok := m.GetValue().(*Response_Commit); ok { + return x.Commit + } + return nil +} + // XXX_OneofFuncs is for the internal use of the proto package. func (*Response) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { return _Response_OneofMarshaler, _Response_OneofUnmarshaler, _Response_OneofSizer, []interface{}{ @@ -879,13 +879,13 @@ func (*Response) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro (*Response_Flush)(nil), (*Response_Info)(nil), (*Response_SetOption)(nil), - (*Response_DeliverTx)(nil), - (*Response_CheckTx)(nil), - (*Response_Commit)(nil), - (*Response_Query)(nil), (*Response_InitChain)(nil), + (*Response_Query)(nil), (*Response_BeginBlock)(nil), + (*Response_CheckTx)(nil), + (*Response_DeliverTx)(nil), (*Response_EndBlock)(nil), + (*Response_Commit)(nil), } } @@ -918,39 +918,39 @@ func _Response_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { if err := b.EncodeMessage(x.SetOption); err != nil { return err } - case *Response_DeliverTx: + case *Response_InitChain: _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.DeliverTx); err != nil { + if err := b.EncodeMessage(x.InitChain); err != nil { return err } - case *Response_CheckTx: + case *Response_Query: _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.CheckTx); err != nil { + if err := b.EncodeMessage(x.Query); err != nil { return err } - case *Response_Commit: + case *Response_BeginBlock: _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Commit); err != nil { + if err := b.EncodeMessage(x.BeginBlock); err != nil { return err } - case *Response_Query: + case *Response_CheckTx: _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Query); err != nil { + if err := b.EncodeMessage(x.CheckTx); err != nil { return err } - case *Response_InitChain: + case *Response_DeliverTx: _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.InitChain); err != nil { + if err := b.EncodeMessage(x.DeliverTx); err != nil { return err } - case *Response_BeginBlock: + case *Response_EndBlock: _ = b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.BeginBlock); err != nil { + if err := b.EncodeMessage(x.EndBlock); err != nil { return err } - case *Response_EndBlock: + case *Response_Commit: _ = b.EncodeVarint(12<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.EndBlock); err != nil { + if err := b.EncodeMessage(x.Commit); err != nil { return err } case nil: @@ -1003,61 +1003,61 @@ func _Response_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe err := b.DecodeMessage(msg) m.Value = &Response_SetOption{msg} return true, err - case 6: // value.deliver_tx + case 6: // value.init_chain if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseDeliverTx) + msg := new(ResponseInitChain) err := b.DecodeMessage(msg) - m.Value = &Response_DeliverTx{msg} + m.Value = &Response_InitChain{msg} return true, err - case 7: // value.check_tx + case 7: // value.query if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseCheckTx) + msg := new(ResponseQuery) err := b.DecodeMessage(msg) - m.Value = &Response_CheckTx{msg} + m.Value = &Response_Query{msg} return true, err - case 8: // value.commit + case 8: // value.begin_block if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseCommit) + msg := new(ResponseBeginBlock) err := b.DecodeMessage(msg) - m.Value = &Response_Commit{msg} + m.Value = &Response_BeginBlock{msg} return true, err - case 9: // value.query + case 9: // value.check_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseQuery) + msg := new(ResponseCheckTx) err := b.DecodeMessage(msg) - m.Value = &Response_Query{msg} + m.Value = &Response_CheckTx{msg} return true, err - case 10: // value.init_chain + case 10: // value.deliver_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseInitChain) + msg := new(ResponseDeliverTx) err := b.DecodeMessage(msg) - m.Value = &Response_InitChain{msg} + m.Value = &Response_DeliverTx{msg} return true, err - case 11: // value.begin_block + case 11: // value.end_block if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseBeginBlock) + msg := new(ResponseEndBlock) err := b.DecodeMessage(msg) - m.Value = &Response_BeginBlock{msg} + m.Value = &Response_EndBlock{msg} return true, err - case 12: // value.end_block + case 12: // value.commit if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseEndBlock) + msg := new(ResponseCommit) err := b.DecodeMessage(msg) - m.Value = &Response_EndBlock{msg} + m.Value = &Response_Commit{msg} return true, err default: return false, nil @@ -1093,38 +1093,38 @@ func _Response_OneofSizer(msg proto.Message) (n int) { n += proto.SizeVarint(5<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_DeliverTx: - s := proto.Size(x.DeliverTx) + case *Response_InitChain: + s := proto.Size(x.InitChain) n += proto.SizeVarint(6<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_CheckTx: - s := proto.Size(x.CheckTx) + case *Response_Query: + s := proto.Size(x.Query) n += proto.SizeVarint(7<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_Commit: - s := proto.Size(x.Commit) + case *Response_BeginBlock: + s := proto.Size(x.BeginBlock) n += proto.SizeVarint(8<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_Query: - s := proto.Size(x.Query) + case *Response_CheckTx: + s := proto.Size(x.CheckTx) n += proto.SizeVarint(9<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_InitChain: - s := proto.Size(x.InitChain) + case *Response_DeliverTx: + s := proto.Size(x.DeliverTx) n += proto.SizeVarint(10<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_BeginBlock: - s := proto.Size(x.BeginBlock) + case *Response_EndBlock: + s := proto.Size(x.EndBlock) n += proto.SizeVarint(11<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_EndBlock: - s := proto.Size(x.EndBlock) + case *Response_Commit: + s := proto.Size(x.Commit) n += proto.SizeVarint(12<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s @@ -1239,39 +1239,65 @@ func (m *ResponseSetOption) GetLog() string { return "" } -type ResponseDeliverTx struct { - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Data github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,2,opt,name=data,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"data"` - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Tags []*KVPair `protobuf:"bytes,4,rep,name=tags" json:"tags,omitempty"` +type ResponseInitChain struct { } -func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } -func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } -func (*ResponseDeliverTx) ProtoMessage() {} -func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{18} } +func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } +func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } +func (*ResponseInitChain) ProtoMessage() {} +func (*ResponseInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{18} } -func (m *ResponseDeliverTx) GetCode() uint32 { +type ResponseQuery struct { + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Index int64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Key github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,3,opt,name=key,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"key"` + Value github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,4,opt,name=value,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"value"` + Proof github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,5,opt,name=proof,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"proof"` + Height int64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"` + Log string `protobuf:"bytes,7,opt,name=log,proto3" json:"log,omitempty"` +} + +func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } +func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } +func (*ResponseQuery) ProtoMessage() {} +func (*ResponseQuery) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{19} } + +func (m *ResponseQuery) GetCode() uint32 { if m != nil { return m.Code } return 0 } -func (m *ResponseDeliverTx) GetLog() string { +func (m *ResponseQuery) GetIndex() int64 { if m != nil { - return m.Log + return m.Index } - return "" + return 0 } -func (m *ResponseDeliverTx) GetTags() []*KVPair { +func (m *ResponseQuery) GetHeight() int64 { if m != nil { - return m.Tags + return m.Height } - return nil + return 0 +} + +func (m *ResponseQuery) GetLog() string { + if m != nil { + return m.Log + } + return "" +} + +type ResponseBeginBlock struct { } +func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } +func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } +func (*ResponseBeginBlock) ProtoMessage() {} +func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{20} } + type ResponseCheckTx struct { Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` Data github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,2,opt,name=data,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"data"` @@ -1283,7 +1309,7 @@ type ResponseCheckTx struct { func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} -func (*ResponseCheckTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{19} } +func (*ResponseCheckTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{21} } func (m *ResponseCheckTx) GetCode() uint32 { if m != nil { @@ -1313,47 +1339,61 @@ func (m *ResponseCheckTx) GetFee() int64 { return 0 } -type ResponseQuery struct { - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Index int64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` - Key github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,3,opt,name=key,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"key"` - Value github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,4,opt,name=value,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"value"` - Proof github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,5,opt,name=proof,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"proof"` - Height int64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"` - Log string `protobuf:"bytes,7,opt,name=log,proto3" json:"log,omitempty"` +type ResponseDeliverTx struct { + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Data github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,2,opt,name=data,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"data"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Tags []*KVPair `protobuf:"bytes,4,rep,name=tags" json:"tags,omitempty"` } -func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } -func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } -func (*ResponseQuery) ProtoMessage() {} -func (*ResponseQuery) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{20} } +func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } +func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } +func (*ResponseDeliverTx) ProtoMessage() {} +func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{22} } -func (m *ResponseQuery) GetCode() uint32 { +func (m *ResponseDeliverTx) GetCode() uint32 { if m != nil { return m.Code } return 0 } -func (m *ResponseQuery) GetIndex() int64 { +func (m *ResponseDeliverTx) GetLog() string { if m != nil { - return m.Index + return m.Log } - return 0 + return "" } -func (m *ResponseQuery) GetHeight() int64 { +func (m *ResponseDeliverTx) GetTags() []*KVPair { if m != nil { - return m.Height + return m.Tags } - return 0 + return nil } -func (m *ResponseQuery) GetLog() string { +type ResponseEndBlock struct { + ValidatorUpdates []*Validator `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates" json:"validator_updates,omitempty"` + ConsensusParamUpdates *ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates" json:"consensus_param_updates,omitempty"` +} + +func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } +func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } +func (*ResponseEndBlock) ProtoMessage() {} +func (*ResponseEndBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{23} } + +func (m *ResponseEndBlock) GetValidatorUpdates() []*Validator { if m != nil { - return m.Log + return m.ValidatorUpdates } - return "" + return nil +} + +func (m *ResponseEndBlock) GetConsensusParamUpdates() *ConsensusParams { + if m != nil { + return m.ConsensusParamUpdates + } + return nil } type ResponseCommit struct { @@ -1365,7 +1405,7 @@ type ResponseCommit struct { func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} -func (*ResponseCommit) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{21} } +func (*ResponseCommit) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{24} } func (m *ResponseCommit) GetCode() uint32 { if m != nil { @@ -1381,46 +1421,6 @@ func (m *ResponseCommit) GetLog() string { return "" } -type ResponseInitChain struct { -} - -func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } -func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } -func (*ResponseInitChain) ProtoMessage() {} -func (*ResponseInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{22} } - -type ResponseBeginBlock struct { -} - -func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } -func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } -func (*ResponseBeginBlock) ProtoMessage() {} -func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{23} } - -type ResponseEndBlock struct { - ValidatorSetUpdates []*Validator `protobuf:"bytes,1,rep,name=validator_set_updates,json=validatorSetUpdates" json:"validator_set_updates,omitempty"` - ConsensusParamUpdates *ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates" json:"consensus_param_updates,omitempty"` -} - -func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } -func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } -func (*ResponseEndBlock) ProtoMessage() {} -func (*ResponseEndBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{24} } - -func (m *ResponseEndBlock) GetValidatorSetUpdates() []*Validator { - if m != nil { - return m.ValidatorSetUpdates - } - return nil -} - -func (m *ResponseEndBlock) GetConsensusParamUpdates() *ConsensusParams { - if m != nil { - return m.ConsensusParamUpdates - } - return nil -} - // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app type ConsensusParams struct { @@ -1457,7 +1457,6 @@ func (m *ConsensusParams) GetBlockGossip() *BlockGossip { // BlockSize contain limits on the block size. type BlockSize struct { - // NOTE: must not be 0 nor greater than 100MB MaxBytes int32 `protobuf:"varint,1,opt,name=max_bytes,json=maxBytes,proto3" json:"max_bytes,omitempty"` MaxTxs int32 `protobuf:"varint,2,opt,name=max_txs,json=maxTxs,proto3" json:"max_txs,omitempty"` MaxGas int64 `protobuf:"varint,3,opt,name=max_gas,json=maxGas,proto3" json:"max_gas,omitempty"` @@ -1755,26 +1754,26 @@ func init() { proto.RegisterType((*RequestFlush)(nil), "types.RequestFlush") proto.RegisterType((*RequestInfo)(nil), "types.RequestInfo") proto.RegisterType((*RequestSetOption)(nil), "types.RequestSetOption") - proto.RegisterType((*RequestDeliverTx)(nil), "types.RequestDeliverTx") - proto.RegisterType((*RequestCheckTx)(nil), "types.RequestCheckTx") - proto.RegisterType((*RequestQuery)(nil), "types.RequestQuery") - proto.RegisterType((*RequestCommit)(nil), "types.RequestCommit") proto.RegisterType((*RequestInitChain)(nil), "types.RequestInitChain") + proto.RegisterType((*RequestQuery)(nil), "types.RequestQuery") proto.RegisterType((*RequestBeginBlock)(nil), "types.RequestBeginBlock") + proto.RegisterType((*RequestCheckTx)(nil), "types.RequestCheckTx") + proto.RegisterType((*RequestDeliverTx)(nil), "types.RequestDeliverTx") proto.RegisterType((*RequestEndBlock)(nil), "types.RequestEndBlock") + proto.RegisterType((*RequestCommit)(nil), "types.RequestCommit") proto.RegisterType((*Response)(nil), "types.Response") proto.RegisterType((*ResponseException)(nil), "types.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "types.ResponseEcho") proto.RegisterType((*ResponseFlush)(nil), "types.ResponseFlush") proto.RegisterType((*ResponseInfo)(nil), "types.ResponseInfo") proto.RegisterType((*ResponseSetOption)(nil), "types.ResponseSetOption") - proto.RegisterType((*ResponseDeliverTx)(nil), "types.ResponseDeliverTx") - proto.RegisterType((*ResponseCheckTx)(nil), "types.ResponseCheckTx") - proto.RegisterType((*ResponseQuery)(nil), "types.ResponseQuery") - proto.RegisterType((*ResponseCommit)(nil), "types.ResponseCommit") proto.RegisterType((*ResponseInitChain)(nil), "types.ResponseInitChain") + proto.RegisterType((*ResponseQuery)(nil), "types.ResponseQuery") proto.RegisterType((*ResponseBeginBlock)(nil), "types.ResponseBeginBlock") + proto.RegisterType((*ResponseCheckTx)(nil), "types.ResponseCheckTx") + proto.RegisterType((*ResponseDeliverTx)(nil), "types.ResponseDeliverTx") proto.RegisterType((*ResponseEndBlock)(nil), "types.ResponseEndBlock") + proto.RegisterType((*ResponseCommit)(nil), "types.ResponseCommit") proto.RegisterType((*ConsensusParams)(nil), "types.ConsensusParams") proto.RegisterType((*BlockSize)(nil), "types.BlockSize") proto.RegisterType((*TxSize)(nil), "types.TxSize") @@ -2193,115 +2192,114 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1754 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6e, 0x23, 0xc7, - 0x11, 0x16, 0xff, 0x39, 0x45, 0xfd, 0x70, 0x5b, 0x5a, 0x2f, 0x97, 0x7b, 0xb0, 0x3c, 0x40, 0x62, - 0xca, 0xf6, 0x8a, 0xb6, 0x8c, 0x0d, 0x56, 0x76, 0x60, 0x44, 0x94, 0xd6, 0x2b, 0xc2, 0xc0, 0x66, - 0x33, 0x52, 0x7c, 0xc8, 0x85, 0x68, 0x72, 0x5a, 0xe4, 0x60, 0xc9, 0x99, 0xf1, 0x4c, 0x53, 0xa6, - 0x16, 0x79, 0x04, 0xdf, 0x73, 0x4e, 0x2e, 0x09, 0xf2, 0x02, 0x39, 0xe6, 0x16, 0xe4, 0x19, 0x72, - 0xf0, 0xb3, 0x04, 0x55, 0xdd, 0xf3, 0xab, 0x19, 0xc3, 0xd8, 0x83, 0x2f, 0x52, 0x77, 0x57, 0x7d, - 0xc5, 0xea, 0x9a, 0xea, 0xaf, 0xaa, 0x1b, 0x1e, 0xc8, 0x3b, 0x5f, 0x84, 0x43, 0xfa, 0x7b, 0xec, - 0x07, 0x9e, 0xf4, 0x58, 0x83, 0x26, 0xfd, 0xa7, 0x73, 0x47, 0x2e, 0xd6, 0xd3, 0xe3, 0x99, 0xb7, - 0x1a, 0xce, 0xbd, 0xb9, 0x37, 0x24, 0xe9, 0x74, 0x7d, 0x43, 0x33, 0x9a, 0xd0, 0x48, 0xa1, 0xcc, - 0xff, 0xd4, 0xa1, 0x65, 0x89, 0xef, 0xd6, 0x22, 0x94, 0x6c, 0x00, 0x75, 0x31, 0x5b, 0x78, 0xbd, - 0xca, 0x61, 0x65, 0xd0, 0x39, 0x61, 0xc7, 0xca, 0xba, 0x96, 0xbe, 0x98, 0x2d, 0xbc, 0xcb, 0x2d, - 0x8b, 0x34, 0xd8, 0xc7, 0xd0, 0xb8, 0x59, 0xae, 0xc3, 0x45, 0xaf, 0x4a, 0xaa, 0xfb, 0x59, 0xd5, - 0xaf, 0x51, 0x74, 0xb9, 0x65, 0x29, 0x1d, 0x34, 0xeb, 0xb8, 0x37, 0x5e, 0xaf, 0x56, 0x64, 0x76, - 0xec, 0xde, 0x90, 0x59, 0xd4, 0x60, 0xcf, 0x01, 0x42, 0x21, 0x27, 0x9e, 0x2f, 0x1d, 0xcf, 0xed, - 0xd5, 0x49, 0xff, 0x51, 0x56, 0xff, 0x4a, 0xc8, 0xdf, 0x93, 0xf8, 0x72, 0xcb, 0x32, 0xc2, 0x68, - 0x82, 0x48, 0x5b, 0x2c, 0x9d, 0x5b, 0x11, 0x4c, 0xe4, 0xa6, 0xd7, 0x28, 0x42, 0x5e, 0x28, 0xf9, - 0xf5, 0x06, 0x91, 0x76, 0x34, 0x61, 0x27, 0xd0, 0x9e, 0x2d, 0xc4, 0xec, 0x0d, 0xe2, 0x9a, 0x84, - 0x7b, 0x98, 0xc5, 0x9d, 0xa3, 0x94, 0x50, 0xad, 0x99, 0x1a, 0xb2, 0x63, 0x68, 0xce, 0xbc, 0xd5, - 0xca, 0x91, 0xbd, 0x16, 0x21, 0x0e, 0x72, 0x08, 0x92, 0x5d, 0x6e, 0x59, 0x5a, 0x0b, 0xc3, 0xf5, - 0xdd, 0x5a, 0x04, 0x77, 0xbd, 0x76, 0x51, 0xb8, 0xfe, 0x80, 0x22, 0x0c, 0x17, 0xe9, 0xe0, 0x56, - 0x1c, 0xd7, 0x91, 0x93, 0xd9, 0x82, 0x3b, 0x6e, 0xcf, 0x28, 0xda, 0xca, 0xd8, 0x75, 0xe4, 0x39, - 0x8a, 0x71, 0x2b, 0x4e, 0x34, 0x61, 0x5f, 0x42, 0x67, 0x2a, 0xe6, 0x8e, 0x3b, 0x99, 0x2e, 0xbd, - 0xd9, 0x9b, 0x1e, 0x10, 0xb4, 0x97, 0x85, 0x8e, 0x50, 0x61, 0x84, 0xf2, 0xcb, 0x2d, 0x0b, 0xa6, - 0xf1, 0x8c, 0x3d, 0x03, 0x43, 0xb8, 0xb6, 0x86, 0x76, 0x08, 0xfa, 0x5e, 0x2e, 0x03, 0x5c, 0x3b, - 0x02, 0xb6, 0x85, 0x1e, 0x8f, 0x5a, 0xd0, 0xb8, 0xe5, 0xcb, 0xb5, 0x30, 0x3f, 0x84, 0x4e, 0x2a, - 0x53, 0x58, 0x0f, 0x5a, 0x2b, 0x11, 0x86, 0x7c, 0x2e, 0x28, 0x9d, 0x0c, 0x2b, 0x9a, 0x9a, 0xbb, - 0xb0, 0x9d, 0xce, 0x93, 0x14, 0x10, 0x73, 0x01, 0x81, 0xb7, 0x22, 0x08, 0x31, 0x01, 0x34, 0x50, - 0x4f, 0xcd, 0x2f, 0xa0, 0x9b, 0x4f, 0x02, 0xd6, 0x85, 0xda, 0x1b, 0x71, 0xa7, 0x35, 0x71, 0xc8, - 0x0e, 0xb4, 0x43, 0x94, 0x9a, 0x86, 0xa5, 0xbd, 0x33, 0x63, 0x6c, 0x9c, 0x06, 0x6c, 0x17, 0xaa, - 0x72, 0x43, 0xd0, 0x6d, 0xab, 0x2a, 0x37, 0xe6, 0x21, 0xec, 0x66, 0x3f, 0xf9, 0x3d, 0x0d, 0x3b, - 0x76, 0x9d, 0xbe, 0x19, 0x63, 0x50, 0xb7, 0xb9, 0xe4, 0x5a, 0x83, 0xc6, 0xb8, 0xe6, 0x73, 0xb9, - 0xd0, 0x3f, 0x4f, 0x63, 0xf6, 0x1e, 0x34, 0x17, 0xc2, 0x99, 0x2f, 0x24, 0x9d, 0x81, 0x9a, 0xa5, - 0x67, 0xe8, 0xab, 0x1f, 0x78, 0xb7, 0x82, 0x52, 0xbd, 0x6d, 0xa9, 0x89, 0xb9, 0x07, 0x3b, 0x99, - 0x44, 0x32, 0x2f, 0x62, 0xe7, 0xe3, 0x0f, 0xcf, 0x3e, 0x05, 0xb8, 0xe5, 0x4b, 0xc7, 0xe6, 0xd2, - 0x0b, 0xc2, 0x5e, 0xe5, 0xb0, 0x36, 0xe8, 0x9c, 0x74, 0xf5, 0xf7, 0xfa, 0x36, 0x12, 0x58, 0x29, - 0x1d, 0xf3, 0xdf, 0x15, 0x78, 0x70, 0x2f, 0x09, 0xd0, 0xdd, 0x05, 0x0f, 0x17, 0xd1, 0x16, 0x70, - 0xcc, 0x7e, 0x85, 0xee, 0x72, 0x5b, 0x04, 0xfa, 0x78, 0xef, 0x68, 0xbb, 0x97, 0xb4, 0x68, 0x69, - 0x21, 0xfb, 0x18, 0x1e, 0xf0, 0x69, 0x28, 0x5c, 0x39, 0x49, 0x79, 0x52, 0x3b, 0xac, 0x0d, 0x1a, - 0x56, 0x57, 0x09, 0x62, 0x47, 0x42, 0x36, 0x82, 0x83, 0xe9, 0xdd, 0x5b, 0xee, 0x4a, 0xc7, 0x15, - 0x69, 0xfd, 0x3a, 0x79, 0xbe, 0xa7, 0x7f, 0xe1, 0xc5, 0xad, 0x63, 0x0b, 0x77, 0x26, 0xac, 0xfd, - 0x58, 0x39, 0xb1, 0x61, 0x1e, 0xc1, 0x5e, 0x2e, 0x15, 0x53, 0x91, 0xad, 0xa4, 0x23, 0x6b, 0xfe, - 0xd0, 0x80, 0xb6, 0x25, 0x42, 0xdf, 0x73, 0x43, 0xc1, 0x9e, 0x83, 0x21, 0x36, 0x33, 0xa1, 0x58, - 0xa5, 0x92, 0x3b, 0x15, 0x4a, 0xe7, 0x45, 0x24, 0xc7, 0x13, 0x15, 0x2b, 0xb3, 0x23, 0xcd, 0x88, - 0x79, 0x9a, 0xd3, 0xa0, 0x34, 0x25, 0x7e, 0x12, 0x51, 0x62, 0x2d, 0x47, 0x09, 0x4a, 0x37, 0xc7, - 0x89, 0x47, 0x9a, 0x13, 0xeb, 0x85, 0x86, 0x33, 0xa4, 0x78, 0x9a, 0x21, 0xc5, 0x46, 0xa1, 0xfb, - 0x25, 0xac, 0x78, 0x9a, 0x61, 0xc5, 0x66, 0x21, 0xb4, 0x84, 0x16, 0x3f, 0x4f, 0xd1, 0x62, 0x2b, - 0xc7, 0x06, 0x0a, 0x58, 0xc0, 0x8b, 0xc3, 0x98, 0x17, 0xdb, 0x39, 0x26, 0xd5, 0x90, 0x3c, 0x31, - 0x7e, 0x12, 0x11, 0xa3, 0x51, 0x18, 0xb4, 0x1c, 0x33, 0x9e, 0x66, 0x98, 0x11, 0x0a, 0xb7, 0x53, - 0x42, 0x8d, 0xbf, 0xcd, 0x52, 0xa3, 0xe2, 0xb7, 0xc7, 0x39, 0x6c, 0x29, 0x37, 0xfe, 0x26, 0xcd, - 0x8d, 0xdb, 0x39, 0x46, 0xd6, 0xb9, 0xf0, 0x93, 0xe4, 0x78, 0x84, 0x47, 0x2f, 0x97, 0x69, 0x78, - 0xfa, 0x45, 0x10, 0x78, 0x81, 0x66, 0x2f, 0x35, 0x31, 0x07, 0xc8, 0x31, 0x49, 0x7e, 0xfd, 0x04, - 0x91, 0x12, 0x4f, 0xa4, 0xb2, 0xcb, 0xfc, 0x4b, 0x25, 0xc1, 0x12, 0x97, 0xa6, 0xf9, 0xc9, 0xd0, - 0xfc, 0x94, 0xe2, 0xd7, 0x6a, 0x86, 0x5f, 0xd9, 0x47, 0xf0, 0x60, 0xc9, 0x43, 0xa9, 0xb6, 0x39, - 0xc9, 0x10, 0xd6, 0x1e, 0x0a, 0xd4, 0xfe, 0x14, 0x73, 0x3d, 0x85, 0xfd, 0x94, 0x2e, 0xf7, 0xfd, - 0x09, 0xb1, 0x48, 0x9d, 0x58, 0xa4, 0x1b, 0x6b, 0x9f, 0xf9, 0xfe, 0x25, 0x0f, 0x17, 0xe6, 0x69, - 0xb2, 0xff, 0x84, 0xbb, 0x19, 0xd4, 0x67, 0x9e, 0xad, 0xb6, 0xb5, 0x63, 0xd1, 0x18, 0xf9, 0x7c, - 0xe9, 0xcd, 0xb5, 0x67, 0x38, 0x34, 0xff, 0x56, 0x49, 0xb0, 0x09, 0x77, 0x17, 0x61, 0x2f, 0xf4, - 0x6e, 0x11, 0xbc, 0x3d, 0xfa, 0xf4, 0xbf, 0x3f, 0xbe, 0xbf, 0xf5, 0xbf, 0x1f, 0xdf, 0x1f, 0xa4, - 0xfa, 0x21, 0x29, 0x5c, 0x5b, 0x04, 0x2b, 0xc7, 0x95, 0xc3, 0xb9, 0xf7, 0xf4, 0x7b, 0x27, 0x10, - 0x43, 0x44, 0x1c, 0x8f, 0xee, 0xa4, 0x08, 0x75, 0x7c, 0xb4, 0x07, 0xb5, 0xd8, 0x03, 0xf6, 0x01, - 0xd4, 0x25, 0x9f, 0x47, 0x54, 0x15, 0x91, 0xe1, 0x37, 0xdf, 0xbe, 0xe6, 0x4e, 0x60, 0x91, 0xc8, - 0xfc, 0x6b, 0x05, 0xa9, 0x29, 0x73, 0x2e, 0x7e, 0x51, 0x17, 0xbb, 0x50, 0x9b, 0xf3, 0x90, 0xc2, - 0x5f, 0xb3, 0x70, 0x88, 0x2b, 0x37, 0x42, 0x10, 0x5d, 0xd4, 0x2c, 0x1c, 0x9a, 0xff, 0xaa, 0x26, - 0xf9, 0x12, 0x97, 0xaf, 0x7b, 0x1e, 0x1e, 0x40, 0xc3, 0x71, 0x6d, 0xb1, 0x21, 0x17, 0x6b, 0x96, - 0x9a, 0xb0, 0x91, 0x2a, 0xb3, 0xb5, 0x77, 0x74, 0x9b, 0x0a, 0xf3, 0xd7, 0x51, 0x61, 0xae, 0xbf, - 0xa3, 0x15, 0x05, 0x47, 0x3b, 0x7e, 0xe0, 0x79, 0x37, 0xb4, 0xb7, 0x77, 0xb2, 0x43, 0xf0, 0x54, - 0xe9, 0x68, 0x66, 0x8a, 0xb2, 0x8e, 0x6e, 0x2b, 0x49, 0xc1, 0x3f, 0x63, 0x63, 0x90, 0x66, 0xb0, - 0x5f, 0xf2, 0xdb, 0x9a, 0xfb, 0x49, 0xfe, 0xc7, 0xe4, 0x66, 0x1e, 0x00, 0xbb, 0xcf, 0x5a, 0xe6, - 0x3f, 0x2a, 0xd8, 0x29, 0x64, 0x09, 0x89, 0x5d, 0xc0, 0xc3, 0xb8, 0xde, 0x4e, 0xb0, 0x92, 0xac, - 0x7d, 0x9b, 0x4b, 0x51, 0xde, 0x34, 0xec, 0xc7, 0xea, 0x57, 0x42, 0xfe, 0x51, 0x29, 0xb3, 0x57, - 0xf0, 0x68, 0x86, 0x66, 0xdd, 0x70, 0x1d, 0x4e, 0x7c, 0x1e, 0xf0, 0x55, 0x6c, 0xa7, 0x9a, 0x29, - 0x0f, 0xe7, 0x91, 0xd6, 0x6b, 0x54, 0x0a, 0xad, 0x87, 0xb3, 0xcc, 0x82, 0xb6, 0x47, 0x27, 0x26, - 0xa7, 0xca, 0x86, 0x00, 0x8a, 0x4f, 0x42, 0xe7, 0xad, 0xd0, 0x85, 0x3a, 0x72, 0x8f, 0xf6, 0x72, - 0xe5, 0xbc, 0x15, 0x96, 0x31, 0x8d, 0x86, 0xec, 0xd7, 0xd0, 0x92, 0x1b, 0xa5, 0x9d, 0xed, 0x54, - 0xae, 0x37, 0xa4, 0xda, 0x94, 0xf4, 0x9f, 0x3d, 0x83, 0x6d, 0x65, 0x78, 0xee, 0x85, 0xa1, 0xe3, - 0xe7, 0x6e, 0x22, 0x64, 0xfa, 0x25, 0x49, 0xac, 0xce, 0x34, 0x99, 0x98, 0x7f, 0x02, 0x23, 0xfe, - 0x59, 0xf6, 0x04, 0x8c, 0x15, 0xdf, 0x4c, 0xa6, 0x77, 0x2a, 0x74, 0x95, 0x41, 0xc3, 0x6a, 0xaf, - 0xf8, 0x86, 0xbe, 0x1d, 0x7b, 0x04, 0x2d, 0x14, 0xca, 0x8d, 0x8a, 0x46, 0xc3, 0x6a, 0xae, 0xf8, - 0xe6, 0x7a, 0x13, 0x0b, 0xf0, 0x70, 0xea, 0xd6, 0x6f, 0xc5, 0x37, 0x2f, 0x79, 0x68, 0x7e, 0x05, - 0x4d, 0xe5, 0xe4, 0xcf, 0x32, 0x8c, 0xf8, 0x6a, 0x06, 0xff, 0x3b, 0xe8, 0xa4, 0xfc, 0x66, 0x9f, - 0xc1, 0x43, 0xb5, 0x43, 0x9f, 0x07, 0x92, 0x22, 0x92, 0x31, 0xc8, 0x48, 0xf8, 0x9a, 0x07, 0x12, - 0x7f, 0x92, 0x4c, 0x9b, 0x7f, 0xaf, 0x42, 0x53, 0x75, 0x74, 0xec, 0x31, 0x16, 0x7b, 0xee, 0xb8, - 0x13, 0xc7, 0x8e, 0x8a, 0x0c, 0xcd, 0xc7, 0x76, 0xea, 0x94, 0x54, 0x33, 0xa7, 0x84, 0x41, 0x5d, - 0x3a, 0x2b, 0xa1, 0x77, 0x45, 0x63, 0x74, 0xd6, 0x5d, 0xaf, 0x28, 0x0a, 0x75, 0x15, 0x05, 0x77, - 0xbd, 0xc2, 0x28, 0x9c, 0xc0, 0x4e, 0xaa, 0x5a, 0x38, 0xb6, 0xee, 0x62, 0x76, 0xd3, 0x1f, 0x60, - 0x7c, 0x61, 0x75, 0xe2, 0xba, 0x31, 0xb6, 0xd9, 0x00, 0xa8, 0x8c, 0x4c, 0x54, 0xa7, 0xa0, 0xca, - 0x4b, 0x93, 0xca, 0xcb, 0x2e, 0xae, 0xeb, 0x56, 0x02, 0xdb, 0xd5, 0x27, 0x60, 0xe0, 0xd1, 0x51, - 0x2a, 0x2d, 0x52, 0x69, 0xe3, 0x02, 0x09, 0x3f, 0x84, 0xbd, 0xa4, 0xdb, 0x54, 0x2a, 0x6d, 0x65, - 0x25, 0x59, 0x26, 0xc5, 0xc7, 0xd0, 0x8e, 0xcb, 0x98, 0x41, 0x1a, 0x2d, 0xae, 0xab, 0xd7, 0x18, - 0x5a, 0xda, 0xc5, 0xc2, 0x76, 0xf9, 0x23, 0x68, 0x60, 0xd4, 0xa3, 0x83, 0x10, 0x35, 0x31, 0x14, - 0x6d, 0x21, 0x75, 0xd3, 0xac, 0x54, 0xcc, 0x53, 0xd8, 0xc9, 0xac, 0x23, 0xdf, 0x4a, 0x4f, 0xf2, - 0xa5, 0xfe, 0x50, 0x6a, 0x12, 0xff, 0x4c, 0x35, 0xf9, 0x19, 0xf3, 0x0b, 0x30, 0xe2, 0x33, 0x8a, - 0xa1, 0xf6, 0xd7, 0xd3, 0x49, 0x74, 0xf7, 0xd9, 0xb6, 0x9a, 0xfe, 0x7a, 0xfa, 0x8d, 0xba, 0xfe, - 0xf8, 0xde, 0xf7, 0xba, 0x75, 0xaf, 0x59, 0x6a, 0x62, 0x7e, 0x09, 0xed, 0xa8, 0xb5, 0x2e, 0x87, - 0x96, 0x7c, 0x6a, 0xf3, 0x9f, 0x15, 0x68, 0xaa, 0x6a, 0x57, 0x70, 0xdd, 0xfa, 0x8c, 0xee, 0x21, - 0x6b, 0x31, 0xc1, 0x4d, 0x13, 0x70, 0x37, 0x3e, 0x58, 0x0a, 0x74, 0x7c, 0x7d, 0xe7, 0x0b, 0xcb, - 0x20, 0x2d, 0x1c, 0xb2, 0x0f, 0x60, 0x5b, 0x41, 0x42, 0x19, 0x38, 0x6e, 0xc4, 0x75, 0x1d, 0x5a, - 0xbb, 0xa2, 0x25, 0xfc, 0xa4, 0x4a, 0xc5, 0x71, 0xa5, 0xae, 0x6a, 0x6d, 0x5a, 0x18, 0xbb, 0xd2, - 0x7c, 0x02, 0x75, 0xb2, 0x03, 0xd0, 0xbc, 0xba, 0xb6, 0xc6, 0xaf, 0x5e, 0x76, 0xb7, 0x58, 0x0b, - 0x6a, 0xe3, 0x57, 0xd7, 0xdd, 0xca, 0xc9, 0x0f, 0x0d, 0xd8, 0x3b, 0x1b, 0x9d, 0x8f, 0xcf, 0x7c, - 0x7f, 0xe9, 0xcc, 0x38, 0x35, 0x1a, 0x43, 0xa8, 0x53, 0x2b, 0x55, 0xf0, 0xa2, 0xd1, 0x2f, 0xea, - 0xe9, 0xd9, 0x09, 0x34, 0xa8, 0xa3, 0x62, 0x45, 0x0f, 0x1b, 0xfd, 0xc2, 0xd6, 0x1e, 0x7f, 0x44, - 0xf5, 0x5c, 0xf7, 0xdf, 0x37, 0xfa, 0x45, 0xfd, 0x3d, 0xfb, 0x0a, 0x8c, 0xa4, 0x17, 0x2a, 0x7b, - 0xe5, 0xe8, 0x97, 0x76, 0xfa, 0x88, 0x4f, 0xfa, 0xa1, 0xb2, 0xb7, 0x8e, 0x7e, 0x69, 0xbb, 0xcf, - 0x9e, 0x43, 0x2b, 0x6a, 0x55, 0x8a, 0x5f, 0x3c, 0xfa, 0x25, 0x1d, 0x3f, 0x86, 0x47, 0x35, 0x10, - 0x45, 0x0f, 0x19, 0xfd, 0xc2, 0x26, 0x9e, 0x3d, 0x83, 0xa6, 0xae, 0x9d, 0x85, 0x8f, 0x25, 0xfd, - 0xe2, 0xab, 0x02, 0x6e, 0x32, 0xb9, 0xf3, 0x96, 0xbd, 0x82, 0xf4, 0x4b, 0x2f, 0x01, 0xec, 0x0c, - 0x20, 0x75, 0xd9, 0x2d, 0x7d, 0x0b, 0xe9, 0x97, 0x5f, 0x05, 0x18, 0x9e, 0x9d, 0xf8, 0xba, 0x59, - 0xfc, 0x22, 0xd2, 0x2f, 0xbb, 0x0d, 0x4c, 0x9b, 0xf4, 0xca, 0xf6, 0xf9, 0xff, 0x03, 0x00, 0x00, - 0xff, 0xff, 0x3a, 0x99, 0xe6, 0x77, 0xb0, 0x13, 0x00, 0x00, + // 1741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0x1b, 0xc7, + 0x11, 0x26, 0xfe, 0xb1, 0x0d, 0xfe, 0x80, 0x43, 0x4a, 0x82, 0xa0, 0x83, 0xe9, 0xad, 0x4a, 0x0c, + 0xd9, 0x16, 0x69, 0xd3, 0xa5, 0x94, 0x68, 0x27, 0xae, 0x88, 0x92, 0x2c, 0xa2, 0x5c, 0xa5, 0x28, + 0x23, 0xc6, 0x87, 0x5c, 0x50, 0x03, 0xec, 0x10, 0xd8, 0x12, 0xb0, 0xbb, 0xde, 0x1d, 0xd0, 0xa0, + 0x2a, 0x8f, 0xe0, 0x7b, 0xce, 0xc9, 0x25, 0x55, 0x79, 0x81, 0x1c, 0x73, 0x4b, 0xe5, 0x19, 0x72, + 0xf0, 0xb3, 0xa4, 0xba, 0x67, 0xf6, 0x97, 0xbb, 0xa9, 0x94, 0x0e, 0xbe, 0x00, 0x33, 0xd3, 0x3f, + 0xd3, 0xdd, 0xdb, 0xf3, 0x75, 0xcf, 0xc0, 0xbe, 0xba, 0x09, 0x64, 0x74, 0x42, 0xbf, 0xc7, 0x41, + 0xe8, 0x2b, 0x9f, 0xb5, 0x68, 0x32, 0x7c, 0x34, 0x77, 0xd5, 0x62, 0x3d, 0x3d, 0x9e, 0xf9, 0xab, + 0x93, 0xb9, 0x3f, 0xf7, 0x4f, 0x88, 0x3a, 0x5d, 0x5f, 0xd1, 0x8c, 0x26, 0x34, 0xd2, 0x52, 0xf6, + 0xbf, 0x9a, 0xd0, 0xe1, 0xf2, 0xfb, 0xb5, 0x8c, 0x14, 0x1b, 0x41, 0x53, 0xce, 0x16, 0xfe, 0xa0, + 0x7e, 0x54, 0x1b, 0xf5, 0x4e, 0xd9, 0xb1, 0xd6, 0x6e, 0xa8, 0x2f, 0x66, 0x0b, 0xff, 0x62, 0x8b, + 0x13, 0x07, 0xfb, 0x04, 0x5a, 0x57, 0xcb, 0x75, 0xb4, 0x18, 0x34, 0x88, 0xf5, 0x20, 0xcf, 0xfa, + 0x0d, 0x92, 0x2e, 0xb6, 0xb8, 0xe6, 0x41, 0xb5, 0xae, 0x77, 0xe5, 0x0f, 0x9a, 0x65, 0x6a, 0xc7, + 0xde, 0x15, 0xa9, 0x45, 0x0e, 0xf6, 0x04, 0x20, 0x92, 0x6a, 0xe2, 0x07, 0xca, 0xf5, 0xbd, 0x41, + 0x8b, 0xf8, 0xef, 0xe5, 0xf9, 0xdf, 0x48, 0xf5, 0x3b, 0x22, 0x5f, 0x6c, 0x71, 0x2b, 0x8a, 0x27, + 0x28, 0xe9, 0x7a, 0xae, 0x9a, 0xcc, 0x16, 0xc2, 0xf5, 0x06, 0xed, 0x32, 0xc9, 0xb1, 0xe7, 0xaa, + 0x67, 0x48, 0x46, 0x49, 0x37, 0x9e, 0xa0, 0x2b, 0xdf, 0xaf, 0x65, 0x78, 0x33, 0xe8, 0x94, 0xb9, + 0xf2, 0x7b, 0x24, 0xa1, 0x2b, 0xc4, 0xc3, 0xbe, 0x82, 0xde, 0x54, 0xce, 0x5d, 0x6f, 0x32, 0x5d, + 0xfa, 0xb3, 0xb7, 0x83, 0x2e, 0x89, 0x0c, 0xf2, 0x22, 0xe7, 0xc8, 0x70, 0x8e, 0xf4, 0x8b, 0x2d, + 0x0e, 0xd3, 0x64, 0xc6, 0x4e, 0xa1, 0x3b, 0x5b, 0xc8, 0xd9, 0xdb, 0x89, 0xda, 0x0c, 0x2c, 0x92, + 0xbc, 0x93, 0x97, 0x7c, 0x86, 0xd4, 0xcb, 0xcd, 0xc5, 0x16, 0xef, 0xcc, 0xf4, 0x10, 0xfd, 0x72, + 0xe4, 0xd2, 0xbd, 0x96, 0x21, 0x4a, 0x1d, 0x94, 0xf9, 0xf5, 0x5c, 0xd3, 0x49, 0xce, 0x72, 0xe2, + 0x09, 0x7b, 0x0c, 0x96, 0xf4, 0x1c, 0x63, 0x68, 0x8f, 0x04, 0xef, 0x16, 0xbe, 0xa8, 0xe7, 0xc4, + 0x66, 0x76, 0xa5, 0x19, 0xb3, 0x63, 0x68, 0xcf, 0xfc, 0xd5, 0xca, 0x55, 0x83, 0x6d, 0x92, 0x39, + 0x2c, 0x98, 0x48, 0xb4, 0x8b, 0x2d, 0x6e, 0xb8, 0xce, 0x3b, 0xd0, 0xba, 0x16, 0xcb, 0xb5, 0xb4, + 0x3f, 0x82, 0x5e, 0x26, 0x53, 0xd8, 0x00, 0x3a, 0x2b, 0x19, 0x45, 0x62, 0x2e, 0x07, 0xb5, 0xa3, + 0xda, 0xc8, 0xe2, 0xf1, 0xd4, 0xde, 0x85, 0xed, 0x6c, 0x9e, 0x64, 0x04, 0x31, 0x17, 0x50, 0xf0, + 0x5a, 0x86, 0x11, 0x26, 0x80, 0x11, 0x34, 0x53, 0xfb, 0x4b, 0xe8, 0x17, 0x93, 0x80, 0xf5, 0xa1, + 0xf1, 0x56, 0xde, 0x18, 0x4e, 0x1c, 0xb2, 0x43, 0x63, 0x10, 0x65, 0xb1, 0xc5, 0x8d, 0x75, 0xcf, + 0x13, 0xd9, 0x24, 0x0d, 0xd8, 0x67, 0x00, 0xd7, 0x62, 0xe9, 0x3a, 0x42, 0xf9, 0x61, 0x34, 0xa8, + 0x1d, 0x35, 0x46, 0xbd, 0xd3, 0xbe, 0x71, 0xf7, 0xbb, 0x98, 0xc0, 0x33, 0x3c, 0xb6, 0x93, 0x98, + 0x4e, 0x79, 0xc1, 0x18, 0x34, 0x1d, 0xa1, 0x04, 0x6d, 0xbf, 0xcd, 0x69, 0x8c, 0x6b, 0x81, 0x50, + 0x0b, 0xb3, 0x3d, 0x8d, 0xd9, 0x5d, 0x68, 0x2f, 0xa4, 0x3b, 0x5f, 0x28, 0x3a, 0x2f, 0x0d, 0x6e, + 0x66, 0x68, 0x6b, 0x10, 0xfa, 0xd7, 0x92, 0x8e, 0x46, 0x97, 0xeb, 0x89, 0xfd, 0xcf, 0x1a, 0xec, + 0xdf, 0xca, 0x25, 0xd4, 0xbb, 0x10, 0xd1, 0x22, 0xde, 0x0b, 0xc7, 0xec, 0x17, 0xa8, 0x57, 0x38, + 0x32, 0x34, 0x47, 0x76, 0xc7, 0x58, 0x7f, 0x41, 0x8b, 0xdc, 0x10, 0xd9, 0x27, 0xb0, 0x2f, 0xa6, + 0x91, 0xf4, 0xd4, 0x24, 0xe3, 0x6f, 0xe3, 0xa8, 0x31, 0x6a, 0xf1, 0xbe, 0x26, 0x24, 0xee, 0x46, + 0xec, 0x1c, 0x0e, 0xa7, 0x37, 0xef, 0x84, 0xa7, 0x5c, 0x4f, 0x66, 0xf9, 0x9b, 0x14, 0x9f, 0x3d, + 0xb3, 0xc3, 0x8b, 0x6b, 0xd7, 0x91, 0xde, 0x4c, 0xf2, 0x83, 0x84, 0x39, 0xd5, 0x61, 0x1f, 0xc1, + 0x6e, 0x3e, 0xa5, 0xd9, 0x2e, 0xd4, 0xd5, 0xc6, 0xd8, 0x5e, 0x57, 0x1b, 0xdb, 0x4e, 0xbe, 0x47, + 0x92, 0xbe, 0xb7, 0x78, 0x1e, 0xc2, 0x5e, 0x21, 0x53, 0x33, 0x81, 0xac, 0x65, 0x03, 0x69, 0xef, + 0xc1, 0x4e, 0x2e, 0x41, 0xed, 0x1f, 0x5b, 0xd0, 0xe5, 0x32, 0x0a, 0x7c, 0x2f, 0x92, 0xec, 0x09, + 0x58, 0x72, 0x33, 0x93, 0x1a, 0x55, 0x6a, 0x85, 0x33, 0xab, 0x79, 0x5e, 0xc4, 0x74, 0x3c, 0x44, + 0x09, 0x33, 0x7b, 0x98, 0x43, 0xc4, 0x83, 0xa2, 0x50, 0x16, 0x12, 0x3f, 0xcd, 0x43, 0xe2, 0x61, + 0x81, 0xb7, 0x80, 0x89, 0x0f, 0x73, 0x98, 0x58, 0x54, 0x9c, 0x03, 0xc5, 0xb3, 0x12, 0x50, 0x2c, + 0x9a, 0x5f, 0x81, 0x8a, 0x67, 0x25, 0xa8, 0x38, 0xb8, 0xb5, 0x57, 0x29, 0x2c, 0x7e, 0x9a, 0x87, + 0xc5, 0xa2, 0x3b, 0x05, 0x5c, 0xfc, 0x75, 0x19, 0x2e, 0xde, 0x2f, 0xc8, 0x54, 0x02, 0xe3, 0x17, + 0xb7, 0x80, 0xf1, 0x6e, 0x41, 0xb4, 0x04, 0x19, 0xcf, 0x72, 0xc8, 0x08, 0xa5, 0xbe, 0x55, 0x40, + 0xe3, 0xaf, 0x6e, 0x43, 0xe3, 0xbd, 0xe2, 0xa7, 0x2d, 0xc3, 0xc6, 0x93, 0x02, 0x36, 0xde, 0x29, + 0x5a, 0x59, 0x09, 0x8e, 0x0f, 0xf1, 0x44, 0x17, 0x32, 0x0d, 0x4f, 0xbf, 0x0c, 0x43, 0x3f, 0x34, + 0xe8, 0xa5, 0x27, 0xf6, 0x08, 0x31, 0x26, 0xcd, 0xaf, 0xff, 0x01, 0xa4, 0x94, 0xf4, 0x99, 0xec, + 0xb2, 0xff, 0x5c, 0x4b, 0x65, 0x09, 0x4b, 0xb3, 0xf8, 0x64, 0x19, 0x7c, 0xca, 0xe0, 0x6b, 0x3d, + 0x87, 0xaf, 0xec, 0x63, 0xd8, 0x5f, 0x8a, 0x48, 0xe9, 0xb8, 0x4c, 0x72, 0x80, 0xb5, 0x87, 0x04, + 0x1d, 0x10, 0x8d, 0x5c, 0x8f, 0xe0, 0x20, 0xc3, 0x2b, 0x82, 0x60, 0x42, 0xe0, 0xd4, 0xa4, 0xc3, + 0xdb, 0x4f, 0xb8, 0x9f, 0x06, 0xc1, 0x85, 0x88, 0x16, 0xf6, 0x59, 0xea, 0x7f, 0x8a, 0xdd, 0x0c, + 0x9a, 0x33, 0xdf, 0xd1, 0x6e, 0xed, 0x70, 0x1a, 0x23, 0x9e, 0x2f, 0xfd, 0xb9, 0xb1, 0x0c, 0x87, + 0xf6, 0x41, 0x2a, 0x9a, 0xa4, 0xaa, 0xfd, 0x8f, 0x7a, 0xea, 0x7b, 0x02, 0xc5, 0xb7, 0x94, 0x1d, + 0x42, 0xcb, 0xf5, 0x1c, 0xb9, 0x21, 0x75, 0x0d, 0xae, 0x27, 0xec, 0x5c, 0x97, 0x0c, 0x74, 0x6c, + 0xfb, 0xfc, 0xb3, 0x7f, 0xff, 0xf4, 0xc1, 0xd6, 0x7f, 0x7e, 0xfa, 0x60, 0x94, 0xe9, 0x9a, 0x94, + 0xf4, 0x1c, 0x19, 0xae, 0x5c, 0x4f, 0x9d, 0xcc, 0xfd, 0x47, 0x3f, 0xb8, 0xa1, 0x3c, 0xc1, 0xc8, + 0x1d, 0x9f, 0xdf, 0x28, 0x19, 0xe9, 0x22, 0xf3, 0x4d, 0x5c, 0x64, 0x9a, 0xef, 0xa9, 0x45, 0x8b, + 0xa3, 0x9e, 0x20, 0xf4, 0xfd, 0x2b, 0x3a, 0xd6, 0xef, 0xa5, 0x87, 0xc4, 0x33, 0xb8, 0xd8, 0xce, + 0x15, 0x18, 0x13, 0xce, 0x4e, 0x1a, 0xce, 0x43, 0x60, 0xb7, 0xcf, 0xa3, 0xfd, 0x97, 0x1a, 0x62, + 0x6d, 0xee, 0xac, 0x95, 0x46, 0xf4, 0xb9, 0x49, 0xa8, 0xfa, 0x7b, 0x9a, 0xab, 0x53, 0xd0, 0x58, + 0xd5, 0x48, 0xac, 0xc2, 0x95, 0xb9, 0x88, 0x28, 0x9a, 0x0d, 0x8e, 0x43, 0x5c, 0xb9, 0x92, 0x92, + 0xe2, 0xd2, 0xe0, 0x38, 0xb4, 0xff, 0x5a, 0x4b, 0x33, 0x21, 0x2d, 0x1a, 0x3f, 0xa7, 0x95, 0x1f, + 0x42, 0x53, 0x89, 0x79, 0x5c, 0x0a, 0xe3, 0x62, 0xfb, 0xed, 0x77, 0xaf, 0x85, 0x1b, 0x72, 0x22, + 0x61, 0x20, 0xfb, 0x45, 0x0c, 0x61, 0xbf, 0x81, 0xfd, 0xa4, 0x90, 0x4e, 0xd6, 0x81, 0x23, 0x94, + 0xac, 0xee, 0x37, 0xfa, 0x09, 0xeb, 0x1f, 0x34, 0x27, 0x7b, 0x05, 0xf7, 0x66, 0xa8, 0xcf, 0x8b, + 0xd6, 0xd1, 0x24, 0x10, 0xa1, 0x58, 0x25, 0x4a, 0xea, 0x39, 0xb4, 0x7c, 0x16, 0x73, 0xbd, 0x46, + 0xa6, 0x88, 0xdf, 0x99, 0xe5, 0x16, 0x8c, 0x3e, 0xfb, 0x4f, 0x58, 0x9d, 0xb3, 0x88, 0xf5, 0x73, + 0x06, 0x91, 0x52, 0xad, 0x60, 0x28, 0x3b, 0x01, 0xd0, 0x40, 0x12, 0xb9, 0xef, 0xa4, 0xa9, 0xd0, + 0x71, 0x64, 0x28, 0x84, 0x6f, 0xdc, 0x77, 0x92, 0x5b, 0xd3, 0x78, 0xc8, 0x7e, 0x09, 0x1d, 0xb5, + 0xd1, 0xdc, 0xf9, 0xce, 0xe7, 0x72, 0x43, 0xac, 0x6d, 0x45, 0xff, 0xec, 0x31, 0x6c, 0x6b, 0xc5, + 0x73, 0x3f, 0x8a, 0xdc, 0xc0, 0xd4, 0x66, 0x96, 0x55, 0xfd, 0x92, 0x28, 0xbc, 0x37, 0x4d, 0x27, + 0xf6, 0x1f, 0xc1, 0x4a, 0xb6, 0x65, 0x0f, 0xc0, 0x5a, 0x89, 0xcd, 0x64, 0x7a, 0xa3, 0xbf, 0x5a, + 0x6d, 0xd4, 0xe2, 0xdd, 0x95, 0xd8, 0x90, 0x97, 0xec, 0x1e, 0x74, 0x90, 0xa8, 0x36, 0xfa, 0x5b, + 0xb4, 0x78, 0x7b, 0x25, 0x36, 0x97, 0x9b, 0x84, 0x80, 0x59, 0x6d, 0x7a, 0xbe, 0x95, 0xd8, 0xbc, + 0x14, 0x91, 0xfd, 0x35, 0xb4, 0xb5, 0x91, 0xff, 0x97, 0x62, 0x94, 0xaf, 0xe7, 0xe4, 0x7f, 0x0b, + 0xbd, 0x8c, 0xdd, 0xec, 0x73, 0xb8, 0xa3, 0x3d, 0x0c, 0x44, 0xa8, 0x28, 0x22, 0x39, 0x85, 0x8c, + 0x88, 0xaf, 0x45, 0xa8, 0x70, 0x4b, 0x52, 0x6d, 0xff, 0xad, 0x0e, 0x6d, 0xdd, 0x21, 0xb2, 0xfb, + 0x58, 0x79, 0x85, 0xeb, 0x4d, 0x5c, 0x27, 0xae, 0x2e, 0x34, 0x1f, 0x3b, 0x19, 0x48, 0xa9, 0xe7, + 0x20, 0x85, 0x41, 0x53, 0xb9, 0x2b, 0x69, 0xbc, 0xa2, 0x31, 0x1a, 0xeb, 0xad, 0x57, 0x14, 0x85, + 0xa6, 0x8e, 0x82, 0xb7, 0x5e, 0x61, 0x14, 0x4e, 0x61, 0x27, 0x53, 0x26, 0x5c, 0xc7, 0xb4, 0x2f, + 0xbb, 0xd9, 0x0f, 0x30, 0x7e, 0xce, 0x7b, 0x49, 0xc1, 0x18, 0x3b, 0x6c, 0x04, 0x54, 0x3f, 0x26, + 0xba, 0x86, 0xea, 0xba, 0xd2, 0xa6, 0xba, 0xb2, 0x8b, 0xeb, 0xa6, 0xc8, 0x62, 0xfb, 0xfb, 0x00, + 0x2c, 0x4c, 0x32, 0xcd, 0xd2, 0x21, 0x96, 0x2e, 0x2e, 0x10, 0xf1, 0x23, 0xd8, 0x4b, 0xbb, 0x57, + 0xcd, 0xd2, 0xd5, 0x5a, 0xd2, 0x65, 0x62, 0xbc, 0x0f, 0xdd, 0xa4, 0x7e, 0x59, 0xc4, 0xd1, 0x11, + 0xa6, 0x6c, 0x8d, 0xa1, 0x63, 0x4c, 0x2c, 0x6d, 0xbf, 0x3f, 0x86, 0x16, 0x46, 0x3d, 0x3e, 0x86, + 0x71, 0x8f, 0x44, 0xd1, 0x96, 0xca, 0x34, 0xe1, 0x9a, 0xc5, 0x3e, 0x83, 0x9d, 0xdc, 0x3a, 0x16, + 0x27, 0xe5, 0x2b, 0xb1, 0x34, 0x1f, 0x4a, 0x4f, 0x92, 0x6d, 0xea, 0xe9, 0x36, 0xf6, 0x97, 0x60, + 0x25, 0xf0, 0x80, 0xa1, 0x0e, 0xd6, 0xd3, 0x49, 0x7c, 0xe9, 0xd9, 0xe6, 0xed, 0x60, 0x3d, 0xfd, + 0x56, 0xdf, 0x7b, 0x02, 0xff, 0x07, 0x73, 0x15, 0x68, 0x70, 0x3d, 0xb1, 0xbf, 0x82, 0x6e, 0xdc, + 0xaa, 0x57, 0x8b, 0x56, 0x7c, 0x6a, 0xfb, 0xef, 0x35, 0x68, 0x6b, 0x74, 0x2b, 0xb9, 0x67, 0x7d, + 0x4e, 0xb7, 0xa7, 0xb5, 0x9c, 0xa0, 0xd3, 0x24, 0xb8, 0x9b, 0x1c, 0x2c, 0x2d, 0x74, 0x7c, 0x79, + 0x13, 0x48, 0x6e, 0x11, 0x17, 0x0e, 0xd9, 0x87, 0xb0, 0xad, 0x45, 0x22, 0x15, 0xba, 0x5e, 0x8c, + 0x0a, 0x3d, 0x5a, 0x7b, 0x43, 0x4b, 0xf8, 0x49, 0x35, 0x8b, 0xeb, 0x29, 0x53, 0x0e, 0xba, 0xb4, + 0x30, 0xf6, 0x94, 0xfd, 0x00, 0x9a, 0xa4, 0x07, 0xa0, 0xfd, 0xe6, 0x92, 0x8f, 0x5f, 0xbd, 0xec, + 0x6f, 0xb1, 0x0e, 0x34, 0xc6, 0xaf, 0x2e, 0xfb, 0xb5, 0xd3, 0x1f, 0x5b, 0xb0, 0xf7, 0xf4, 0xfc, + 0xd9, 0xf8, 0x69, 0x10, 0x2c, 0xdd, 0x99, 0xa0, 0x0e, 0xe3, 0x04, 0x9a, 0xd4, 0x43, 0x95, 0x3c, + 0x65, 0x0c, 0xcb, 0x9a, 0x79, 0x76, 0x0a, 0x2d, 0x6a, 0xa5, 0x58, 0xd9, 0x8b, 0xc6, 0xb0, 0xb4, + 0xa7, 0xc7, 0x4d, 0x74, 0xb3, 0x75, 0xfb, 0x61, 0x63, 0x58, 0xd6, 0xd8, 0xb3, 0xaf, 0xc1, 0x4a, + 0x9b, 0xa0, 0xaa, 0xe7, 0x8d, 0x61, 0x65, 0x8b, 0x8f, 0xf2, 0x69, 0xfd, 0xab, 0x7a, 0x0c, 0x18, + 0x56, 0xf6, 0xc2, 0xec, 0x09, 0x74, 0xe2, 0x1a, 0x5f, 0xfe, 0x00, 0x31, 0xac, 0x68, 0xbf, 0x31, + 0x3c, 0xba, 0xdb, 0x2a, 0x7b, 0x25, 0x19, 0x96, 0xde, 0x11, 0xd8, 0x63, 0x68, 0x9b, 0x2a, 0x53, + 0xfa, 0x94, 0x30, 0x2c, 0x6f, 0xa2, 0xd1, 0xc9, 0xf4, 0xa6, 0x5e, 0xf5, 0x92, 0x33, 0xac, 0xbc, + 0xcc, 0xb0, 0xa7, 0x00, 0x99, 0xcb, 0x73, 0xe5, 0x13, 0xcd, 0xb0, 0xfa, 0x92, 0xc2, 0xf0, 0xec, + 0x24, 0x17, 0xcf, 0xf2, 0xa7, 0x93, 0x61, 0xd5, 0xbd, 0x61, 0xda, 0xa6, 0xe7, 0xb5, 0x2f, 0xfe, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x51, 0x0d, 0xe3, 0xa9, 0x13, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index 99d2ef641..74249c09b 100644 --- a/types/types.proto +++ b/types/types.proto @@ -10,18 +10,18 @@ import "github.com/gogo/protobuf/gogoproto/gogo.proto"; // Request types message Request { - oneof value{ - RequestEcho echo = 1; - RequestFlush flush = 2; - RequestInfo info = 3; - RequestSetOption set_option = 4; - RequestDeliverTx deliver_tx = 5; - RequestCheckTx check_tx = 6; - RequestCommit commit = 7; - RequestQuery query = 8; - RequestInitChain init_chain = 9; - RequestBeginBlock begin_block = 10; + oneof value { + RequestEcho echo = 2; + RequestFlush flush = 3; + RequestInfo info = 4; + RequestSetOption set_option = 5; + RequestInitChain init_chain = 6; + RequestQuery query = 7; + RequestBeginBlock begin_block = 8; + RequestCheckTx check_tx = 9; + RequestDeliverTx deliver_tx = 19; RequestEndBlock end_block = 11; + RequestCommit commit = 12; } } @@ -36,17 +36,13 @@ message RequestInfo { string version = 1; } -message RequestSetOption{ +message RequestSetOption { string key = 1; string value = 2; } -message RequestDeliverTx{ - bytes tx = 1; -} - -message RequestCheckTx{ - bytes tx = 1; +message RequestInitChain { + repeated Validator validators = 1; } message RequestQuery{ @@ -56,46 +52,49 @@ message RequestQuery{ bool prove = 4; } -message RequestCommit{ -} - -message RequestInitChain{ - repeated Validator validators = 1; -} - -message RequestBeginBlock{ +message RequestBeginBlock { bytes hash = 1; Header header = 2; repeated int32 absent_validators = 3; repeated Evidence byzantine_validators = 4; } +message RequestCheckTx { + bytes tx = 1; +} + +message RequestDeliverTx { + bytes tx = 1; +} + message RequestEndBlock{ int64 height = 1; } +message RequestCommit { +} + //---------------------------------------- // Response types - message Response { - oneof value{ + oneof value { ResponseException exception = 1; ResponseEcho echo = 2; ResponseFlush flush = 3; ResponseInfo info = 4; ResponseSetOption set_option = 5; - ResponseDeliverTx deliver_tx = 6; - ResponseCheckTx check_tx = 7; - ResponseCommit commit = 8; - ResponseQuery query = 9; - ResponseInitChain init_chain = 10; - ResponseBeginBlock begin_block = 11; - ResponseEndBlock end_block = 12; + ResponseInitChain init_chain = 6; + ResponseQuery query = 7; + ResponseBeginBlock begin_block = 8; + ResponseCheckTx check_tx = 9; + ResponseDeliverTx deliver_tx = 10; + ResponseEndBlock end_block = 11; + ResponseCommit commit = 12; } } -message ResponseException{ +message ResponseException { string error = 1; } @@ -103,7 +102,7 @@ message ResponseEcho { string message = 1; } -message ResponseFlush{ +message ResponseFlush { } message ResponseInfo { @@ -113,81 +112,82 @@ message ResponseInfo { bytes last_block_app_hash = 4; } -message ResponseSetOption{ +message ResponseSetOption { uint32 code = 1; string log = 2; } -message ResponseDeliverTx{ - uint32 code = 1; - bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - string log = 3; - repeated KVPair tags = 4; +message ResponseInitChain { } -message ResponseCheckTx{ - uint32 code = 1; - bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - string log = 3; - int64 gas = 4; - int64 fee = 5; +message ResponseQuery { + uint32 code = 1; + int64 index = 2; + bytes key = 3 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + bytes value = 4 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + bytes proof = 5 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + int64 height = 6; + string log = 7; } -message ResponseQuery{ - uint32 code = 1; - int64 index = 2; - bytes key = 3 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - bytes value = 4 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - bytes proof = 5 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - int64 height = 6; - string log = 7; +message ResponseBeginBlock { } -message ResponseCommit{ - uint32 code = 1; - bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; - string log = 3; +message ResponseCheckTx { + uint32 code = 1; + bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + string log = 3; + int64 gas = 4; + int64 fee = 5; } - -message ResponseInitChain{ +message ResponseDeliverTx { + uint32 code = 1; + bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + string log = 3; + repeated KVPair tags = 4; } -message ResponseBeginBlock{ +message ResponseEndBlock { + repeated Validator validator_updates = 1; + ConsensusParams consensus_param_updates = 2; } -message ResponseEndBlock{ - repeated Validator validator_set_updates = 1; - ConsensusParams consensus_param_updates = 2; +message ResponseCommit { + uint32 code = 1; + bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; + string log = 3; } +//---------------------------------------- +// Misc. + // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app -message ConsensusParams{ - BlockSize block_size = 1; - TxSize tx_size = 2; - BlockGossip block_gossip = 3; +message ConsensusParams { + BlockSize block_size = 1; + TxSize tx_size = 2; + BlockGossip block_gossip = 3; } // BlockSize contain limits on the block size. -message BlockSize{ - // NOTE: must not be 0 nor greater than 100MB - int32 max_bytes = 1; - int32 max_txs = 2; - int64 max_gas = 3; +message BlockSize { + int32 max_bytes = 1; + int32 max_txs = 2; + int64 max_gas = 3; } // TxSize contain limits on the tx size. message TxSize{ - int32 max_bytes = 1; - int64 max_gas = 2; + int32 max_bytes = 1; + int64 max_gas = 2; } // BlockGossip determine consensus critical // elements of how blocks are gossiped message BlockGossip{ - // Note: must not be 0 - int32 block_part_size_bytes = 1; + // Note: must not be 0 + int32 block_part_size_bytes = 1; } //----------------------------------------