diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c0cbce1..0dc591d1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 0.9.0 (TBD) + +BREAKING CHANGES: + - [types] ResponseEndBlock: renamed Diffs field to ValidatorUpdates + - [types] changed protobuf field indices for Request and Response oneof types + +FEATURES: + - [types] ResponseEndBlock: added ConsensusParamUpdates + ## 0.8.0 (December 6, 2017) BREAKING CHANGES: diff --git a/Makefile b/Makefile index d5fe913b2..dc996d128 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,13 @@ GOTOOLS = \ github.com/mitchellh/gox \ github.com/Masterminds/glide \ - github.com/alecthomas/gometalinter \ - github.com/ckaznocha/protoc-gen-lint \ + gopkg.in/alecthomas/gometalinter.v2 \ 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,10 @@ 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 + @ echo "--> adding nolint declarations to protobuf generated files" + @ awk '/package types/ { print "//nolint: gas"; print; next }1' types/types.pb.go > types/types.pb.go.new + @ mv types/types.pb.go.new types/types.pb.go install: @ go install ./cmd/... @@ -41,15 +43,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,34 +62,34 @@ get_deps: ensure_tools: go get -u -v $(GOTOOLS) - @gometalinter --install + @ gometalinter.v2 --install get_vendor_deps: ensure_tools - @rm -rf vendor/ - @echo "--> Running glide install" + @ rm -rf vendor/ + @ echo "--> Running glide install" @ glide install -metalinter: +metalinter_all: protoc $(INCLUDE) --lint_out=. types/*.proto - gometalinter --vendor --deadline=600s --enable-all --disable=lll ./... + gometalinter.v2 --vendor --deadline=600s --enable-all --disable=lll ./... -metalinter_test: - protoc $(INCLUDE) --lint_out=. types/*.proto - gometalinter --vendor --deadline=600s --disable-all \ +metalinter: + @ echo "==> Running linter" + gometalinter.v2 --vendor --deadline=600s --disable-all \ --enable=maligned \ --enable=deadcode \ --enable=goconst \ --enable=goimports \ --enable=gosimple \ - --enable=ineffassign \ + --enable=ineffassign \ --enable=megacheck \ - --enable=misspell \ - --enable=staticcheck \ + --enable=misspell \ + --enable=staticcheck \ --enable=safesql \ - --enable=structcheck \ - --enable=unconvert \ + --enable=structcheck \ + --enable=unconvert \ --enable=unused \ - --enable=varcheck \ + --enable=varcheck \ --enable=vetshadow \ ./... @@ -99,8 +99,8 @@ metalinter_test: #--enable=gocyclo \ #--enable=golint \ <== comments on anything exported #--enable=gotype \ - #--enable=interfacer \ - #--enable=unparam \ + #--enable=interfacer \ + #--enable=unparam \ #--enable=vet \ build-docker: diff --git a/README.md b/README.md index 46abcc4fd..dbfd86347 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ See [the documentation](http://tendermint.readthedocs.io/en/master/) for more de Multiple example apps are included: - the `abci-cli counter` application, which illustrates nonce checking in txs -- the `abci-cli dummy` application, which illustrates a simple key-value merkle tree +- the `abci-cli dummy` application, which illustrates a simple key-value Merkle tree - the `abci-cli dummy --persistent` application, which augments the dummy with persistence and validator set changes ### Install @@ -91,59 +91,17 @@ ABCI requests/responses are defined as simple Protobuf messages in [this schema TendermintCore sends the requests, and the ABCI application sends the responses. Here, we describe the requests and responses as function arguments and return values, and make some notes about usage: -#### DeliverTx - * __Arguments__: - * `Data ([]byte)`: The request transaction bytes - * __Returns__: - * `Code (uint32)`: Response code - * `Data ([]byte)`: Result bytes, if any - * `Log (string)`: Debug or error message - * `Tags ([]*KVPair)`: Optional tags for indexing - * __Usage__:
- Append and run a transaction. If the transaction is valid, returns CodeType.OK - -#### CheckTx +#### Echo * __Arguments__: - * `Data ([]byte)`: The request transaction bytes + * `Message (string)`: A string to echo back * __Returns__: - * `Code (uint32)`: Response code - * `Data ([]byte)`: Result bytes, if any - * `Log (string)`: Debug or error message - * `Gas (int64)`: Amount of gas consumed by transaction - * `Fee (int64)`: Fee paid by transaction + * `Message (string)`: The input string * __Usage__:
- Validate a mempool transaction, prior to broadcasting or proposing. This message should not mutate the main state, but application - developers may want to keep a separate CheckTx state that gets reset upon Commit. - - CheckTx can happen interspersed with DeliverTx, but they happen on different ABCI connections - CheckTx from the mempool connection, and DeliverTx from the consensus connection. During Commit, the mempool is locked, so you can reset the mempool state to the latest state after running all those DeliverTxs, and then the mempool will re-run whatever txs it has against that latest mempool state. - - Transactions are first run through CheckTx before broadcast to peers in the mempool layer. - You can make CheckTx semi-stateful and clear the state upon `Commit` or `BeginBlock`, - to allow for dependent sequences of transactions in the same block. + * Echo a string to test an abci client/server implementation -#### Commit - * __Returns__: - * `Data ([]byte)`: The Merkle root hash - * `Log (string)`: Debug or error message +#### Flush * __Usage__:
- Return a Merkle root hash of the application state. - -#### Query - * __Arguments__: - * `Data ([]byte)`: Raw query bytes. Can be used with or in lieu of Path. - * `Path (string)`: Path of request, like an HTTP GET path. Can be used with or in liue of Data. - * Apps MUST interpret '/store' as a query by key on the underlying store. The key SHOULD be specified in the Data field. - * Apps SHOULD allow queries over specific types like '/accounts/...' or '/votes/...' - * `Height (int64)`: The block height for which you want the query (default=0 returns data for the latest committed block). Note that this is the height of the block containing the application's Merkle root hash, which represents the state as it was after committing the block at Height-1 - * `Prove (bool)`: Return Merkle proof with response if possible - * __Returns__: - * `Code (uint32)`: Response code - * `Key ([]byte)`: The key of the matching data - * `Value ([]byte)`: The value of the matching data - * `Proof ([]byte)`: Proof for the data, if requested - * `Height (int64)`: The block height from which data was derived. Note that this is the height of the block containing the application's Merkle root hash, which represents the state as it was after committing the block at Height-1 - * `Log (string)`: Debug or error message - *Please note* The current implementation of go-merkle doesn't support querying proofs from past blocks, so for the present moment, any height other than 0 will return an error (recall height=0 defaults to latest block). Hopefully this will be improved soon(ish) + * Signals that messages queued on the client should be flushed to the server. It is called periodically by the client implementation to ensure asynchronous requests are actually sent, and is called immediately to make a synchronous request, which returns when the Flush response comes back. #### Info * __Returns__: @@ -172,6 +130,22 @@ Here, we describe the requests and responses as function arguments and return va * __Usage__:
Called once upon genesis +#### Query + * __Arguments__: + * `Data ([]byte)`: Raw query bytes. Can be used with or in lieu of Path. + * `Path (string)`: Path of request, like an HTTP GET path. Can be used with or in liue of Data. + * Apps MUST interpret '/store' as a query by key on the underlying store. The key SHOULD be specified in the Data field. + * Apps SHOULD allow queries over specific types like '/accounts/...' or '/votes/...' + * `Height (int64)`: The block height for which you want the query (default=0 returns data for the latest committed block). Note that this is the height of the block containing the application's Merkle root hash, which represents the state as it was after committing the block at Height-1 + * `Prove (bool)`: Return Merkle proof with response if possible + * __Returns__: + * `Code (uint32)`: Response code + * `Key ([]byte)`: The key of the matching data + * `Value ([]byte)`: The value of the matching data + * `Proof ([]byte)`: Proof for the data, if requested + * `Height (int64)`: The block height from which data was derived. Note that this is the height of the block containing the application's Merkle root hash, which represents the state as it was after committing the block at Height-1 + * `Log (string)`: Debug or error message + #### BeginBlock * __Arguments__: * `Hash ([]byte)`: The block's hash. This can be derived from the block header. @@ -181,23 +155,49 @@ Here, we describe the requests and responses as function arguments and return va * __Usage__:
Signals the beginning of a new block. Called prior to any DeliverTxs. The header is expected to at least contain the Height. The `AbsentValidators` and `ByzantineValidators` can be used to determine rewards and punishments for the validators. -#### EndBlock +#### CheckTx * __Arguments__: - * `Height (int64)`: The block height that ended + * `Data ([]byte)`: The request transaction bytes * __Returns__: - * `Diffs ([]Validator)`: Changed validators with new voting powers (0 to remove) + * `Code (uint32)`: Response code + * `Data ([]byte)`: Result bytes, if any + * `Log (string)`: Debug or error message + * `Gas (int64)`: Amount of gas consumed by transaction + * `Fee (int64)`: Fee paid by transaction * __Usage__:
- Signals the end of a block. Called prior to each Commit after all transactions. Validator set is updated with the result. + Validate a mempool transaction, prior to broadcasting or proposing. This message should not mutate the main state, but application + developers may want to keep a separate CheckTx state that gets reset upon Commit. -#### Echo + CheckTx can happen interspersed with DeliverTx, but they happen on different ABCI connections - CheckTx from the mempool connection, and DeliverTx from the consensus connection. During Commit, the mempool is locked, so you can reset the mempool state to the latest state after running all those DeliverTxs, and then the mempool will re-run whatever txs it has against that latest mempool state. + + Transactions are first run through CheckTx before broadcast to peers in the mempool layer. + You can make CheckTx semi-stateful and clear the state upon `Commit` or `BeginBlock`, + to allow for dependent sequences of transactions in the same block. + +#### DeliverTx * __Arguments__: - * `Message (string)`: A string to echo back + * `Data ([]byte)`: The request transaction bytes * __Returns__: - * `Message (string)`: The input string + * `Code (uint32)`: Response code + * `Data ([]byte)`: Result bytes, if any + * `Log (string)`: Debug or error message + * `Tags ([]*KVPair)`: Optional tags for indexing * __Usage__:
- * Echo a string to test an abci client/server implementation + Append and run a transaction. If the transaction is valid, returns CodeType.OK -#### Flush +#### EndBlock + * __Arguments__: + * `Height (int64)`: The block height that ended + * __Returns__: + * `ValidatorUpdates ([]Validator)`: Changes to validator set (set voting power to 0 to remove) + * `ConsensusParamUpdates (ConsensusParams)`: Changes to consensus-critical time/size parameters * __Usage__:
- * Signals that messages queued on the client should be flushed to the server. It is called periodically by the client implementation to ensure asynchronous requests are actually sent, and is called immediately to make a synchronous request, which returns when the Flush response comes back. + Signals the end of a block. Called prior to each Commit after all transactions. Validator set is updated with the result. + +#### Commit + * __Returns__: + * `Data ([]byte)`: The Merkle root hash + * `Log (string)`: Debug or error message + * __Usage__:
+ Return a Merkle root hash of the application state. diff --git a/circle.yml b/circle.yml index 7d4545e54..32ce4a7a0 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,6 @@ machine: environment: GOPATH: /home/ubuntu/.go_workspace REPO: $GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME - GO15VENDOREXPERIMENT: 1 hosts: circlehost: 127.0.0.1 localhost: 127.0.0.1 @@ -16,7 +15,7 @@ checkout: test: override: - - cd $REPO && make get_vendor_deps && make test_integrations + - cd $REPO && make get_vendor_deps && make metalinter && make test_integrations post: - cd "$REPO" && bash <(curl -s https://codecov.io/bash) -f coverage.txt - cd "$REPO" && mv coverage.txt "${CIRCLE_ARTIFACTS}" diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go index bfe9ef7a9..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 TestValSetChanges(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.Diffs) + valsEqual(t, diff, resEndBlock.ValidatorUpdates) } diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go index 6f389c507..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 - changes []*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.changes + // 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.changes = 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{Diffs: app.changes} + 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.changes = append(app.changes, v) + app.ValUpdates = append(app.ValUpdates, v) return types.ResponseDeliverTx{Code: code.CodeTypeOK} } diff --git a/tests/server/client.go b/tests/server/client.go index 4db93e1fb..aaea9f34c 100644 --- a/tests/server/client.go +++ b/tests/server/client.go @@ -33,7 +33,7 @@ func SetOption(client abcicli.Client, key, value string) error { log := res.GetLog() if err != nil { fmt.Println("Failed test: SetOption") - fmt.Printf("setting %v=%v: \nlog: %v", key, value, log) + fmt.Printf("setting %v=%v: \nlog: %v\n", key, value, log) fmt.Println("Failed test: SetOption") return err } @@ -51,7 +51,7 @@ func Commit(client abcicli.Client, hashExp []byte) error { } if !bytes.Equal(data, hashExp) { fmt.Println("Failed test: Commit") - fmt.Printf("Commit hash was unexpected. Got %X expected %X", + fmt.Printf("Commit hash was unexpected. Got %X expected %X\n", data.Bytes(), hashExp) return errors.New("CommitTx failed") } @@ -64,13 +64,13 @@ func DeliverTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp [] code, data, log := res.Code, res.Data, res.Log if code != codeExp { fmt.Println("Failed test: DeliverTx") - fmt.Printf("DeliverTx response code was unexpected. Got %v expected %v. Log: %v", + fmt.Printf("DeliverTx response code was unexpected. Got %v expected %v. Log: %v\n", code, codeExp, log) return errors.New("DeliverTx error") } if !bytes.Equal(data, dataExp) { fmt.Println("Failed test: DeliverTx") - fmt.Printf("DeliverTx response data was unexpected. Got %X expected %X", + fmt.Printf("DeliverTx response data was unexpected. Got %X expected %X\n", data, dataExp) return errors.New("DeliverTx error") } @@ -83,13 +83,13 @@ func CheckTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []by code, data, log := res.Code, res.Data, res.Log if code != codeExp { fmt.Println("Failed test: CheckTx") - fmt.Printf("CheckTx response code was unexpected. Got %v expected %v. Log: %v", + fmt.Printf("CheckTx response code was unexpected. Got %v expected %v. Log: %v\n", code, codeExp, log) return errors.New("CheckTx") } if !bytes.Equal(data, dataExp) { fmt.Println("Failed test: CheckTx") - fmt.Printf("CheckTx response data was unexpected. Got %X expected %X", + fmt.Printf("CheckTx response data was unexpected. Got %X expected %X\n", data, dataExp) return errors.New("CheckTx") } diff --git a/types/protoreplace/protoreplace.go b/types/protoreplace/protoreplace.go index c859098f8..3ea0c73da 100644 --- a/types/protoreplace/protoreplace.go +++ b/types/protoreplace/protoreplace.go @@ -1,7 +1,7 @@ -package main - // +build ignore +package main + import ( "bytes" "fmt" diff --git a/types/types.pb.go b/types/types.pb.go index 69777d6d5..712726288 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -13,26 +13,30 @@ 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 + BlockGossip Header BlockID PartSetHeader @@ -40,6 +44,7 @@ It has these top-level messages: Evidence KVPair */ +//nolint: gas package types import proto "github.com/gogo/protobuf/proto" @@ -82,7 +87,7 @@ var KVPair_Type_value = map[string]int32{ func (x KVPair_Type) String() string { return proto.EnumName(KVPair_Type_name, int32(x)) } -func (KVPair_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorTypes, []int{30, 0} } +func (KVPair_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34, 0} } type Request struct { // Types that are valid to be assigned to Value: @@ -90,13 +95,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"` } @@ -110,50 +115,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"` + SetOption *RequestSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,oneof"` } -type Request_DeliverTx struct { - DeliverTx *RequestDeliverTx `protobuf:"bytes,5,opt,name=deliver_tx,json=deliverTx,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 { @@ -190,51 +195,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 } @@ -246,13 +251,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), } } @@ -261,53 +266,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: @@ -315,6 +315,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) @@ -325,7 +330,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 } @@ -333,7 +338,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 } @@ -341,7 +346,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 } @@ -349,7 +354,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 } @@ -357,61 +362,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 @@ -424,52 +429,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: @@ -477,6 +477,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)) @@ -548,34 +553,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 } @@ -590,7 +579,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 { @@ -620,30 +609,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"` @@ -654,7 +619,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 { @@ -684,6 +649,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"` } @@ -691,7 +688,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 { @@ -700,6 +697,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 @@ -707,13 +712,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"` } @@ -741,26 +746,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() {} @@ -768,13 +773,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 { @@ -818,51 +823,51 @@ func (m *Response) GetSetOption() *ResponseSetOption { return nil } -func (m *Response) GetDeliverTx() *ResponseDeliverTx { - if x, ok := m.GetValue().(*Response_DeliverTx); ok { - return x.DeliverTx +func (m *Response) GetInitChain() *ResponseInitChain { + if x, ok := m.GetValue().(*Response_InitChain); ok { + return x.InitChain } return nil } -func (m *Response) GetCheckTx() *ResponseCheckTx { - if x, ok := m.GetValue().(*Response_CheckTx); ok { - return x.CheckTx +func (m *Response) GetQuery() *ResponseQuery { + if x, ok := m.GetValue().(*Response_Query); ok { + return x.Query } return nil } -func (m *Response) GetCommit() *ResponseCommit { - if x, ok := m.GetValue().(*Response_Commit); ok { - return x.Commit +func (m *Response) GetBeginBlock() *ResponseBeginBlock { + if x, ok := m.GetValue().(*Response_BeginBlock); ok { + return x.BeginBlock } return nil } -func (m *Response) GetQuery() *ResponseQuery { - if x, ok := m.GetValue().(*Response_Query); ok { - return x.Query +func (m *Response) GetCheckTx() *ResponseCheckTx { + if x, ok := m.GetValue().(*Response_CheckTx); ok { + return x.CheckTx } return nil } -func (m *Response) GetInitChain() *ResponseInitChain { - if x, ok := m.GetValue().(*Response_InitChain); ok { - return x.InitChain +func (m *Response) GetDeliverTx() *ResponseDeliverTx { + if x, ok := m.GetValue().(*Response_DeliverTx); ok { + return x.DeliverTx } return nil } -func (m *Response) GetBeginBlock() *ResponseBeginBlock { - if x, ok := m.GetValue().(*Response_BeginBlock); ok { - return x.BeginBlock +func (m *Response) GetEndBlock() *ResponseEndBlock { + if x, ok := m.GetValue().(*Response_EndBlock); ok { + return x.EndBlock } return nil } -func (m *Response) GetEndBlock() *ResponseEndBlock { - if x, ok := m.GetValue().(*Response_EndBlock); ok { - return x.EndBlock +func (m *Response) GetCommit() *ResponseCommit { + if x, ok := m.GetValue().(*Response_Commit); ok { + return x.Commit } return nil } @@ -875,13 +880,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), } } @@ -914,39 +919,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: @@ -999,61 +1004,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 @@ -1089,38 +1094,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 @@ -1235,39 +1240,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"` @@ -1279,7 +1310,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 { @@ -1309,47 +1340,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 { @@ -1361,7 +1406,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 { @@ -1377,36 +1422,115 @@ func (m *ResponseCommit) GetLog() string { return "" } -type ResponseInitChain struct { +// ConsensusParams contains all consensus-relevant parameters +// that can be adjusted by the abci app +type ConsensusParams struct { + BlockSize *BlockSize `protobuf:"bytes,1,opt,name=block_size,json=blockSize" json:"block_size,omitempty"` + TxSize *TxSize `protobuf:"bytes,2,opt,name=tx_size,json=txSize" json:"tx_size,omitempty"` + BlockGossip *BlockGossip `protobuf:"bytes,3,opt,name=block_gossip,json=blockGossip" json:"block_gossip,omitempty"` } -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} } +func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } +func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } +func (*ConsensusParams) ProtoMessage() {} +func (*ConsensusParams) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{25} } -type ResponseBeginBlock struct { +func (m *ConsensusParams) GetBlockSize() *BlockSize { + if m != nil { + return m.BlockSize + } + return nil } -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} } +func (m *ConsensusParams) GetTxSize() *TxSize { + if m != nil { + return m.TxSize + } + return nil +} -type ResponseEndBlock struct { - Diffs []*Validator `protobuf:"bytes,1,rep,name=diffs" json:"diffs,omitempty"` +func (m *ConsensusParams) GetBlockGossip() *BlockGossip { + if m != nil { + return m.BlockGossip + } + return nil } -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} } +// BlockSize contain limits on the block size. +type BlockSize struct { + 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"` +} -func (m *ResponseEndBlock) GetDiffs() []*Validator { +func (m *BlockSize) Reset() { *m = BlockSize{} } +func (m *BlockSize) String() string { return proto.CompactTextString(m) } +func (*BlockSize) ProtoMessage() {} +func (*BlockSize) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{26} } + +func (m *BlockSize) GetMaxBytes() int32 { if m != nil { - return m.Diffs + return m.MaxBytes } - return nil + return 0 +} + +func (m *BlockSize) GetMaxTxs() int32 { + if m != nil { + return m.MaxTxs + } + return 0 +} + +func (m *BlockSize) GetMaxGas() int64 { + if m != nil { + return m.MaxGas + } + return 0 +} + +// TxSize contain limits on the tx size. +type TxSize struct { + MaxBytes int32 `protobuf:"varint,1,opt,name=max_bytes,json=maxBytes,proto3" json:"max_bytes,omitempty"` + MaxGas int64 `protobuf:"varint,2,opt,name=max_gas,json=maxGas,proto3" json:"max_gas,omitempty"` +} + +func (m *TxSize) Reset() { *m = TxSize{} } +func (m *TxSize) String() string { return proto.CompactTextString(m) } +func (*TxSize) ProtoMessage() {} +func (*TxSize) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{27} } + +func (m *TxSize) GetMaxBytes() int32 { + if m != nil { + return m.MaxBytes + } + return 0 +} + +func (m *TxSize) GetMaxGas() int64 { + if m != nil { + return m.MaxGas + } + return 0 +} + +// BlockGossip determine consensus critical +// elements of how blocks are gossiped +type BlockGossip struct { + // Note: must not be 0 + BlockPartSizeBytes int32 `protobuf:"varint,1,opt,name=block_part_size_bytes,json=blockPartSizeBytes,proto3" json:"block_part_size_bytes,omitempty"` +} + +func (m *BlockGossip) Reset() { *m = BlockGossip{} } +func (m *BlockGossip) String() string { return proto.CompactTextString(m) } +func (*BlockGossip) ProtoMessage() {} +func (*BlockGossip) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{28} } + +func (m *BlockGossip) GetBlockPartSizeBytes() int32 { + if m != nil { + return m.BlockPartSizeBytes + } + return 0 } type Header struct { @@ -1424,7 +1548,7 @@ type Header struct { func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{25} } +func (*Header) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{29} } func (m *Header) GetChainId() string { if m != nil { @@ -1497,7 +1621,7 @@ type BlockID struct { func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} -func (*BlockID) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{26} } +func (*BlockID) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{30} } func (m *BlockID) GetHash() []byte { if m != nil { @@ -1521,7 +1645,7 @@ type PartSetHeader struct { func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} -func (*PartSetHeader) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{27} } +func (*PartSetHeader) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{31} } func (m *PartSetHeader) GetTotal() int32 { if m != nil { @@ -1545,7 +1669,7 @@ type Validator struct { func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} -func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{28} } +func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{32} } func (m *Validator) GetPubKey() []byte { if m != nil { @@ -1569,7 +1693,7 @@ type Evidence struct { func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} -func (*Evidence) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{29} } +func (*Evidence) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{33} } func (m *Evidence) GetPubKey() []byte { if m != nil { @@ -1595,7 +1719,7 @@ type KVPair struct { func (m *KVPair) Reset() { *m = KVPair{} } func (m *KVPair) String() string { return proto.CompactTextString(m) } func (*KVPair) ProtoMessage() {} -func (*KVPair) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{30} } +func (*KVPair) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34} } func (m *KVPair) GetKey() string { if m != nil { @@ -1631,26 +1755,30 @@ 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") + proto.RegisterType((*BlockGossip)(nil), "types.BlockGossip") proto.RegisterType((*Header)(nil), "types.Header") proto.RegisterType((*BlockID)(nil), "types.BlockID") proto.RegisterType((*PartSetHeader)(nil), "types.PartSetHeader") @@ -2065,103 +2193,114 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1554 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0xcb, 0x6e, 0xdb, 0x46, - 0x17, 0xc7, 0x2d, 0x51, 0xd4, 0xe5, 0xf8, 0x26, 0x8f, 0xfd, 0x25, 0x8a, 0xb2, 0x88, 0x43, 0xe0, - 0x6b, 0xe4, 0x5c, 0xac, 0xd4, 0x41, 0x8a, 0x38, 0x29, 0x0a, 0x58, 0x71, 0x52, 0x09, 0x01, 0xd2, - 0x74, 0x62, 0x64, 0x2b, 0x50, 0xe2, 0x48, 0x22, 0x22, 0x91, 0x0c, 0x39, 0x72, 0xe4, 0xa2, 0x8f, - 0x90, 0x7d, 0xd7, 0xed, 0xa6, 0x40, 0x5f, 0xa0, 0xcb, 0xee, 0x8a, 0x3e, 0x43, 0x17, 0x79, 0x96, - 0x62, 0xce, 0x0c, 0xaf, 0x26, 0xb3, 0xc8, 0x22, 0x1b, 0x63, 0x2e, 0xe7, 0x3f, 0x3a, 0x33, 0x3c, - 0xf3, 0x3b, 0x67, 0x0c, 0x3b, 0xfc, 0xc2, 0x63, 0x41, 0x17, 0xff, 0x1e, 0x7a, 0xbe, 0xcb, 0x5d, - 0xa2, 0x63, 0xa7, 0x7d, 0x6f, 0x6a, 0xf3, 0xd9, 0x72, 0x74, 0x38, 0x76, 0x17, 0xdd, 0xa9, 0x3b, - 0x75, 0xbb, 0x38, 0x3b, 0x5a, 0x4e, 0xb0, 0x87, 0x1d, 0x6c, 0x49, 0x95, 0xf1, 0x77, 0x05, 0x6a, - 0x94, 0xbd, 0x5b, 0xb2, 0x80, 0x93, 0x0e, 0x54, 0xd8, 0x78, 0xe6, 0xb6, 0x4a, 0xfb, 0xa5, 0xce, - 0xfa, 0x11, 0x39, 0x94, 0xab, 0xab, 0xd9, 0x67, 0xe3, 0x99, 0xdb, 0x5f, 0xa3, 0x68, 0x41, 0xee, - 0x80, 0x3e, 0x99, 0x2f, 0x83, 0x59, 0xab, 0x8c, 0xa6, 0xbb, 0x69, 0xd3, 0xe7, 0x62, 0xaa, 0xbf, - 0x46, 0xa5, 0x8d, 0x58, 0xd6, 0x76, 0x26, 0x6e, 0x4b, 0xcb, 0x5b, 0x76, 0xe0, 0x4c, 0x70, 0x59, - 0x61, 0x41, 0x1e, 0x01, 0x04, 0x8c, 0x0f, 0x5d, 0x8f, 0xdb, 0xae, 0xd3, 0xaa, 0xa0, 0xfd, 0xd5, - 0xb4, 0xfd, 0x6b, 0xc6, 0x7f, 0xc0, 0xe9, 0xfe, 0x1a, 0x6d, 0x04, 0x61, 0x47, 0x28, 0x2d, 0x36, - 0xb7, 0xcf, 0x99, 0x3f, 0xe4, 0xab, 0x96, 0x9e, 0xa7, 0x3c, 0x95, 0xf3, 0x67, 0x2b, 0xa1, 0xb4, - 0xc2, 0x0e, 0x39, 0x82, 0xfa, 0x78, 0xc6, 0xc6, 0x6f, 0x85, 0xae, 0x8a, 0xba, 0xff, 0xa5, 0x75, - 0x4f, 0xc5, 0x2c, 0xaa, 0x6a, 0x63, 0xd9, 0x24, 0x87, 0x50, 0x1d, 0xbb, 0x8b, 0x85, 0xcd, 0x5b, - 0x35, 0x54, 0xec, 0x65, 0x14, 0x38, 0xd7, 0x5f, 0xa3, 0xca, 0x4a, 0x1c, 0xd7, 0xbb, 0x25, 0xf3, - 0x2f, 0x5a, 0xf5, 0xbc, 0xe3, 0xfa, 0x51, 0x4c, 0x89, 0xe3, 0x42, 0x1b, 0xb1, 0x15, 0xdb, 0xb1, - 0xf9, 0x70, 0x3c, 0x33, 0x6d, 0xa7, 0xd5, 0xc8, 0xdb, 0xca, 0xc0, 0xb1, 0xf9, 0x53, 0x31, 0x2d, - 0xb6, 0x62, 0x87, 0x1d, 0xf2, 0x04, 0xd6, 0x47, 0x6c, 0x6a, 0x3b, 0xc3, 0xd1, 0xdc, 0x1d, 0xbf, - 0x6d, 0x01, 0x4a, 0x5b, 0x69, 0x69, 0x4f, 0x18, 0xf4, 0xc4, 0x7c, 0x7f, 0x8d, 0xc2, 0x28, 0xea, - 0x91, 0x87, 0xd0, 0x60, 0x8e, 0xa5, 0xa4, 0xeb, 0x28, 0xbd, 0x92, 0x89, 0x00, 0xc7, 0x0a, 0x85, - 0x75, 0xa6, 0xda, 0xbd, 0x1a, 0xe8, 0xe7, 0xe6, 0x7c, 0xc9, 0x8c, 0x5b, 0xb0, 0x9e, 0x88, 0x14, - 0xd2, 0x82, 0xda, 0x82, 0x05, 0x81, 0x39, 0x65, 0x18, 0x4e, 0x0d, 0x1a, 0x76, 0x8d, 0x2d, 0xd8, - 0x48, 0xc6, 0x49, 0x42, 0x28, 0x62, 0x41, 0x08, 0xcf, 0x99, 0x1f, 0x88, 0x00, 0x50, 0x42, 0xd5, - 0x35, 0x1e, 0x43, 0x33, 0x1b, 0x04, 0xa4, 0x09, 0xda, 0x5b, 0x76, 0xa1, 0x2c, 0x45, 0x93, 0xec, - 0x29, 0x87, 0x30, 0x34, 0x1b, 0x54, 0x79, 0x67, 0x44, 0xda, 0x28, 0x0c, 0xc8, 0x16, 0x94, 0xf9, - 0x0a, 0xa5, 0x1b, 0xb4, 0xcc, 0x57, 0xc6, 0x3e, 0x6c, 0xa5, 0x3f, 0xf9, 0x25, 0x0b, 0x2b, 0x72, - 0x1d, 0xbf, 0x19, 0x21, 0x50, 0xb1, 0x4c, 0x6e, 0x2a, 0x0b, 0x6c, 0x8b, 0x31, 0xcf, 0xe4, 0x33, - 0xf5, 0xf3, 0xd8, 0x26, 0x57, 0xa0, 0x3a, 0x63, 0xf6, 0x74, 0xc6, 0xf1, 0x0e, 0x68, 0x54, 0xf5, - 0x84, 0xaf, 0x9e, 0xef, 0x9e, 0x33, 0x0c, 0xf5, 0x3a, 0x95, 0x1d, 0x63, 0x1b, 0x36, 0x53, 0x81, - 0x64, 0x9c, 0x46, 0xce, 0x47, 0x1f, 0x9e, 0xdc, 0x07, 0x38, 0x37, 0xe7, 0xb6, 0x65, 0x72, 0xd7, - 0x0f, 0x5a, 0xa5, 0x7d, 0xad, 0xb3, 0x7e, 0xd4, 0x54, 0xdf, 0xeb, 0x4d, 0x38, 0x41, 0x13, 0x36, - 0xc6, 0x5f, 0x25, 0xd8, 0xb9, 0x14, 0x04, 0xc2, 0xdd, 0x99, 0x19, 0xcc, 0xc2, 0x2d, 0x88, 0x36, - 0xf9, 0xbf, 0x70, 0xd7, 0xb4, 0x98, 0xaf, 0xae, 0xf7, 0xa6, 0x5a, 0xb7, 0x8f, 0x83, 0x54, 0x4d, - 0x92, 0x3b, 0xb0, 0x63, 0x8e, 0x02, 0xe6, 0xf0, 0x61, 0xc2, 0x13, 0x6d, 0x5f, 0xeb, 0xe8, 0xb4, - 0x29, 0x27, 0x22, 0x47, 0x02, 0xd2, 0x83, 0xbd, 0xd1, 0xc5, 0x4f, 0xa6, 0xc3, 0x6d, 0x87, 0x25, - 0xed, 0x2b, 0xe8, 0xf9, 0xb6, 0xfa, 0x85, 0x67, 0xe7, 0xb6, 0xc5, 0x9c, 0x31, 0xa3, 0xbb, 0x91, - 0x71, 0xbc, 0x86, 0x71, 0x00, 0xdb, 0x99, 0x50, 0x4c, 0x9c, 0x6c, 0x29, 0x79, 0xb2, 0xc6, 0x07, - 0x1d, 0xea, 0x94, 0x05, 0x9e, 0xeb, 0x04, 0x8c, 0x3c, 0x82, 0x06, 0x5b, 0x8d, 0x99, 0xa4, 0x4a, - 0x29, 0x73, 0x2b, 0xa4, 0xcd, 0xb3, 0x70, 0x5e, 0xdc, 0xa8, 0xc8, 0x98, 0x1c, 0x28, 0x22, 0x66, - 0x31, 0xa7, 0x44, 0x49, 0x24, 0xde, 0x0d, 0x91, 0xa8, 0x65, 0x90, 0x20, 0x6d, 0x33, 0x4c, 0x3c, - 0x50, 0x4c, 0xac, 0xe4, 0x2e, 0x9c, 0x82, 0xe2, 0x71, 0x0a, 0x8a, 0x7a, 0xae, 0xfb, 0x05, 0x54, - 0x3c, 0x4e, 0x51, 0xb1, 0x9a, 0x2b, 0x2d, 0xc0, 0xe2, 0x83, 0x04, 0x16, 0x6b, 0x19, 0x1a, 0x48, - 0x61, 0x0e, 0x17, 0xbb, 0x11, 0x17, 0xeb, 0x19, 0x92, 0x2a, 0x49, 0x16, 0x8c, 0x77, 0x43, 0x30, - 0x36, 0x72, 0x0f, 0x2d, 0x43, 0xc6, 0xe3, 0x14, 0x19, 0x21, 0x77, 0x3b, 0x05, 0x68, 0xfc, 0x36, - 0x8d, 0x46, 0xc9, 0xb7, 0x6b, 0x19, 0x6d, 0x21, 0x1b, 0xbf, 0x49, 0xb2, 0x71, 0x23, 0x43, 0x64, - 0x15, 0x0b, 0x9f, 0x84, 0xe3, 0x81, 0xb8, 0x7a, 0x99, 0x48, 0x13, 0xb7, 0x9f, 0xf9, 0xbe, 0xeb, - 0x2b, 0x7a, 0xc9, 0x8e, 0xd1, 0x11, 0x8c, 0x89, 0xe3, 0xeb, 0x13, 0x20, 0x45, 0x4e, 0x24, 0xa2, - 0xcb, 0xf8, 0xa5, 0x14, 0x6b, 0x91, 0xa5, 0x49, 0x3e, 0x35, 0x14, 0x9f, 0x12, 0x7c, 0x2d, 0xa7, - 0xf8, 0x4a, 0x6e, 0xc3, 0xce, 0xdc, 0x0c, 0xb8, 0xdc, 0xe6, 0x30, 0x05, 0xac, 0x6d, 0x31, 0x21, - 0xf7, 0x27, 0xc9, 0x75, 0x0f, 0x76, 0x13, 0xb6, 0xa6, 0xe7, 0x0d, 0x91, 0x22, 0x15, 0xa4, 0x48, - 0x33, 0xb2, 0x3e, 0xf1, 0xbc, 0xbe, 0x19, 0xcc, 0x8c, 0xe3, 0x78, 0xff, 0x31, 0xbb, 0x09, 0x54, - 0xc6, 0xae, 0x25, 0xb7, 0xb5, 0x49, 0xb1, 0x2d, 0x78, 0x3e, 0x77, 0xa7, 0xca, 0x33, 0xd1, 0x34, - 0x7e, 0x2b, 0xc5, 0xda, 0x98, 0xdd, 0x79, 0xda, 0x53, 0xb5, 0x5b, 0x21, 0xde, 0xe8, 0xdd, 0xff, - 0xe7, 0xe3, 0x8d, 0xb5, 0x7f, 0x3f, 0xde, 0xe8, 0x24, 0xea, 0x21, 0xce, 0x1c, 0x8b, 0xf9, 0x0b, - 0xdb, 0xe1, 0xdd, 0xa9, 0x7b, 0xef, 0xbd, 0xed, 0xb3, 0xae, 0x50, 0x1c, 0xf6, 0x2e, 0x38, 0x0b, - 0xd4, 0xf9, 0x28, 0x0f, 0xb4, 0xc8, 0x03, 0x72, 0x13, 0x2a, 0xdc, 0x9c, 0x86, 0xa8, 0x0a, 0x61, - 0xf8, 0xe2, 0xcd, 0x2b, 0xd3, 0xf6, 0x29, 0x4e, 0x19, 0xbf, 0x96, 0x04, 0x9a, 0x52, 0xf7, 0xe2, - 0x8b, 0xba, 0xd8, 0x04, 0x6d, 0x6a, 0x06, 0x78, 0xfc, 0x1a, 0x15, 0x4d, 0x31, 0x32, 0x61, 0x0c, - 0x71, 0xa1, 0x51, 0xd1, 0x34, 0xfe, 0x2c, 0xc7, 0xf1, 0x12, 0xa5, 0xaf, 0x4b, 0x1e, 0xee, 0x81, - 0x6e, 0x3b, 0x16, 0x5b, 0xa1, 0x8b, 0x1a, 0x95, 0x1d, 0xd2, 0x93, 0x69, 0x56, 0xfb, 0x4c, 0xb7, - 0x31, 0x31, 0x3f, 0x0f, 0x13, 0x73, 0xe5, 0x33, 0x57, 0x91, 0x72, 0xb1, 0x8e, 0xe7, 0xbb, 0xee, - 0x04, 0xf7, 0xf6, 0x59, 0xeb, 0xa0, 0x3c, 0x91, 0x3a, 0xaa, 0xa9, 0xa4, 0xac, 0x4e, 0xb7, 0x16, - 0x87, 0xe0, 0xcf, 0xa2, 0x30, 0x48, 0x12, 0xec, 0x4b, 0x7e, 0x5b, 0x63, 0x37, 0x8e, 0xff, 0x08, - 0x6e, 0xc6, 0x1e, 0x90, 0xcb, 0xd4, 0x92, 0x15, 0x52, 0x9a, 0x47, 0xe4, 0x2b, 0xd0, 0x2d, 0x7b, - 0x32, 0x29, 0xae, 0x11, 0xe4, 0xb4, 0xf1, 0x7b, 0x19, 0xaa, 0x32, 0xc1, 0x93, 0x6b, 0x82, 0xfd, - 0xa6, 0xed, 0x0c, 0x6d, 0x2b, 0x64, 0x0e, 0xf6, 0x07, 0x56, 0xe2, 0xd0, 0xca, 0xa9, 0x43, 0x23, - 0x50, 0xe1, 0xf6, 0x82, 0x29, 0x5c, 0x60, 0x9b, 0x5c, 0x85, 0x9a, 0xb3, 0x5c, 0x0c, 0xf9, 0x4a, - 0x06, 0xa6, 0x4e, 0xab, 0xce, 0x72, 0x71, 0xb6, 0x0a, 0xc8, 0x11, 0x6c, 0x26, 0xe0, 0x61, 0x5b, - 0x2a, 0xa9, 0x6d, 0x29, 0xd7, 0xd0, 0xef, 0xc1, 0x29, 0x5d, 0x8f, 0x30, 0x32, 0xb0, 0x48, 0x07, - 0x90, 0x2a, 0x43, 0x99, 0x38, 0x24, 0x6d, 0xaa, 0x48, 0x9b, 0x2d, 0x31, 0xae, 0x32, 0x8b, 0xa8, - 0x5e, 0xae, 0x43, 0x43, 0x9c, 0xa4, 0x34, 0xa9, 0xa1, 0x49, 0x5d, 0x0c, 0xe0, 0xe4, 0x2d, 0xd8, - 0x8e, 0x8b, 0x0f, 0x69, 0x52, 0x97, 0xab, 0xc4, 0xc3, 0x68, 0x78, 0x0d, 0xea, 0x11, 0xd5, 0x1a, - 0x68, 0x51, 0x33, 0x15, 0xcc, 0x06, 0x50, 0x53, 0x2e, 0xe6, 0x56, 0x4f, 0xb7, 0x41, 0xf7, 0x4c, - 0x9f, 0x07, 0xaa, 0x68, 0x08, 0x73, 0xda, 0x2b, 0xd3, 0x17, 0x75, 0xab, 0xaa, 0xa1, 0xa4, 0x89, - 0x71, 0x0c, 0x9b, 0xa9, 0x71, 0x71, 0xfd, 0xb8, 0xcb, 0xcd, 0x39, 0xae, 0xa8, 0x53, 0xd9, 0x89, - 0x7e, 0xa6, 0x1c, 0xff, 0x8c, 0xf1, 0x18, 0x1a, 0xd1, 0x37, 0x14, 0x47, 0xed, 0x2d, 0x47, 0xc3, - 0xb0, 0x14, 0xde, 0xa0, 0x55, 0x6f, 0x39, 0x7a, 0x21, 0xab, 0x61, 0xcf, 0x7d, 0xaf, 0x2a, 0x39, - 0x8d, 0xca, 0x8e, 0xf1, 0x04, 0xea, 0x61, 0xa5, 0x55, 0x2c, 0x2d, 0xf8, 0xd4, 0xc6, 0x1f, 0x25, - 0xa8, 0x4a, 0xf8, 0xe5, 0x54, 0xdf, 0x5f, 0x63, 0x59, 0xba, 0x64, 0x43, 0xb1, 0x69, 0x14, 0x6e, - 0x45, 0x2f, 0x3e, 0x29, 0x3a, 0x3c, 0xbb, 0xf0, 0x18, 0x6d, 0xa0, 0x95, 0x68, 0x92, 0x9b, 0xb0, - 0x21, 0x25, 0x01, 0xf7, 0x6d, 0x27, 0x0c, 0xfd, 0x75, 0x1c, 0x7b, 0x8d, 0x43, 0xe2, 0x93, 0x4a, - 0x13, 0xdb, 0xe1, 0x0a, 0x72, 0x75, 0x1c, 0x18, 0x38, 0xdc, 0xb8, 0x0e, 0x15, 0x5c, 0x07, 0xa0, - 0xfa, 0xfa, 0x8c, 0x0e, 0x5e, 0x7e, 0xdf, 0x5c, 0x23, 0x35, 0xd0, 0x06, 0x2f, 0xcf, 0x9a, 0xa5, - 0xa3, 0x0f, 0x3a, 0x6c, 0x9f, 0xf4, 0x9e, 0x0e, 0x4e, 0x3c, 0x6f, 0x6e, 0x8f, 0x4d, 0xcc, 0x3b, - 0x5d, 0xa8, 0x60, 0x66, 0xcd, 0x79, 0xe0, 0xb6, 0xf3, 0x4a, 0x3c, 0x72, 0x04, 0x3a, 0x26, 0x58, - 0x92, 0xf7, 0xce, 0x6d, 0xe7, 0x56, 0x7a, 0xe2, 0x47, 0x64, 0x0a, 0xbe, 0xfc, 0xdc, 0x6d, 0xe7, - 0x95, 0x7b, 0xe4, 0x3b, 0x68, 0xc4, 0xa9, 0xb1, 0xe8, 0xd1, 0xdb, 0x2e, 0x2c, 0xfc, 0x84, 0x3e, - 0x4e, 0x8f, 0x45, 0x4f, 0xdf, 0x76, 0x61, 0xf5, 0x47, 0x1e, 0x41, 0x2d, 0xcc, 0x5c, 0xf9, 0x0f, - 0xe0, 0x76, 0x41, 0x01, 0x28, 0x8e, 0x47, 0xe6, 0x93, 0xbc, 0x77, 0x6d, 0x3b, 0xb7, 0xa6, 0x23, - 0x0f, 0xa1, 0xaa, 0x50, 0x9a, 0xfb, 0x76, 0x6e, 0xe7, 0x57, 0x8e, 0x62, 0x93, 0xf1, 0x13, 0xa8, - 0xe8, 0x51, 0xdc, 0x2e, 0xac, 0x09, 0xc9, 0x09, 0x40, 0xe2, 0xed, 0x53, 0xf8, 0x34, 0x6e, 0x17, - 0x57, 0x86, 0x44, 0xdc, 0x9d, 0xe8, 0xf5, 0x91, 0xff, 0x40, 0x6e, 0x17, 0x15, 0x87, 0xa3, 0x2a, - 0xfe, 0xd3, 0xe5, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4d, 0x6a, 0x92, 0xbf, 0x11, - 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 516cca15b..da46b2dce 100644 --- a/types/types.proto +++ b/types/types.proto @@ -3,25 +3,24 @@ package types; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - // This file is copied from http://github.com/tendermint/abci //---------------------------------------- // 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 +35,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 +51,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 +101,7 @@ message ResponseEcho { string message = 1; } -message ResponseFlush{ +message ResponseFlush { } message ResponseInfo { @@ -113,51 +111,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 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 ResponseEndBlock { + repeated Validator validator_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 ResponseInitChain{ +// BlockSize contain limits on the block size. +message BlockSize { + int32 max_bytes = 1; + int32 max_txs = 2; + int64 max_gas = 3; } -message ResponseBeginBlock{ +// TxSize contain limits on the tx size. +message TxSize{ + int32 max_bytes = 1; + int64 max_gas = 2; } -message ResponseEndBlock{ - repeated Validator diffs = 1; +// BlockGossip determine consensus critical +// elements of how blocks are gossiped +message BlockGossip{ + // Note: must not be 0 + int32 block_part_size_bytes = 1; } //---------------------------------------- diff --git a/types/types_test.go b/types/types_test.go new file mode 100644 index 000000000..baa8155cd --- /dev/null +++ b/types/types_test.go @@ -0,0 +1,31 @@ +package types + +import ( + "testing" + + asrt "github.com/stretchr/testify/assert" +) + +func TestConsensusParams(t *testing.T) { + assert := asrt.New(t) + + params := &ConsensusParams{ + BlockSize: &BlockSize{MaxGas: 12345}, + BlockGossip: &BlockGossip{BlockPartSizeBytes: 54321}, + } + var noParams *ConsensusParams // nil + + // no error with nil fields + assert.Nil(noParams.GetBlockSize()) + assert.EqualValues(noParams.GetBlockSize().GetMaxGas(), 0) + + // get values with real fields + assert.NotNil(params.GetBlockSize()) + assert.EqualValues(params.GetBlockSize().GetMaxTxs(), 0) + assert.EqualValues(params.GetBlockSize().GetMaxGas(), 12345) + assert.NotNil(params.GetBlockGossip()) + assert.EqualValues(params.GetBlockGossip().GetBlockPartSizeBytes(), 54321) + assert.Nil(params.GetTxSize()) + assert.EqualValues(params.GetTxSize().GetMaxBytes(), 0) + +}