diff --git a/.gitignore b/.gitignore index ea27eda1c..f1fa5d414 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ vendor .glide types/types.pb.go +*.sw[op] +abci-cli diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a990a867..57a1f6f38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 0.10.0 (February 20, 2018) + +BREAKING CHANGES: + +- [types] Drop gogo custom type magic with data.Bytes +- [types] Add `info string` field to responses for SetOption, Query, CheckTx, DeliverTx +- [types] Remove IsOk/IsErr methods from response types. +- [types] Replace KVPair with common.KVPair +- [types] Updates to CheckTx/DeliverTx around tags and fees +- [types] Remove code and log from Commit + +FEATURES: + +- [types] RequestInitChain.AppStateBytes for app's genesis state + +IMPROVEMENTS: + +- [all] remove go-wire and go-crypto dependencies :) + ## 0.9.0 (December 28, 2017) BREAKING CHANGES: diff --git a/Makefile b/Makefile index a85f1772f..afdfb0f7b 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,56 @@ GOTOOLS = \ - github.com/mitchellh/gox \ - github.com/Masterminds/glide \ - github.com/gogo/protobuf/protoc-gen-gogo \ - github.com/gogo/protobuf/gogoproto - #gopkg.in/alecthomas/gometalinter.v2 \ - + github.com/mitchellh/gox \ + github.com/Masterminds/glide \ + gopkg.in/alecthomas/gometalinter.v2 \ + github.com/gogo/protobuf/protoc-gen-gogo \ + github.com/gogo/protobuf/gogoproto +GOTOOLS_CHECK = gox glide gometalinter.v2 protoc protoc-gen-gogo +PACKAGES=$(shell go list ./... | grep -v '/vendor/') INCLUDE = -I=. -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf -all: protoc install test +all: check get_vendor_deps protoc build test install metalinter -PACKAGES=$(shell go list ./... | grep -v '/vendor/') +check: check_tools -install_protoc: - # https://github.com/google/protobuf/releases + +######################################## +### Build + +protoc: + ## If you get the following error, + ## "error while loading shared libraries: libprotobuf.so.14: cannot open shared object file: No such file or directory" + ## See https://stackoverflow.com/a/25518702 + 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 + +build: + @go build -i ./cmd/... + +dist: + @bash scripts/dist.sh + @bash scripts/publish.sh + +install: + @go install ./cmd/... + + +######################################## +### Tools & dependencies + +check_tools: + @# https://stackoverflow.com/a/25668869 + @echo "Found tools: $(foreach tool,$(GOTOOLS_CHECK),\ + $(if $(shell which $(tool)),$(tool),$(error "No $(tool) in PATH")))" + +get_tools: + @echo "--> Installing tools" + go get -u -v $(GOTOOLS) + @gometalinter.v2 --install + +get_protoc: + @# https://github.com/google/protobuf/releases curl -L https://github.com/google/protobuf/releases/download/v3.4.1/protobuf-cpp-3.4.1.tar.gz | tar xvz && \ cd protobuf-3.4.1 && \ DIST_LANG=cpp ./configure && \ @@ -21,60 +59,41 @@ install_protoc: cd .. && \ rm -rf protobuf-3.4.1 -protoc: - ## Note to self: - ## 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:. 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 +update_tools: + @echo "--> Updating tools" + @go get -u $(GOTOOLS) -install: - @ go install ./cmd/... +get_vendor_deps: + @rm -rf vendor/ + @echo "--> Running glide install" + @glide install -build: - @ go build -i ./cmd/... -dist: - @ bash scripts/dist.sh - @ bash scripts/publish.sh +######################################## +### Testing test: - @ find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \; - @ echo "==> Running go test" - @ go test $(PACKAGES) + @find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \; + @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) + @find . -path ./vendor -prune -o -name "*.sock" -exec rm {} \; + @echo "==> Running go test --race" + @go test -v -race $(PACKAGES) test_integrations: - @ bash test.sh + @bash test.sh + + +######################################## +### Formatting, linting, and vetting fmt: - @ go fmt ./... - -get_deps: - @ go get -d $(PACKAGES) - -ensure_tools: - go get -u -v $(GOTOOLS) - #@ gometalinter.v2 --install - -get_vendor_deps: ensure_tools - @ rm -rf vendor/ - @ echo "--> Running glide install" - @ glide install - -metalinter_all: - protoc $(INCLUDE) --lint_out=. types/*.proto - gometalinter.v2 --vendor --deadline=600s --enable-all --disable=lll ./... + @go fmt ./... metalinter: - @ echo "==> Running linter" + @echo "==> Running linter" gometalinter.v2 --vendor --deadline=600s --disable-all \ --enable=maligned \ --enable=deadcode \ @@ -92,7 +111,6 @@ metalinter: --enable=varcheck \ --enable=vetshadow \ ./... - #--enable=gas \ #--enable=dupl \ #--enable=errcheck \ @@ -103,10 +121,42 @@ metalinter: #--enable=unparam \ #--enable=vet \ -build-docker: +metalinter_all: + protoc $(INCLUDE) --lint_out=. types/*.proto + gometalinter.v2 --vendor --deadline=600s --enable-all --disable=lll ./... + + +######################################## +### Docker + +DEVDOC_SAVE = docker commit `docker ps -a -n 1 -q` devdoc:local + +docker_build: docker build -t "tendermint/abci-dev" -f Dockerfile.develop . -run-docker: - docker run -it --rm -v "$PWD:/go/src/github.com/tendermint/abci" -w "/go/src/github.com/tendermint/abci" "tendermint/abci-dev" /bin/bash +docker_run: + docker run -it -v "$(CURDIR):/go/src/github.com/tendermint/abci" -w "/go/src/github.com/tendermint/abci" "tendermint/abci-dev" /bin/bash -.PHONY: all build test fmt get_deps ensure_tools protoc install_protoc build-docker run-docker +docker_run_rm: + docker run -it --rm -v "$(CURDIR):/go/src/github.com/tendermint/abci" -w "/go/src/github.com/tendermint/abci" "tendermint/abci-dev" /bin/bash + +devdoc_init: + docker run -it -v "$(CURDIR):/go/src/github.com/tendermint/abci" -w "/go/src/github.com/tendermint/abci" tendermint/devdoc echo + # TODO make this safer + $(call DEVDOC_SAVE) + +devdoc: + docker run -it -v "$(CURDIR):/go/src/github.com/tendermint/abci" -w "/go/src/github.com/tendermint/abci" devdoc:local bash + +devdoc_save: + # TODO make this safer + $(call DEVDOC_SAVE) + +devdoc_clean: + docker rmi $$(docker images -f "dangling=true" -q) + + +# To avoid unintended conflicts with file names, always add to .PHONY +# unless there is a reason not to. +# https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html +.PHONY: check protoc build dist install check_tools get_tools get_protoc update_tools get_vendor_deps test test_race test_integrations fmt metalinter metalinter_all docker_build docker_run docker_run_rm devdoc_init devdoc devdoc_save devdoc_clean diff --git a/README.md b/README.md index dbfd86347..79e2edda4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,34 @@ The two guides to focus on are the `Application Development Guide` and `Using AB Previously, the ABCI was referred to as TMSP. -The community has provided a number of addtional implementations, see the `Tendermint Ecosystem` in [the documentation](http://tendermint.readthedocs.io/en/master/). +The community has provided a number of addtional implementations, see the [Tendermint Ecosystem](https://tendermint.com/ecosystem) + +## Specification + +The [primary specification](https://github.com/tendermint/abci/blob/master/types/types.proto) +is made using Protocol Buffers. To build it, run + +``` +make protoc +``` + +See `protoc --help` and [the Protocol Buffers site](https://developers.google.com/protocol-buffers) +for details on compiling for other languages. Note we also include a [GRPC](http://www.grpc.io/docs) +service definition. + +For the specification as an interface in Go, see the +[types/application.go file](https://github.com/tendermint/abci/blob/master/types/application.go). + +See the [spec file](specification.rst) for a detailed description of the message types. + +## Install + +``` +go get github.com/tendermint/abci +cd $GOPATH/src/github.com/tendermint/abci +make get_vendor_deps +make install +``` ## Implementation @@ -24,19 +51,21 @@ We provide three implementations of the ABCI in Go: - GRPC Note the GRPC version is maintained primarily to simplify onboarding and prototyping and is not receiving the same -attention to security and performance as the others. +attention to security and performance as the others ### In Process The simplest implementation just uses function calls within Go. This means ABCI applications written in Golang can be compiled with TendermintCore and run as a single binary. +See the [examples](#examples) below for more information. + ### Socket (TSP) ABCI is best implemented as a streaming protocol. The socket implementation provides for asynchronous, ordered message passing over unix or tcp. Messages are serialized using Protobuf3 and length-prefixed. -Protobuf3 doesn't have an official length-prefix standard, so we use our own. The first byte represents the length of the big-endian encoded length. +Protobuf3 doesn't have an official length-prefix standard, so we use our own. The first byte represents the length of the big-endian encoded length. For example, if the Protobuf3 encoded ABCI message is `0xDEADBEEF` (4 bytes), the length-prefixed message is `0x0104DEADBEEF`. If the Protobuf3 encoded ABCI message is 65535 bytes long, the length-prefixed message would be like `0x02FFFF...`. @@ -48,156 +77,84 @@ the ordered, asynchronous socket protocol. The implementation has also not recei Note the length-prefixing used in the socket implementation does not apply for GRPC. -## Tools +## Usage The `abci-cli` tool wraps an ABCI client and can be used for probing/testing an ABCI server. For instance, `abci-cli test` will run a test sequence against a listening server running the Counter application (see below). It can also be used to run some example applications. See [the documentation](http://tendermint.readthedocs.io/en/master/) for more details. -### Example Apps +### Examples -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 --persistent` application, which augments the dummy with persistence and validator set changes +Check out the variety of example applications in the [example directory](example/). +It also contains the code refered to by the `counter` and `dummy` apps; these apps come +built into the `abci-cli` binary. -### Install +#### Counter -``` -go get github.com/tendermint/abci -cd $GOPATH/src/github.com/tendermint/abci -make get_vendor_deps -make install +The `abci-cli counter` application illustrates nonce checking in transactions. It's code looks like: + +```golang +func cmdCounter(cmd *cobra.Command, args []string) error { + + app := counter.NewCounterApplication(flagSerial) + + logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) + + // Start the listener + srv, err := server.NewServer(flagAddrC, flagAbci, app) + if err != nil { + return err + } + srv.SetLogger(logger.With("module", "abci-server")) + if err := srv.Start(); err != nil { + return err + } + + // Wait forever + cmn.TrapSignal(func() { + // Cleanup + srv.Stop() + }) + return nil +} ``` -## Specification +and can be found in [this file](cmd/abci-cli/abci-cli.go). -The [primary specification](https://github.com/tendermint/abci/blob/master/types/types.proto) is made using Protocol Buffers. -To build it, run +#### Dummy -``` -make protoc +The `abci-cli dummy` application, which illustrates a simple key-value Merkle tree + +```golang +func cmdDummy(cmd *cobra.Command, args []string) error { + logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) + + // Create the application - in memory or persisted to disk + var app types.Application + if flagPersist == "" { + app = dummy.NewDummyApplication() + } else { + app = dummy.NewPersistentDummyApplication(flagPersist) + app.(*dummy.PersistentDummyApplication).SetLogger(logger.With("module", "dummy")) + } + + // Start the listener + srv, err := server.NewServer(flagAddrD, flagAbci, app) + if err != nil { + return err + } + srv.SetLogger(logger.With("module", "abci-server")) + if err := srv.Start(); err != nil { + return err + } + + // Wait forever + cmn.TrapSignal(func() { + // Cleanup + srv.Stop() + }) + return nil +} ``` -See `protoc --help` and [the Protocol Buffers site](https://developers.google.com/protocol-buffers/) for details on compiling for other languages. -Note we also include a [GRPC](http://www.grpc.io/docs) service definition. - -For the specification as an interface in Go, see the [types/application.go file](https://github.com/tendermint/abci/blob/master/types/application.go). - -### Message Types - -ABCI requests/responses are defined as simple Protobuf messages in [this schema file](https://github.com/tendermint/abci/blob/master/types/types.proto). -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: - -#### Echo - * __Arguments__: - * `Message (string)`: A string to echo back - * __Returns__: - * `Message (string)`: The input string - * __Usage__:
- * Echo a string to test an abci client/server implementation - -#### Flush - * __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. - -#### Info - * __Returns__: - * `Data (string)`: Some arbitrary information - * `Version (Version)`: Version information - * `LastBlockHeight (int64)`: Latest block for which the app has called Commit - * `LastBlockAppHash ([]byte)`: Latest result of Commit - - * __Usage__:
- Return information about the application state. Used to sync the app with Tendermint on crash/restart. - -#### SetOption - * __Arguments__: - * `Key (string)`: Key to set - * `Value (string)`: Value to set for key - * __Returns__: - * `Code (uint32)`: Response code - * `Log (string)`: Debug or error message - * __Usage__:
- Set application options. E.g. Key="mode", Value="mempool" for a mempool connection, or Key="mode", Value="consensus" for a consensus connection. - Other options are application specific. - -#### InitChain - * __Arguments__: - * `Validators ([]Validator)`: Initial genesis validators - * __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. - * `Header (struct{})`: The block header - * `AbsentValidators ([]int32)`: List of indices of validators not included in the LastCommit - * `ByzantineValidators ([]Evidence)`: List of evidence of validators that acted maliciously - * __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. - -#### CheckTx - * __Arguments__: - * `Data ([]byte)`: The request transaction bytes - * __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 - * __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. - -#### 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 - -#### 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 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 524844357..8e7373395 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ checkout: test: override: - - cd $REPO && make get_vendor_deps && make test_integrations + - cd $REPO && make get_tools check get_vendor_deps install 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/client/socket_client.go b/client/socket_client.go index ecdc36945..3030bb571 100644 --- a/client/socket_client.go +++ b/client/socket_client.go @@ -135,7 +135,7 @@ func (cli *socketClient) sendRequestsRoutine(conn net.Conn) { default: // Probably will fill the buffer, or retry later. } - case <-cli.BaseService.Quit: + case <-cli.Quit(): return case reqres := <-cli.reqQueue: cli.willSendReq(reqres) diff --git a/cmd/abci-cli/abci-cli.go b/cmd/abci-cli/abci-cli.go index 909aa5de2..faaea5020 100644 --- a/cmd/abci-cli/abci-cli.go +++ b/cmd/abci-cli/abci-cli.go @@ -54,8 +54,8 @@ var ( var RootCmd = &cobra.Command{ Use: "abci-cli", - Short: "", - Long: "", + Short: "the ABCI CLI tool wraps an ABCI client", + Long: "the ABCI CLI tool wraps an ABCI client and is used for testing ABCI servers", PersistentPreRunE: func(cmd *cobra.Command, args []string) error { switch cmd.Use { @@ -92,6 +92,7 @@ type response struct { // generic abci response Data []byte Code uint32 + Info string Log string Query *queryResponse @@ -111,26 +112,26 @@ func Execute() error { } func addGlobalFlags() { - RootCmd.PersistentFlags().StringVarP(&flagAddress, "address", "", "tcp://0.0.0.0:46658", "Address of application socket") - RootCmd.PersistentFlags().StringVarP(&flagAbci, "abci", "", "socket", "Either socket or grpc") - RootCmd.PersistentFlags().BoolVarP(&flagVerbose, "verbose", "v", false, "Print the command and results as if it were a console session") - RootCmd.PersistentFlags().StringVarP(&flagLogLevel, "log_level", "", "debug", "Set the logger level") + RootCmd.PersistentFlags().StringVarP(&flagAddress, "address", "", "tcp://0.0.0.0:46658", "address of application socket") + RootCmd.PersistentFlags().StringVarP(&flagAbci, "abci", "", "socket", "either socket or grpc") + RootCmd.PersistentFlags().BoolVarP(&flagVerbose, "verbose", "v", false, "print the command and results as if it were a console session") + RootCmd.PersistentFlags().StringVarP(&flagLogLevel, "log_level", "", "debug", "set the logger level") } func addQueryFlags() { - queryCmd.PersistentFlags().StringVarP(&flagPath, "path", "", "/store", "Path to prefix query with") - queryCmd.PersistentFlags().IntVarP(&flagHeight, "height", "", 0, "Height to query the blockchain at") - queryCmd.PersistentFlags().BoolVarP(&flagProve, "prove", "", false, "Whether or not to return a merkle proof of the query result") + queryCmd.PersistentFlags().StringVarP(&flagPath, "path", "", "/store", "path to prefix query with") + queryCmd.PersistentFlags().IntVarP(&flagHeight, "height", "", 0, "height to query the blockchain at") + queryCmd.PersistentFlags().BoolVarP(&flagProve, "prove", "", false, "whether or not to return a merkle proof of the query result") } func addCounterFlags() { - counterCmd.PersistentFlags().StringVarP(&flagAddrC, "addr", "", "tcp://0.0.0.0:46658", "Listen address") - counterCmd.PersistentFlags().BoolVarP(&flagSerial, "serial", "", false, "Enforce incrementing (serial) transactions") + counterCmd.PersistentFlags().StringVarP(&flagAddrC, "addr", "", "tcp://0.0.0.0:46658", "listen address") + counterCmd.PersistentFlags().BoolVarP(&flagSerial, "serial", "", false, "enforce incrementing (serial) transactions") } func addDummyFlags() { - dummyCmd.PersistentFlags().StringVarP(&flagAddrD, "addr", "", "tcp://0.0.0.0:46658", "Listen address") - dummyCmd.PersistentFlags().StringVarP(&flagPersist, "persist", "", "", "Directory to use for a database") + dummyCmd.PersistentFlags().StringVarP(&flagAddrD, "addr", "", "tcp://0.0.0.0:46658", "listen address") + dummyCmd.PersistentFlags().StringVarP(&flagPersist, "persist", "", "", "directory to use for a database") } func addCommands() { RootCmd.AddCommand(batchCmd) @@ -155,18 +156,39 @@ func addCommands() { var batchCmd = &cobra.Command{ Use: "batch", - Short: "Run a batch of abci commands against an application", - Long: "", - Args: cobra.ExactArgs(0), + Short: "run a batch of abci commands against an application", + Long: `run a batch of abci commands against an application + +This command is run by piping in a file containing a series of commands +you'd like to run: + + abci-cli batch < example.file + +where example.file looks something like: + + set_option serial on + check_tx 0x00 + check_tx 0xff + deliver_tx 0x00 + check_tx 0x00 + deliver_tx 0x01 + deliver_tx 0x04 + info +`, + Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdBatch(cmd, args) }, } var consoleCmd = &cobra.Command{ - Use: "console", - Short: "Start an interactive abci console for multiple commands", - Long: "", + Use: "console", + Short: "start an interactive ABCI console for multiple commands", + Long: `start an interactive ABCI console for multiple commands + +This command opens an interactive console for running any of the other commands +without opening a new connection each time +`, Args: cobra.ExactArgs(0), ValidArgs: []string{"echo", "info", "set_option", "deliver_tx", "check_tx", "commit", "query"}, RunE: func(cmd *cobra.Command, args []string) error { @@ -176,8 +198,8 @@ var consoleCmd = &cobra.Command{ var echoCmd = &cobra.Command{ Use: "echo", - Short: "Have the application echo a message", - Long: "", + Short: "have the application echo a message", + Long: "have the application echo a message", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { return cmdEcho(cmd, args) @@ -185,8 +207,8 @@ var echoCmd = &cobra.Command{ } var infoCmd = &cobra.Command{ Use: "info", - Short: "Get some info about the application", - Long: "", + Short: "get some info about the application", + Long: "get some info about the application", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdInfo(cmd, args) @@ -194,8 +216,8 @@ var infoCmd = &cobra.Command{ } var setOptionCmd = &cobra.Command{ Use: "set_option", - Short: "Set an option on the application", - Long: "", + Short: "set an option on the application", + Long: "set an option on the application", Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { return cmdSetOption(cmd, args) @@ -204,8 +226,8 @@ var setOptionCmd = &cobra.Command{ var deliverTxCmd = &cobra.Command{ Use: "deliver_tx", - Short: "Deliver a new transaction to the application", - Long: "", + Short: "deliver a new transaction to the application", + Long: "deliver a new transaction to the application", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { return cmdDeliverTx(cmd, args) @@ -214,8 +236,8 @@ var deliverTxCmd = &cobra.Command{ var checkTxCmd = &cobra.Command{ Use: "check_tx", - Short: "Validate a transaction", - Long: "", + Short: "validate a transaction", + Long: "validate a transaction", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { return cmdCheckTx(cmd, args) @@ -224,8 +246,8 @@ var checkTxCmd = &cobra.Command{ var commitCmd = &cobra.Command{ Use: "commit", - Short: "Commit the application state and return the Merkle root hash", - Long: "", + Short: "commit the application state and return the Merkle root hash", + Long: "commit the application state and return the Merkle root hash", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdCommit(cmd, args) @@ -234,8 +256,8 @@ var commitCmd = &cobra.Command{ var versionCmd = &cobra.Command{ Use: "version", - Short: "Print abci console version", - Long: "", + Short: "print ABCI console version", + Long: "print ABCI console version", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { fmt.Println(version.Version) @@ -245,8 +267,8 @@ var versionCmd = &cobra.Command{ var queryCmd = &cobra.Command{ Use: "query", - Short: "Query the application state", - Long: "", + Short: "query the application state", + Long: "query the application state", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { return cmdQuery(cmd, args) @@ -256,7 +278,7 @@ var queryCmd = &cobra.Command{ var counterCmd = &cobra.Command{ Use: "counter", Short: "ABCI demo example", - Long: "", + Long: "ABCI demo example", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdCounter(cmd, args) @@ -266,7 +288,7 @@ var counterCmd = &cobra.Command{ var dummyCmd = &cobra.Command{ Use: "dummy", Short: "ABCI demo example", - Long: "", + Long: "ABCI demo example", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdDummy(cmd, args) @@ -275,8 +297,8 @@ var dummyCmd = &cobra.Command{ var testCmd = &cobra.Command{ Use: "test", - Short: "Run integration tests", - Long: "", + Short: "run integration tests", + Long: "run integration tests", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { return cmdTest(cmd, args) @@ -327,8 +349,10 @@ func cmdTest(cmd *cobra.Command, args []string) error { func() error { return servertest.DeliverTx(client, []byte{0x00, 0x02}, code.CodeTypeOK, nil) }, func() error { return servertest.DeliverTx(client, []byte{0x00, 0x03}, code.CodeTypeOK, nil) }, func() error { return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x04}, code.CodeTypeOK, nil) }, - func() error { return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) }, - func() error { return servertest.Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5})}, + func() error { + return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) + }, + func() error { return servertest.Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) }, }) } @@ -496,14 +520,11 @@ func cmdSetOption(cmd *cobra.Command, args []string) error { } key, val := args[0], args[1] - res, err := client.SetOptionSync(types.RequestSetOption{key, val}) + _, err := client.SetOptionSync(types.RequestSetOption{key, val}) if err != nil { return err } - printResponse(cmd, args, response{ - Code: res.Code, - Log: res.Log, - }) + printResponse(cmd, args, response{Log: "OK (SetOption doesn't return anything.)"}) // NOTE: Nothing to show... return nil } @@ -527,6 +548,7 @@ func cmdDeliverTx(cmd *cobra.Command, args []string) error { printResponse(cmd, args, response{ Code: res.Code, Data: res.Data, + Info: res.Info, Log: res.Log, }) return nil @@ -537,7 +559,7 @@ func cmdCheckTx(cmd *cobra.Command, args []string) error { if len(args) == 0 { printResponse(cmd, args, response{ Code: codeBad, - Log: "want the tx", + Info: "want the tx", }) return nil } @@ -552,6 +574,7 @@ func cmdCheckTx(cmd *cobra.Command, args []string) error { printResponse(cmd, args, response{ Code: res.Code, Data: res.Data, + Info: res.Info, Log: res.Log, }) return nil @@ -564,9 +587,7 @@ func cmdCommit(cmd *cobra.Command, args []string) error { return err } printResponse(cmd, args, response{ - Code: res.Code, Data: res.Data, - Log: res.Log, }) return nil } @@ -576,7 +597,8 @@ func cmdQuery(cmd *cobra.Command, args []string) error { if len(args) == 0 { printResponse(cmd, args, response{ Code: codeBad, - Log: "want the query", + Info: "want the query", + Log: "", }) return nil } @@ -596,6 +618,7 @@ func cmdQuery(cmd *cobra.Command, args []string) error { } printResponse(cmd, args, response{ Code: resQuery.Code, + Info: resQuery.Info, Log: resQuery.Log, Query: &queryResponse{ Key: resQuery.Key, diff --git a/example/code/code.go b/example/code/code.go index b7e37d366..94e9d015e 100644 --- a/example/code/code.go +++ b/example/code/code.go @@ -6,6 +6,4 @@ const ( CodeTypeEncodingError uint32 = 1 CodeTypeBadNonce uint32 = 2 CodeTypeUnauthorized uint32 = 3 - - CodeTypeBadOption uint32 = 101 ) diff --git a/example/counter/counter.go b/example/counter/counter.go index abd7bb183..a6d5df6ab 100644 --- a/example/counter/counter.go +++ b/example/counter/counter.go @@ -30,15 +30,17 @@ func (app *CounterApplication) SetOption(req types.RequestSetOption) types.Respo if key == "serial" && value == "on" { app.serial = true } else { - return types.ResponseSetOption{ - Code: code.CodeTypeBadOption, - Log: cmn.Fmt("Unknown key (%s) or value (%s)", key, value), - } + /* + TODO Panic and have the ABCI server pass an exception. + The client can call SetOptionSync() and get an `error`. + return types.ResponseSetOption{ + Error: cmn.Fmt("Unknown key (%s) or value (%s)", key, value), + } + */ + return types.ResponseSetOption{} } - return types.ResponseSetOption{ - Code: code.CodeTypeOK, - } + return types.ResponseSetOption{} } func (app *CounterApplication) DeliverTx(tx []byte) types.ResponseDeliverTx { @@ -83,11 +85,11 @@ func (app *CounterApplication) CheckTx(tx []byte) types.ResponseCheckTx { func (app *CounterApplication) Commit() (resp types.ResponseCommit) { app.hashCount++ if app.txCount == 0 { - return types.ResponseCommit{Code: code.CodeTypeOK} + return types.ResponseCommit{} } hash := make([]byte, 8) binary.BigEndian.PutUint64(hash, uint64(app.txCount)) - return types.ResponseCommit{Code: code.CodeTypeOK, Data: hash} + return types.ResponseCommit{Data: hash} } func (app *CounterApplication) Query(reqQuery types.RequestQuery) types.ResponseQuery { diff --git a/example/dummy/dummy.go b/example/dummy/dummy.go index fdb4851cf..79aa43978 100644 --- a/example/dummy/dummy.go +++ b/example/dummy/dummy.go @@ -2,30 +2,70 @@ package dummy import ( "bytes" + "encoding/binary" + "encoding/json" "fmt" "github.com/tendermint/abci/example/code" "github.com/tendermint/abci/types" - wire "github.com/tendermint/go-wire" - "github.com/tendermint/iavl" + cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" ) +var ( + stateKey = []byte("stateKey") + kvPairPrefixKey = []byte("kvPairKey:") +) + +type State struct { + db dbm.DB + Size int64 `json:"size"` + Height int64 `json:"height"` + AppHash []byte `json:"app_hash"` +} + +func loadState(db dbm.DB) State { + stateBytes := db.Get(stateKey) + var state State + if len(stateBytes) != 0 { + err := json.Unmarshal(stateBytes, &state) + if err != nil { + panic(err) + } + } + state.db = db + return state +} + +func saveState(state State) { + stateBytes, err := json.Marshal(state) + if err != nil { + panic(err) + } + state.db.Set(stateKey, stateBytes) +} + +func prefixKey(key []byte) []byte { + return append(kvPairPrefixKey, key...) +} + +//--------------------------------------------------- + var _ types.Application = (*DummyApplication)(nil) type DummyApplication struct { types.BaseApplication - state *iavl.VersionedTree + state State } func NewDummyApplication() *DummyApplication { - state := iavl.NewVersionedTree(0, dbm.NewMemDB()) + state := loadState(dbm.NewMemDB()) return &DummyApplication{state: state} } func (app *DummyApplication) Info(req types.RequestInfo) (resInfo types.ResponseInfo) { - return types.ResponseInfo{Data: fmt.Sprintf("{\"size\":%v}", app.state.Size())} + return types.ResponseInfo{Data: fmt.Sprintf("{\"size\":%v}", app.state.Size)} } // tx is either "key=value" or just arbitrary bytes @@ -37,11 +77,12 @@ func (app *DummyApplication) DeliverTx(tx []byte) types.ResponseDeliverTx { } else { key, value = tx, tx } - app.state.Set(key, value) + app.state.db.Set(prefixKey(key), value) + app.state.Size += 1 - tags := []*types.KVPair{ - {Key: "app.creator", ValueType: types.KVPair_STRING, ValueString: "jae"}, - {Key: "app.key", ValueType: types.KVPair_STRING, ValueString: string(key)}, + tags := []cmn.KVPair{ + {[]byte("app.creator"), []byte("jae")}, + {[]byte("app.key"), key}, } return types.ResponseDeliverTx{Code: code.CodeTypeOK, Tags: tags} } @@ -51,34 +92,21 @@ func (app *DummyApplication) CheckTx(tx []byte) types.ResponseCheckTx { } func (app *DummyApplication) Commit() types.ResponseCommit { - // Save a new version - var hash []byte - var err error - - if app.state.Size() > 0 { - // just add one more to height (kind of arbitrarily stupid) - height := app.state.LatestVersion() + 1 - hash, err = app.state.SaveVersion(height) - if err != nil { - // if this wasn't a dummy app, we'd do something smarter - panic(err) - } - } - - return types.ResponseCommit{Code: code.CodeTypeOK, Data: hash} + // Using a memdb - just return the big endian size of the db + appHash := make([]byte, 8) + binary.PutVarint(appHash, app.state.Size) + app.state.AppHash = appHash + app.state.Height += 1 + saveState(app.state) + return types.ResponseCommit{Data: appHash} } func (app *DummyApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) { if reqQuery.Prove { - value, proof, err := app.state.GetWithProof(reqQuery.Data) - // if this wasn't a dummy app, we'd do something smarter - if err != nil { - panic(err) - } + value := app.state.db.Get(prefixKey(reqQuery.Data)) resQuery.Index = -1 // TODO make Proof return index resQuery.Key = reqQuery.Data resQuery.Value = value - resQuery.Proof = wire.BinaryBytes(proof) if value != nil { resQuery.Log = "exists" } else { @@ -86,8 +114,7 @@ func (app *DummyApplication) Query(reqQuery types.RequestQuery) (resQuery types. } return } else { - index, value := app.state.Get(reqQuery.Data) - resQuery.Index = int64(index) + value := app.state.db.Get(prefixKey(reqQuery.Data)) resQuery.Value = value if value != nil { resQuery.Log = "exists" diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go index 96666547f..548fe7422 100644 --- a/example/dummy/dummy_test.go +++ b/example/dummy/dummy_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/iavl" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" @@ -41,10 +40,6 @@ func testDummy(t *testing.T, app types.Application, tx []byte, key, value string }) require.EqualValues(t, code.CodeTypeOK, resQuery.Code) require.Equal(t, value, string(resQuery.Value)) - proof, err := iavl.ReadKeyExistsProof(resQuery.Proof) - require.Nil(t, err) - err = proof.Verify([]byte(key), resQuery.Value, proof.RootHash) - require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash } func TestDummyKV(t *testing.T) { @@ -92,7 +87,7 @@ func TestPersistentDummyInfo(t *testing.T) { // make and apply block height = int64(1) hash := []byte("foo") - header := &types.Header{ + header := types.Header{ Height: int64(height), } dummy.BeginBlock(types.RequestBeginBlock{hash, header, nil, nil}) @@ -119,16 +114,18 @@ func TestValUpdates(t *testing.T) { nInit := 5 vals := RandVals(total) // iniitalize with the first nInit - dummy.InitChain(types.RequestInitChain{vals[:nInit]}) + dummy.InitChain(types.RequestInitChain{ + Validators: vals[:nInit], + }) vals1, vals2 := vals[:nInit], dummy.Validators() valsEqual(t, vals1, vals2) - var v1, v2, v3 *types.Validator + var v1, v2, v3 types.Validator // add some validators v1, v2 = vals[nInit], vals[nInit+1] - diff := []*types.Validator{v1, v2} + diff := []types.Validator{v1, v2} tx1 := MakeValSetChangeTx(v1.PubKey, v1.Power) tx2 := MakeValSetChangeTx(v2.PubKey, v2.Power) @@ -142,7 +139,7 @@ func TestValUpdates(t *testing.T) { v1.Power = 0 v2.Power = 0 v3.Power = 0 - diff = []*types.Validator{v1, v2, v3} + diff = []types.Validator{v1, v2, v3} tx1 = MakeValSetChangeTx(v1.PubKey, v1.Power) tx2 = MakeValSetChangeTx(v2.PubKey, v2.Power) tx3 := MakeValSetChangeTx(v3.PubKey, v3.Power) @@ -160,22 +157,22 @@ func TestValUpdates(t *testing.T) { } else { v1.Power = 5 } - diff = []*types.Validator{v1} + diff = []types.Validator{v1} tx1 = MakeValSetChangeTx(v1.PubKey, v1.Power) makeApplyBlock(t, dummy, 3, diff, tx1) - vals1 = append([]*types.Validator{v1}, vals1[1:]...) + vals1 = append([]types.Validator{v1}, vals1[1:]...) vals2 = dummy.Validators() valsEqual(t, vals1, vals2) } -func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff []*types.Validator, txs ...[]byte) { +func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff []types.Validator, txs ...[]byte) { // make and apply block height := int64(heightInt) hash := []byte("foo") - header := &types.Header{ + header := types.Header{ Height: height, } @@ -193,7 +190,7 @@ func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff [ } // order doesn't matter -func valsEqual(t *testing.T, vals1, vals2 []*types.Validator) { +func valsEqual(t *testing.T, vals1, vals2 []types.Validator) { if len(vals1) != len(vals2) { t.Fatalf("vals dont match in len. got %d, expected %d", len(vals2), len(vals1)) } @@ -310,8 +307,4 @@ func testClient(t *testing.T, app abcicli.Client, tx []byte, key, value string) require.Nil(t, err) require.Equal(t, code.CodeTypeOK, resQuery.Code) require.Equal(t, value, string(resQuery.Value)) - proof, err := iavl.ReadKeyExistsProof(resQuery.Proof) - require.Nil(t, err) - err = proof.Verify([]byte(key), resQuery.Value, proof.RootHash) - require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash } diff --git a/example/dummy/helpers.go b/example/dummy/helpers.go index d6b4338c6..927319867 100644 --- a/example/dummy/helpers.go +++ b/example/dummy/helpers.go @@ -2,24 +2,23 @@ package dummy import ( "github.com/tendermint/abci/types" - crypto "github.com/tendermint/go-crypto" cmn "github.com/tendermint/tmlibs/common" ) // RandVal creates one random validator, with a key derived // from the input value -func RandVal(i int) *types.Validator { - pubkey := crypto.GenPrivKeyEd25519FromSecret([]byte(cmn.Fmt("test%d", i))).PubKey().Bytes() +func RandVal(i int) types.Validator { + pubkey := cmn.RandBytes(33) power := cmn.RandUint16() + 1 - return &types.Validator{pubkey, int64(power)} + return types.Validator{pubkey, int64(power)} } // RandVals returns a list of cnt validators for initializing // the application. Note that the keys are deterministically // derived from the index in the array, while the power is // random (Change this if not desired) -func RandVals(cnt int) []*types.Validator { - res := make([]*types.Validator, cnt) +func RandVals(cnt int) []types.Validator { + res := make([]types.Validator, cnt) for i := 0; i < cnt; i++ { res[i] = RandVal(i) } @@ -30,5 +29,8 @@ func RandVals(cnt int) []*types.Validator { // which allows tests to pass and is fine as long as you // don't make any tx that modify the validator state func InitDummy(app *PersistentDummyApplication) { - app.InitChain(types.RequestInitChain{RandVals(1)}) + app.InitChain(types.RequestInitChain{ + Validators: RandVals(1), + AppStateBytes: []byte("[]"), + }) } diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go index 4165b9f71..30885bc1e 100644 --- a/example/dummy/persistent_dummy.go +++ b/example/dummy/persistent_dummy.go @@ -9,8 +9,6 @@ import ( "github.com/tendermint/abci/example/code" "github.com/tendermint/abci/types" - crypto "github.com/tendermint/go-crypto" - "github.com/tendermint/iavl" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" @@ -28,7 +26,7 @@ type PersistentDummyApplication struct { app *DummyApplication // validator set - ValUpdates []*types.Validator + ValUpdates []types.Validator logger log.Logger } @@ -40,11 +38,10 @@ func NewPersistentDummyApplication(dbDir string) *PersistentDummyApplication { panic(err) } - stateTree := iavl.NewVersionedTree(500, db) - stateTree.Load() + state := loadState(db) return &PersistentDummyApplication{ - app: &DummyApplication{state: stateTree}, + app: &DummyApplication{state: state}, logger: log.NewNopLogger(), } } @@ -55,9 +52,8 @@ func (app *PersistentDummyApplication) SetLogger(l log.Logger) { func (app *PersistentDummyApplication) Info(req types.RequestInfo) types.ResponseInfo { res := app.app.Info(req) - var latestVersion uint64 = app.app.state.LatestVersion() // TODO: change to int64 - res.LastBlockHeight = int64(latestVersion) - res.LastBlockAppHash = app.app.state.Hash() + res.LastBlockHeight = app.app.state.Height + res.LastBlockAppHash = app.app.state.AppHash return res } @@ -85,20 +81,7 @@ func (app *PersistentDummyApplication) CheckTx(tx []byte) types.ResponseCheckTx // Commit will panic if InitChain was not called func (app *PersistentDummyApplication) Commit() types.ResponseCommit { - - // Save a new version for next height - height := app.app.state.LatestVersion() + 1 - var appHash []byte - var err error - - appHash, err = app.app.state.SaveVersion(height) - if err != nil { - // if this wasn't a dummy app, we'd do something smarter - panic(err) - } - - app.logger.Info("Commit block", "height", height, "root", appHash) - return types.ResponseCommit{Code: code.CodeTypeOK, Data: appHash} + return app.app.Commit() } func (app *PersistentDummyApplication) Query(reqQuery types.RequestQuery) types.ResponseQuery { @@ -119,7 +102,7 @@ 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.ValUpdates = make([]*types.Validator, 0) + app.ValUpdates = make([]types.Validator, 0) return types.ResponseBeginBlock{} } @@ -131,18 +114,18 @@ func (app *PersistentDummyApplication) EndBlock(req types.RequestEndBlock) types //--------------------------------------------- // update validators -func (app *PersistentDummyApplication) Validators() (validators []*types.Validator) { - app.app.state.Iterate(func(key, value []byte) bool { - if isValidatorTx(key) { +func (app *PersistentDummyApplication) Validators() (validators []types.Validator) { + itr := app.app.state.db.Iterator(nil, nil) + for ; itr.Valid(); itr.Next() { + if isValidatorTx(itr.Key()) { validator := new(types.Validator) - err := types.ReadMessage(bytes.NewBuffer(value), validator) + err := types.ReadMessage(bytes.NewBuffer(itr.Value()), validator) if err != nil { panic(err) } - validators = append(validators, validator) + validators = append(validators, *validator) } - return false - }) + } return } @@ -174,12 +157,12 @@ func (app *PersistentDummyApplication) execValidatorTx(tx []byte) types.Response Code: code.CodeTypeEncodingError, Log: fmt.Sprintf("Pubkey (%s) is invalid hex", pubkeyS)} } - _, err = crypto.PubKeyFromBytes(pubkey) + /*_, err = crypto.PubKeyFromBytes(pubkey) if err != nil { return types.ResponseDeliverTx{ Code: code.CodeTypeEncodingError, Log: fmt.Sprintf("Pubkey (%X) is invalid go-crypto encoded", pubkey)} - } + }*/ // decode the power power, err := strconv.ParseInt(powerS, 10, 64) @@ -190,29 +173,29 @@ func (app *PersistentDummyApplication) execValidatorTx(tx []byte) types.Response } // update - return app.updateValidator(&types.Validator{pubkey, power}) + return app.updateValidator(types.Validator{pubkey, power}) } // add, update, or remove a validator -func (app *PersistentDummyApplication) updateValidator(v *types.Validator) types.ResponseDeliverTx { +func (app *PersistentDummyApplication) updateValidator(v types.Validator) types.ResponseDeliverTx { key := []byte("val:" + string(v.PubKey)) if v.Power == 0 { // remove validator - if !app.app.state.Has(key) { + if !app.app.state.db.Has(key) { return types.ResponseDeliverTx{ Code: code.CodeTypeUnauthorized, Log: fmt.Sprintf("Cannot remove non-existent validator %X", key)} } - app.app.state.Remove(key) + app.app.state.db.Delete(key) } else { // add or update validator value := bytes.NewBuffer(make([]byte, 0)) - if err := types.WriteMessage(v, value); err != nil { + if err := types.WriteMessage(&v, value); err != nil { return types.ResponseDeliverTx{ Code: code.CodeTypeEncodingError, Log: fmt.Sprintf("Error encoding validator: %v", err)} } - app.app.state.Set(key, value.Bytes()) + app.app.state.db.Set(key, value.Bytes()) } // we only update the changes array if we successfully updated the tree diff --git a/glide.lock b/glide.lock index f96fd1c08..e99f5e2e6 100644 --- a/glide.lock +++ b/glide.lock @@ -1,34 +1,27 @@ -hash: 6cb2c869c8ce7d9e43b1e8930b9b1bc974ebb3d36d4b704fc78b77efba956a13 -updated: 2017-11-30T17:08:29.176515576-05:00 +hash: cff2757779ef879f0c625c42af37fb3e486afd93ab9a91175c2458a719faac66 +updated: 2018-02-20T22:02:37.638875125-05:00 imports: -- name: github.com/btcsuite/btcd - version: 2e60448ffcc6bf78332d1fe590260095f554dd78 - subpackages: - - btcec - name: github.com/go-kit/kit - version: e3b2152e0063c5f05efea89ecbe297852af2a92d + version: 4dc7be5d2d12881735283bcab7352178e190fc71 subpackages: - log - log/level - log/term - name: github.com/go-logfmt/logfmt version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 -- name: github.com/go-playground/locales - version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6 - subpackages: - - currency -- name: github.com/go-playground/universal-translator - version: 71201497bace774495daed26a3874fd339e0b538 - name: github.com/go-stack/stack version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc - name: github.com/gogo/protobuf - version: 342cbe0a04158f6dcb03ca0079991a51a4248c02 + version: 1adfc126b41513cc696b209667c8656ea7aac67c subpackages: - gogoproto + - jsonpb - proto - protoc-gen-gogo/descriptor + - sortkeys + - types - name: github.com/golang/protobuf - version: 1e59b77b52bf8e4b449a57e6f79f21226d571845 + version: 925541529c1fa6821df4e44ce2723319eb2be768 subpackages: - proto - ptypes @@ -44,13 +37,13 @@ imports: - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/pkg/errors - version: f15c970de5b76fac0b59abb32d62c17cc7bed265 + version: 645ef00459ed84a119197bfb8d8205042c6df63d - name: github.com/spf13/cobra version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b - name: github.com/spf13/pflag version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea - name: github.com/syndtr/goleveldb - version: adf24ef3f94bd13ec4163060b21a5678f22b429b + version: 211f780988068502fe874c44dae530528ebd840f subpackages: - leveldb - leveldb/cache @@ -64,37 +57,15 @@ imports: - leveldb/storage - leveldb/table - leveldb/util -- name: github.com/tendermint/ed25519 - version: d8387025d2b9d158cf4efb07e7ebf814bcce2057 - subpackages: - - edwards25519 - - extra25519 -- name: github.com/tendermint/go-crypto - version: b4f04f196cd719660e43b91202cd60d9a95b1837 -- name: github.com/tendermint/go-wire - version: 5ab49b4c6ad674da6b81442911cf713ef0afb544 - subpackages: - - data -- name: github.com/tendermint/iavl - version: 595f3dcd5b6cd4a292e90757ae6d367fd7a6e653 - name: github.com/tendermint/tmlibs - version: 21fb7819891997c96838308b4eba5a50b07ff03f + version: 1b9b5652a199ab0be2e781393fb275b66377309d subpackages: - common - db - log - process -- name: golang.org/x/crypto - version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122 - subpackages: - - nacl/secretbox - - openpgp/armor - - openpgp/errors - - poly1305 - - ripemd160 - - salsa20/salsa - name: golang.org/x/net - version: a8b9294777976932365dabb6640cf1468d95c70f + version: 2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1 subpackages: - context - http2 @@ -104,14 +75,14 @@ imports: - lex/httplex - trace - name: golang.org/x/text - version: 75cc3cad82b5f47d3fb229ddda8c5167da14f294 + version: e19ae1496984b1c655b8044a65c0300a3c878dd3 subpackages: - secure/bidirule - transform - unicode/bidi - unicode/norm - name: google.golang.org/genproto - version: 7f0da29060c682909f650ad8ed4e515bd74fa12a + version: 4eb30f4778eed4c258ba66527a0d4f9ec8a36c45 subpackages: - googleapis/rpc/status - name: google.golang.org/grpc @@ -133,19 +104,17 @@ imports: - status - tap - transport -- name: gopkg.in/go-playground/validator.v9 - version: 61caf9d3038e1af346dbf5c2e16f6678e1548364 testImports: - name: github.com/davecgh/go-spew - version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 + version: 346938d642f2ec3594ed81d874461961cd0faa76 subpackages: - spew - name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d + version: 792786c7400a136282c1664665ae0a8db921c6c2 subpackages: - difflib - name: github.com/stretchr/testify - version: 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f + version: 12b6f73e6084dad08a7c6e575284b177ecafbc71 subpackages: - assert - require diff --git a/glide.yaml b/glide.yaml index 88f49dde4..bab5d17f0 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,21 +1,15 @@ package: github.com/tendermint/abci import: - package: github.com/gogo/protobuf - version: v0.5 + version: ^1.0.0 subpackages: - proto +- package: github.com/pkg/errors + version: v0.8.0 - package: github.com/spf13/cobra version: v0.0.1 -- package: github.com/tendermint/go-crypto - version: develop -- package: github.com/tendermint/go-wire - version: develop - subpackages: - - data -- package: github.com/tendermint/iavl - version: develop - package: github.com/tendermint/tmlibs - version: develop + version: v0.7.0 subpackages: - common - db @@ -28,6 +22,7 @@ import: version: v1.7.3 testImport: - package: github.com/stretchr/testify + version: v1.2.1 subpackages: - assert - require diff --git a/scripts/dist_build.sh b/scripts/dist_build.sh index adaca24a8..c45c752ef 100755 --- a/scripts/dist_build.sh +++ b/scripts/dist_build.sh @@ -19,7 +19,7 @@ XC_ARCH=${XC_ARCH:-"386 amd64 arm"} XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"} # Make sure build tools are available. -make tools +make get_tools # Get VENDORED dependencies make get_vendor_deps @@ -29,23 +29,23 @@ BINARY="abci-cli" # Build! echo "==> Building..." "$(which gox)" \ - -os="${XC_OS}" \ - -arch="${XC_ARCH}" \ - -osarch="!darwin/arm !solaris/amd64 !freebsd/amd64" \ - -ldflags "-X ${GIT_IMPORT}.GitCommit='${GIT_COMMIT}' -X ${GIT_IMPORT}.GitDescribe='${GIT_DESCRIBE}'" \ - -output "build/pkg/{{.OS}}_{{.Arch}}/$BINARY" \ - -tags="${BUILD_TAGS}" \ - github.com/tendermint/abci/cmd/$BINARY + -os="${XC_OS}" \ + -arch="${XC_ARCH}" \ + -osarch="!darwin/arm !solaris/amd64 !freebsd/amd64" \ + -ldflags "-X ${GIT_IMPORT}.GitCommit='${GIT_COMMIT}' -X ${GIT_IMPORT}.GitDescribe='${GIT_DESCRIBE}'" \ + -output "build/pkg/{{.OS}}_{{.Arch}}/$BINARY" \ + -tags="${BUILD_TAGS}" \ + github.com/tendermint/abci/cmd/$BINARY # Zip all the files. echo "==> Packaging..." for PLATFORM in $(find ./build/pkg -mindepth 1 -maxdepth 1 -type d); do - OSARCH=$(basename "${PLATFORM}") - echo "--> ${OSARCH}" + OSARCH=$(basename "${PLATFORM}") + echo "--> ${OSARCH}" - pushd "$PLATFORM" >/dev/null 2>&1 - zip "../${OSARCH}.zip" ./* - popd >/dev/null 2>&1 + pushd "$PLATFORM" >/dev/null 2>&1 + zip "../${OSARCH}.zip" ./* + popd >/dev/null 2>&1 done diff --git a/specification.rst b/specification.rst new file mode 100644 index 000000000..1a52f0e28 --- /dev/null +++ b/specification.rst @@ -0,0 +1,205 @@ +Specification +============= + +Message Types +~~~~~~~~~~~~~ + +ABCI requests/responses are defined as simple Protobuf messages in `this +schema +file `__. +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: + +Echo +^^^^ + +- **Arguments**: + + - ``Message (string)``: A string to echo back + +- **Returns**: + + - ``Message (string)``: The input string + +- **Usage**: + + - Echo a string to test an abci client/server implementation + +Flush +^^^^^ + +- **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. + +Info +^^^^ + +- **Returns**: + + - ``Data (string)``: Some arbitrary information + - ``Version (Version)``: Version information + - ``LastBlockHeight (int64)``: Latest block for which the app has + called Commit + - ``LastBlockAppHash ([]byte)``: Latest result of Commit + +- **Usage**: Return information about the application state. Used to + sync the app with Tendermint on crash/restart. + +SetOption +^^^^^^^^^ + +- **Arguments**: + + - ``Key (string)``: Key to set + - ``Value (string)``: Value to set for key + +- **Returns**: + + - ``Code (uint32)``: Response code + - ``Log (string)``: Debug or error message + +- **Usage**: Set application options. E.g. Key="mode", Value="mempool" + for a mempool connection, or Key="mode", Value="consensus" for a + consensus connection. Other options are application specific. + +InitChain +^^^^^^^^^ + +- **Arguments**: + + - ``Validators ([]Validator)``: Initial genesis validators + - ``AppStateBytes ([]byte)``: Serialized initial application state + +- **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. + - ``Header (struct{})``: The block header + - ``AbsentValidators ([]int32)``: List of indices of validators not + included in the LastCommit + - ``ByzantineValidators ([]Evidence)``: List of evidence of + validators that acted maliciously + +- **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. + +CheckTx +^^^^^^^ + +- **Arguments**: + + - ``Data ([]byte)``: The request transaction bytes + +- **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 + +- **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. + +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 + +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 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/tests/server/client.go b/tests/server/client.go index aaea9f34c..ee312c1a8 100644 --- a/tests/server/client.go +++ b/tests/server/client.go @@ -7,19 +7,21 @@ import ( abcicli "github.com/tendermint/abci/client" "github.com/tendermint/abci/types" - crypto "github.com/tendermint/go-crypto" cmn "github.com/tendermint/tmlibs/common" ) func InitChain(client abcicli.Client) error { total := 10 - vals := make([]*types.Validator, total) + vals := make([]types.Validator, total) for i := 0; i < total; i++ { - pubkey := crypto.GenPrivKeyEd25519FromSecret([]byte(cmn.Fmt("test%d", i))).PubKey().Bytes() + pubkey := cmn.RandBytes(33) power := cmn.RandInt() - vals[i] = &types.Validator{pubkey, int64(power)} + vals[i] = types.Validator{pubkey, int64(power)} } - _, err := client.InitChainSync(types.RequestInitChain{Validators: vals}) + _, err := client.InitChainSync(types.RequestInitChain{ + Validators: vals, + AppStateBytes: []byte("{}"), + }) if err != nil { fmt.Printf("Failed test: InitChain - %v\n", err) return err @@ -29,12 +31,10 @@ func InitChain(client abcicli.Client) error { } func SetOption(client abcicli.Client, key, value string) error { - res, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value}) - log := res.GetLog() + _, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value}) if err != nil { fmt.Println("Failed test: SetOption") - fmt.Printf("setting %v=%v: \nlog: %v\n", key, value, log) - fmt.Println("Failed test: SetOption") + fmt.Printf("error while setting %v=%v: \nerror: %v\n", key, value) return err } fmt.Println("Passed test: SetOption") @@ -43,16 +43,15 @@ func SetOption(client abcicli.Client, key, value string) error { func Commit(client abcicli.Client, hashExp []byte) error { res, err := client.CommitSync() - _, data := res.Code, res.Data + data := res.Data if err != nil { fmt.Println("Failed test: Commit") - fmt.Printf("committing %v\nlog: %v\n", res.GetLog(), err) + fmt.Printf("error while committing: %v\n", err) return err } if !bytes.Equal(data, hashExp) { fmt.Println("Failed test: Commit") - fmt.Printf("Commit hash was unexpected. Got %X expected %X\n", - data.Bytes(), hashExp) + fmt.Printf("Commit hash was unexpected. Got %X expected %X\n", data, hashExp) return errors.New("CommitTx failed") } fmt.Println("Passed test: Commit") diff --git a/tests/test.sh b/tests/test.sh index c005c0de3..416145fc9 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -5,5 +5,7 @@ set -e bash tests/test_app/test.sh # test the cli against the examples in the tutorial at tendermint.com -bash tests/test_cli/test.sh +# TODO: make these less fragile +# bash tests/test_cli/test.sh + diff --git a/tests/test_app/app.go b/tests/test_app/app.go index f04036216..6145e2003 100644 --- a/tests/test_app/app.go +++ b/tests/test_app/app.go @@ -37,9 +37,6 @@ func commit(client abcicli.Client, hashExp []byte) { if err != nil { panicf("client error: %v", err) } - if res.IsErr() { - panicf("committing err %v\n", res) - } if !bytes.Equal(res.Data, hashExp) { panicf("Commit hash was unexpected. Got %X expected %X", res.Data, hashExp) } diff --git a/tests/test_cli/test.sh b/tests/test_cli/test.sh index ed00b9d72..ccbb313c5 100755 --- a/tests/test_cli/test.sh +++ b/tests/test_cli/test.sh @@ -10,29 +10,29 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/../.." && pwd )" cd "$DIR" || exit function testExample() { - N=$1 - INPUT=$2 - APP="$3 $4" + N=$1 + INPUT=$2 + APP="$3 $4" - echo "Example $N: $APP" - $APP &> /dev/null & - sleep 2 - abci-cli --log_level=error --verbose batch < "$INPUT" > "${INPUT}.out.new" - killall "$3" + echo "Example $N: $APP" + $APP &> /dev/null & + sleep 2 + abci-cli --log_level=error --verbose batch < "$INPUT" > "${INPUT}.out.new" + killall "$3" - pre=$(shasum < "${INPUT}.out") - post=$(shasum < "${INPUT}.out.new") + pre=$(shasum < "${INPUT}.out") + post=$(shasum < "${INPUT}.out.new") - if [[ "$pre" != "$post" ]]; then - echo "You broke the tutorial" - echo "Got:" - cat "${INPUT}.out.new" - echo "Expected:" - cat "${INPUT}.out" - exit 1 - fi + if [[ "$pre" != "$post" ]]; then + echo "You broke the tutorial" + echo "Got:" + cat "${INPUT}.out.new" + echo "Expected:" + cat "${INPUT}.out" + exit 1 + fi - rm "${INPUT}".out.new + rm "${INPUT}".out.new } testExample 1 tests/test_cli/ex1.abci abci-cli dummy diff --git a/types/application.go b/types/application.go index c8ea19c3a..ef1bc92e5 100644 --- a/types/application.go +++ b/types/application.go @@ -42,7 +42,7 @@ func (BaseApplication) Info(req RequestInfo) ResponseInfo { } func (BaseApplication) SetOption(req RequestSetOption) ResponseSetOption { - return ResponseSetOption{Code: CodeTypeOK} + return ResponseSetOption{} } func (BaseApplication) DeliverTx(tx []byte) ResponseDeliverTx { @@ -54,7 +54,7 @@ func (BaseApplication) CheckTx(tx []byte) ResponseCheckTx { } func (BaseApplication) Commit() ResponseCommit { - return ResponseCommit{Code: CodeTypeOK} + return ResponseCommit{} } func (BaseApplication) Query(req RequestQuery) ResponseQuery { diff --git a/types/messages.go b/types/messages.go index 5ce234cf1..52e4b6758 100644 --- a/types/messages.go +++ b/types/messages.go @@ -1,33 +1,70 @@ package types import ( + "bufio" + "encoding/binary" "io" "github.com/gogo/protobuf/proto" - wire "github.com/tendermint/go-wire" ) -// WriteMessage writes a length-delimited protobuf message. +const ( + maxMsgSize = 104857600 // 100MB +) + +// WriteMessage writes a varint length-delimited protobuf message. func WriteMessage(msg proto.Message, w io.Writer) error { bz, err := proto.Marshal(msg) if err != nil { return err } - var n int - wire.WriteByteSlice(bz, w, &n, &err) - return err + return encodeByteSlice(w, bz) } -// ReadMessage reads a length delimited protobuf message. +// ReadMessage reads a varint length-delimited protobuf message. func ReadMessage(r io.Reader, msg proto.Message) error { - var n int - var err error - bz := wire.ReadByteSlice(r, 0, &n, &err) //XXX: no max + return readProtoMsg(r, msg, maxMsgSize) +} + +func readProtoMsg(r io.Reader, msg proto.Message, maxSize int) error { + // binary.ReadVarint takes an io.ByteReader, eg. a bufio.Reader + reader, ok := r.(*bufio.Reader) + if !ok { + reader = bufio.NewReader(r) + } + length64, err := binary.ReadVarint(reader) if err != nil { return err } - err = proto.Unmarshal(bz, msg) - return err + length := int(length64) + if length < 0 || length > maxSize { + return io.ErrShortBuffer + } + buf := make([]byte, length) + if _, err := io.ReadFull(reader, buf); err != nil { + return err + } + return proto.Unmarshal(buf, msg) +} + +//----------------------------------------------------------------------- +// NOTE: we copied wire.EncodeByteSlice from go-wire rather than keep +// go-wire as a dep + +func encodeByteSlice(w io.Writer, bz []byte) (err error) { + err = encodeVarint(w, int64(len(bz))) + if err != nil { + return + } + _, err = w.Write(bz) + return +} + +func encodeVarint(w io.Writer, i int64) (err error) { + var buf [10]byte + n := binary.PutVarint(buf[:], i) + _, err = w.Write(buf[0:n]) + return } //---------------------------------------- diff --git a/types/messages_test.go b/types/messages_test.go index 15e84b624..53e1a0cac 100644 --- a/types/messages_test.go +++ b/types/messages_test.go @@ -8,18 +8,20 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" + cmn "github.com/tendermint/tmlibs/common" ) func TestMarshalJSON(t *testing.T) { b, err := json.Marshal(&ResponseDeliverTx{}) assert.Nil(t, err) - assert.True(t, strings.Contains(string(b), "code")) + // Do not include empty fields. + assert.False(t, strings.Contains(string(b), "code")) r1 := ResponseCheckTx{ - Code: 1, - Data: []byte("hello"), - Gas: 43, - Fee: 12, + Code: 1, + Data: []byte("hello"), + GasWanted: 43, + Fee: cmn.KI64Pair{[]byte("pho"), 12}, } b, err = json.Marshal(&r1) assert.Nil(t, err) @@ -30,6 +32,26 @@ func TestMarshalJSON(t *testing.T) { assert.Equal(t, r1, r2) } +func TestWriteReadMessageSimple(t *testing.T) { + cases := []proto.Message{ + &RequestEcho{ + Message: "Hello", + }, + } + + for _, c := range cases { + buf := new(bytes.Buffer) + err := WriteMessage(c, buf) + assert.Nil(t, err) + + msg := new(RequestEcho) + err = ReadMessage(buf, msg) + assert.Nil(t, err) + + assert.Equal(t, c, msg) + } +} + func TestWriteReadMessage(t *testing.T) { cases := []proto.Message{ &Header{ @@ -50,3 +72,31 @@ func TestWriteReadMessage(t *testing.T) { assert.Equal(t, c, msg) } } + +func TestWriteReadMessage2(t *testing.T) { + phrase := "hello-world" + cases := []proto.Message{ + &ResponseCheckTx{ + Data: []byte(phrase), + Log: phrase, + GasWanted: 10, + Tags: []cmn.KVPair{ + cmn.KVPair{[]byte("abc"), []byte("def")}, + }, + // Fee: cmn.KI64Pair{ + }, + // TODO: add the rest + } + + for _, c := range cases { + buf := new(bytes.Buffer) + err := WriteMessage(c, buf) + assert.Nil(t, err) + + msg := new(ResponseCheckTx) + err = ReadMessage(buf, msg) + assert.Nil(t, err) + + assert.Equal(t, c, msg) + } +} diff --git a/types/result.go b/types/result.go index d094b78d7..dbf409f4c 100644 --- a/types/result.go +++ b/types/result.go @@ -3,7 +3,6 @@ package types import ( "bytes" "encoding/json" - "fmt" "github.com/gogo/protobuf/jsonpb" ) @@ -22,11 +21,6 @@ func (r ResponseCheckTx) IsErr() bool { return r.Code != CodeTypeOK } -// Error implements error interface by formatting response as string. -func (r ResponseCheckTx) Error() string { - return fmtError(r.Code, r.Log) -} - // IsOK returns true if Code is OK. func (r ResponseDeliverTx) IsOK() bool { return r.Code == CodeTypeOK @@ -37,26 +31,6 @@ func (r ResponseDeliverTx) IsErr() bool { return r.Code != CodeTypeOK } -// Error implements error interface by formatting response as string. -func (r ResponseDeliverTx) Error() string { - return fmtError(r.Code, r.Log) -} - -// IsOK returns true if Code is OK. -func (r ResponseCommit) IsOK() bool { - return r.Code == CodeTypeOK -} - -// IsErr returns true if Code is something other than OK. -func (r ResponseCommit) IsErr() bool { - return r.Code != CodeTypeOK -} - -// Error implements error interface by formatting response as string. -func (r ResponseCommit) Error() string { - return fmtError(r.Code, r.Log) -} - // IsOK returns true if Code is OK. func (r ResponseQuery) IsOK() bool { return r.Code == CodeTypeOK @@ -67,15 +41,6 @@ func (r ResponseQuery) IsErr() bool { return r.Code != CodeTypeOK } -// Error implements error interface by formatting response as string. -func (r ResponseQuery) Error() string { - return fmtError(r.Code, r.Log) -} - -func fmtError(code uint32, log string) string { - return fmt.Sprintf("Error code (%d): %s", code, log) -} - //--------------------------------------------------------------------------- // override JSON marshalling so we dont emit defaults (ie. disable omitempty) // note we need Unmarshal functions too because protobuf had the bright idea @@ -84,7 +49,7 @@ func fmtError(code uint32, log string) string { var ( jsonpbMarshaller = jsonpb.Marshaler{ EnumsAsInts: true, - EmitDefaults: true, + EmitDefaults: false, } jsonpbUnmarshaller = jsonpb.Unmarshaler{} ) diff --git a/types/result_test.go b/types/result_test.go deleted file mode 100644 index b7da838cc..000000000 --- a/types/result_test.go +++ /dev/null @@ -1,74 +0,0 @@ -package types - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestResponseQuery(t *testing.T) { - res := ResponseQuery{ - Code: CodeTypeOK, - Index: 0, - Key: []byte("hello"), - Value: []byte("world"), - Height: 1, - } - assert.False(t, res.IsErr()) - - res = ResponseQuery{ - Code: 1, - Index: 0, - Key: []byte("hello"), - Value: []byte("world"), - Height: 1, - Log: "bad", - } - assert.True(t, res.IsErr()) - assert.Equal(t, "Error code (1): bad", res.Error()) -} - -func TestResponseDeliverTx(t *testing.T) { - res := ResponseDeliverTx{ - Code: CodeTypeOK, - Data: []byte("Victor Mancha"), - } - assert.False(t, res.IsErr()) - - res = ResponseDeliverTx{ - Code: 1, - Log: "bad", - } - assert.True(t, res.IsErr()) - assert.Equal(t, "Error code (1): bad", res.Error()) -} - -func TestResponseCheckTx(t *testing.T) { - res := ResponseCheckTx{ - Code: CodeTypeOK, - Data: []byte("Talos"), - } - assert.False(t, res.IsErr()) - - res = ResponseCheckTx{ - Code: 1, - Log: "bad", - } - assert.True(t, res.IsErr()) - assert.Equal(t, "Error code (1): bad", res.Error()) -} - -func TestResponseCommit(t *testing.T) { - res := ResponseCommit{ - Code: CodeTypeOK, - Data: []byte("Old Lace"), - } - assert.False(t, res.IsErr()) - - res = ResponseCommit{ - Code: 1, - Log: "bad", - } - assert.True(t, res.IsErr()) - assert.Equal(t, "Error code (1): bad", res.Error()) -} diff --git a/types/types.pb.go b/types/types.pb.go index 7ab18fe4c..fda9b752c 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -42,7 +42,6 @@ It has these top-level messages: PartSetHeader Validator Evidence - KVPair */ //nolint: gas package types @@ -51,8 +50,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" - -import github_com_tendermint_go_wire_data "github.com/tendermint/go-wire/data" +import common "github.com/tendermint/tmlibs/common" import context "golang.org/x/net/context" import grpc "google.golang.org/grpc" @@ -68,27 +66,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package -type KVPair_Type int32 - -const ( - KVPair_STRING KVPair_Type = 0 - KVPair_INT KVPair_Type = 1 -) - -var KVPair_Type_name = map[int32]string{ - 0: "STRING", - 1: "INT", -} -var KVPair_Type_value = map[string]int32{ - "STRING": 0, - "INT": 1, -} - -func (x KVPair_Type) String() string { - return proto.EnumName(KVPair_Type_name, int32(x)) -} -func (KVPair_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34, 0} } - type Request struct { // Types that are valid to be assigned to Value: // *Request_Echo @@ -529,6 +506,7 @@ func (m *RequestInfo) GetVersion() string { return "" } +// nondeterministic type RequestSetOption struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` @@ -554,7 +532,8 @@ func (m *RequestSetOption) GetValue() string { } type RequestInitChain struct { - Validators []*Validator `protobuf:"bytes,1,rep,name=validators" json:"validators,omitempty"` + Validators []Validator `protobuf:"bytes,1,rep,name=validators" json:"validators"` + AppStateBytes []byte `protobuf:"bytes,2,opt,name=app_state_bytes,json=appStateBytes,proto3" json:"app_state_bytes,omitempty"` } func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } @@ -562,13 +541,20 @@ func (m *RequestInitChain) String() string { return proto.CompactText func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{5} } -func (m *RequestInitChain) GetValidators() []*Validator { +func (m *RequestInitChain) GetValidators() []Validator { if m != nil { return m.Validators } return nil } +func (m *RequestInitChain) GetAppStateBytes() []byte { + if m != nil { + return m.AppStateBytes + } + return nil +} + type RequestQuery struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` @@ -610,10 +596,10 @@ func (m *RequestQuery) GetProve() bool { } 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"` - AbsentValidators []int32 `protobuf:"varint,3,rep,packed,name=absent_validators,json=absentValidators" json:"absent_validators,omitempty"` - ByzantineValidators []*Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators" json:"byzantine_validators,omitempty"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Header Header `protobuf:"bytes,2,opt,name=header" json:"header"` + AbsentValidators []int32 `protobuf:"varint,3,rep,packed,name=absent_validators,json=absentValidators" json:"absent_validators,omitempty"` + ByzantineValidators []Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators" json:"byzantine_validators"` } func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } @@ -628,11 +614,11 @@ func (m *RequestBeginBlock) GetHash() []byte { return nil } -func (m *RequestBeginBlock) GetHeader() *Header { +func (m *RequestBeginBlock) GetHeader() Header { if m != nil { return m.Header } - return nil + return Header{} } func (m *RequestBeginBlock) GetAbsentValidators() []int32 { @@ -642,7 +628,7 @@ func (m *RequestBeginBlock) GetAbsentValidators() []int32 { return nil } -func (m *RequestBeginBlock) GetByzantineValidators() []*Evidence { +func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { if m != nil { return m.ByzantineValidators } @@ -1136,6 +1122,7 @@ func _Response_OneofSizer(msg proto.Message) (n int) { return n } +// nondeterministic type ResponseException struct { Error string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` } @@ -1216,9 +1203,12 @@ func (m *ResponseInfo) GetLastBlockAppHash() []byte { return nil } +// nondeterministic type ResponseSetOption struct { Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"` + // bytes data = 2; + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` } func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } @@ -1240,6 +1230,13 @@ func (m *ResponseSetOption) GetLog() string { return "" } +func (m *ResponseSetOption) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + type ResponseInitChain struct { } @@ -1249,13 +1246,15 @@ func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{18} } 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"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + // bytes data = 2; // use "value" instead. + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` + Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` + Proof []byte `protobuf:"bytes,8,opt,name=proof,proto3" json:"proof,omitempty"` + Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` } func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } @@ -1270,6 +1269,20 @@ func (m *ResponseQuery) GetCode() uint32 { return 0 } +func (m *ResponseQuery) GetLog() string { + if m != nil { + return m.Log + } + return "" +} + +func (m *ResponseQuery) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + func (m *ResponseQuery) GetIndex() int64 { if m != nil { return m.Index @@ -1277,6 +1290,27 @@ func (m *ResponseQuery) GetIndex() int64 { return 0 } +func (m *ResponseQuery) GetKey() []byte { + if m != nil { + return m.Key + } + return nil +} + +func (m *ResponseQuery) GetValue() []byte { + if m != nil { + return m.Value + } + return nil +} + +func (m *ResponseQuery) GetProof() []byte { + if m != nil { + return m.Proof + } + return nil +} + func (m *ResponseQuery) GetHeight() int64 { if m != nil { return m.Height @@ -1284,13 +1318,6 @@ func (m *ResponseQuery) GetHeight() int64 { return 0 } -func (m *ResponseQuery) GetLog() string { - if m != nil { - return m.Log - } - return "" -} - type ResponseBeginBlock struct { } @@ -1300,11 +1327,14 @@ 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"` - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Gas int64 `protobuf:"varint,4,opt,name=gas,proto3" json:"gas,omitempty"` - Fee int64 `protobuf:"varint,5,opt,name=fee,proto3" json:"fee,omitempty"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` + // int64 gas_used = 6; + Tags []common.KVPair `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"` + Fee common.KI64Pair `protobuf:"bytes,8,opt,name=fee" json:"fee"` } func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } @@ -1319,6 +1349,13 @@ func (m *ResponseCheckTx) GetCode() uint32 { return 0 } +func (m *ResponseCheckTx) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + func (m *ResponseCheckTx) GetLog() string { if m != nil { return m.Log @@ -1326,25 +1363,42 @@ func (m *ResponseCheckTx) GetLog() string { return "" } -func (m *ResponseCheckTx) GetGas() int64 { +func (m *ResponseCheckTx) GetInfo() string { if m != nil { - return m.Gas + return m.Info + } + return "" +} + +func (m *ResponseCheckTx) GetGasWanted() int64 { + if m != nil { + return m.GasWanted } return 0 } -func (m *ResponseCheckTx) GetFee() int64 { +func (m *ResponseCheckTx) GetTags() []common.KVPair { + if m != nil { + return m.Tags + } + return nil +} + +func (m *ResponseCheckTx) GetFee() common.KI64Pair { if m != nil { return m.Fee } - return 0 + return common.KI64Pair{} } 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"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` + GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` + Tags []common.KVPair `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"` } func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } @@ -1359,6 +1413,13 @@ func (m *ResponseDeliverTx) GetCode() uint32 { return 0 } +func (m *ResponseDeliverTx) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + func (m *ResponseDeliverTx) GetLog() string { if m != nil { return m.Log @@ -1366,7 +1427,28 @@ func (m *ResponseDeliverTx) GetLog() string { return "" } -func (m *ResponseDeliverTx) GetTags() []*KVPair { +func (m *ResponseDeliverTx) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + +func (m *ResponseDeliverTx) GetGasWanted() int64 { + if m != nil { + return m.GasWanted + } + return 0 +} + +func (m *ResponseDeliverTx) GetGasUsed() int64 { + if m != nil { + return m.GasUsed + } + return 0 +} + +func (m *ResponseDeliverTx) GetTags() []common.KVPair { if m != nil { return m.Tags } @@ -1374,7 +1456,7 @@ func (m *ResponseDeliverTx) GetTags() []*KVPair { } type ResponseEndBlock struct { - ValidatorUpdates []*Validator `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates" json:"validator_updates,omitempty"` + ValidatorUpdates []Validator `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates" json:"validator_updates"` ConsensusParamUpdates *ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates" json:"consensus_param_updates,omitempty"` } @@ -1383,7 +1465,7 @@ func (m *ResponseEndBlock) String() string { return proto.CompactText func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{23} } -func (m *ResponseEndBlock) GetValidatorUpdates() []*Validator { +func (m *ResponseEndBlock) GetValidatorUpdates() []Validator { if m != nil { return m.ValidatorUpdates } @@ -1398,9 +1480,8 @@ func (m *ResponseEndBlock) GetConsensusParamUpdates() *ConsensusParams { } type ResponseCommit 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"` + // reserve 1 + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` } func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } @@ -1408,18 +1489,11 @@ func (m *ResponseCommit) String() string { return proto.CompactTextSt func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{24} } -func (m *ResponseCommit) GetCode() uint32 { +func (m *ResponseCommit) GetData() []byte { if m != nil { - return m.Code + return m.Data } - return 0 -} - -func (m *ResponseCommit) GetLog() string { - if m != nil { - return m.Log - } - return "" + return nil } // ConsensusParams contains all consensus-relevant parameters @@ -1534,15 +1608,15 @@ func (m *BlockGossip) GetBlockPartSizeBytes() int32 { } type Header struct { - ChainID string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` - NumTxs int32 `protobuf:"varint,4,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"` - LastBlockID *BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId" json:"last_block_id,omitempty"` - LastCommitHash []byte `protobuf:"bytes,6,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` - DataHash []byte `protobuf:"bytes,7,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` - ValidatorsHash []byte `protobuf:"bytes,8,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` - AppHash []byte `protobuf:"bytes,9,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + ChainID string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` + NumTxs int32 `protobuf:"varint,4,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"` + LastBlockID BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId" json:"last_block_id"` + LastCommitHash []byte `protobuf:"bytes,6,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` + DataHash []byte `protobuf:"bytes,7,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,8,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + AppHash []byte `protobuf:"bytes,9,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -1578,11 +1652,11 @@ func (m *Header) GetNumTxs() int32 { return 0 } -func (m *Header) GetLastBlockID() *BlockID { +func (m *Header) GetLastBlockID() BlockID { if m != nil { return m.LastBlockID } - return nil + return BlockID{} } func (m *Header) GetLastCommitHash() []byte { @@ -1614,8 +1688,8 @@ func (m *Header) GetAppHash() []byte { } type BlockID struct { - Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - Parts *PartSetHeader `protobuf:"bytes,2,opt,name=parts" json:"parts,omitempty"` + Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + Parts PartSetHeader `protobuf:"bytes,2,opt,name=parts" json:"parts"` } func (m *BlockID) Reset() { *m = BlockID{} } @@ -1630,11 +1704,11 @@ func (m *BlockID) GetHash() []byte { return nil } -func (m *BlockID) GetParts() *PartSetHeader { +func (m *BlockID) GetParts() PartSetHeader { if m != nil { return m.Parts } - return nil + return PartSetHeader{} } type PartSetHeader struct { @@ -1709,46 +1783,6 @@ func (m *Evidence) GetHeight() int64 { return 0 } -type KVPair struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ValueType KVPair_Type `protobuf:"varint,2,opt,name=value_type,json=valueType,proto3,enum=types.KVPair_Type" json:"value_type,omitempty"` - ValueString string `protobuf:"bytes,3,opt,name=value_string,json=valueString,proto3" json:"value_string,omitempty"` - ValueInt int64 `protobuf:"varint,4,opt,name=value_int,json=valueInt,proto3" json:"value_int,omitempty"` -} - -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{34} } - -func (m *KVPair) GetKey() string { - if m != nil { - return m.Key - } - return "" -} - -func (m *KVPair) GetValueType() KVPair_Type { - if m != nil { - return m.ValueType - } - return KVPair_STRING -} - -func (m *KVPair) GetValueString() string { - if m != nil { - return m.ValueString - } - return "" -} - -func (m *KVPair) GetValueInt() int64 { - if m != nil { - return m.ValueInt - } - return 0 -} - func init() { proto.RegisterType((*Request)(nil), "types.Request") proto.RegisterType((*RequestEcho)(nil), "types.RequestEcho") @@ -1784,8 +1818,6 @@ func init() { proto.RegisterType((*PartSetHeader)(nil), "types.PartSetHeader") proto.RegisterType((*Validator)(nil), "types.Validator") proto.RegisterType((*Evidence)(nil), "types.Evidence") - proto.RegisterType((*KVPair)(nil), "types.KVPair") - proto.RegisterEnum("types.KVPair_Type", KVPair_Type_name, KVPair_Type_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -2193,116 +2225,115 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1766 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, 0xa1, 0x83, 0xe8, 0xad, 0x8a, 0x0d, - 0xd9, 0x16, 0x69, 0xd3, 0xa5, 0x94, 0x68, 0x27, 0xae, 0x08, 0xa4, 0x2c, 0xa2, 0x9c, 0x52, 0x94, - 0x15, 0xe3, 0x43, 0x2e, 0xa8, 0x01, 0x76, 0x08, 0x6c, 0x09, 0xd8, 0x5d, 0xef, 0x0e, 0x68, 0x50, - 0x95, 0x47, 0xf0, 0x3d, 0xe7, 0xe4, 0x98, 0x17, 0xc8, 0x31, 0xa7, 0xa4, 0xf2, 0x0c, 0x39, 0xe8, - 0xe0, 0x27, 0x49, 0x75, 0xcf, 0xec, 0x2f, 0x76, 0x53, 0x29, 0x1d, 0x74, 0x01, 0x66, 0xa6, 0x7f, - 0xb6, 0xbb, 0xa7, 0xe7, 0xeb, 0x9e, 0x81, 0x7d, 0x79, 0xeb, 0x8b, 0xf0, 0x84, 0x7e, 0x8f, 0xfd, - 0xc0, 0x93, 0x1e, 0x6b, 0xd0, 0xa4, 0xff, 0x68, 0xe6, 0xc8, 0xf9, 0x6a, 0x72, 0x3c, 0xf5, 0x96, - 0x27, 0x33, 0x6f, 0xe6, 0x9d, 0x10, 0x75, 0xb2, 0xba, 0xa6, 0x19, 0x4d, 0x68, 0xa4, 0xa4, 0xcc, - 0x7f, 0xd5, 0xa1, 0x65, 0x89, 0x1f, 0x56, 0x22, 0x94, 0x6c, 0x00, 0x75, 0x31, 0x9d, 0x7b, 0xbd, - 0xea, 0x51, 0x65, 0xd0, 0x39, 0x65, 0xc7, 0x4a, 0xbb, 0xa6, 0x3e, 0x9b, 0xce, 0xbd, 0xcb, 0x2d, - 0x8b, 0x38, 0xd8, 0xa7, 0xd0, 0xb8, 0x5e, 0xac, 0xc2, 0x79, 0xaf, 0x46, 0xac, 0x07, 0x59, 0xd6, - 0x6f, 0x91, 0x74, 0xb9, 0x65, 0x29, 0x1e, 0x54, 0xeb, 0xb8, 0xd7, 0x5e, 0xaf, 0x5e, 0xa4, 0x76, - 0xe4, 0x5e, 0x93, 0x5a, 0xe4, 0x60, 0x4f, 0x00, 0x42, 0x21, 0xc7, 0x9e, 0x2f, 0x1d, 0xcf, 0xed, - 0x35, 0x88, 0xff, 0x5e, 0x96, 0xff, 0x95, 0x90, 0xbf, 0x23, 0xf2, 0xe5, 0x96, 0x65, 0x84, 0xd1, - 0x04, 0x25, 0x1d, 0xd7, 0x91, 0xe3, 0xe9, 0x9c, 0x3b, 0x6e, 0xaf, 0x59, 0x24, 0x39, 0x72, 0x1d, - 0x79, 0x8e, 0x64, 0x94, 0x74, 0xa2, 0x09, 0xba, 0xf2, 0xc3, 0x4a, 0x04, 0xb7, 0xbd, 0x56, 0x91, - 0x2b, 0xbf, 0x47, 0x12, 0xba, 0x42, 0x3c, 0xec, 0x6b, 0xe8, 0x4c, 0xc4, 0xcc, 0x71, 0xc7, 0x93, - 0x85, 0x37, 0x7d, 0xdd, 0x6b, 0x93, 0x48, 0x2f, 0x2b, 0x32, 0x44, 0x86, 0x21, 0xd2, 0x2f, 0xb7, - 0x2c, 0x98, 0xc4, 0x33, 0x76, 0x0a, 0xed, 0xe9, 0x5c, 0x4c, 0x5f, 0x8f, 0xe5, 0xba, 0x67, 0x90, - 0xe4, 0x9d, 0xac, 0xe4, 0x39, 0x52, 0xaf, 0xd6, 0x97, 0x5b, 0x56, 0x6b, 0xaa, 0x86, 0xe8, 0x97, - 0x2d, 0x16, 0xce, 0x8d, 0x08, 0x50, 0xea, 0xa0, 0xc8, 0xaf, 0x0b, 0x45, 0x27, 0x39, 0xc3, 0x8e, - 0x26, 0xec, 0x31, 0x18, 0xc2, 0xb5, 0xb5, 0xa1, 0x1d, 0x12, 0xbc, 0x9b, 0xdb, 0x51, 0xd7, 0x8e, - 0xcc, 0x6c, 0x0b, 0x3d, 0x66, 0xc7, 0xd0, 0x9c, 0x7a, 0xcb, 0xa5, 0x23, 0x7b, 0xdb, 0x24, 0x73, - 0x98, 0x33, 0x91, 0x68, 0x97, 0x5b, 0x96, 0xe6, 0x1a, 0xb6, 0xa0, 0x71, 0xc3, 0x17, 0x2b, 0x61, - 0x7e, 0x0c, 0x9d, 0x54, 0xa6, 0xb0, 0x1e, 0xb4, 0x96, 0x22, 0x0c, 0xf9, 0x4c, 0xf4, 0x2a, 0x47, - 0x95, 0x81, 0x61, 0x45, 0x53, 0x73, 0x17, 0xb6, 0xd3, 0x79, 0x92, 0x12, 0xc4, 0x5c, 0x40, 0xc1, - 0x1b, 0x11, 0x84, 0x98, 0x00, 0x5a, 0x50, 0x4f, 0xcd, 0xaf, 0xa0, 0x9b, 0x4f, 0x02, 0xd6, 0x85, - 0xda, 0x6b, 0x71, 0xab, 0x39, 0x71, 0xc8, 0x0e, 0xb5, 0x41, 0x94, 0xc5, 0x86, 0xa5, 0xad, 0xbb, - 0x88, 0x65, 0xe3, 0x34, 0x60, 0x9f, 0x03, 0xdc, 0xf0, 0x85, 0x63, 0x73, 0xe9, 0x05, 0x61, 0xaf, - 0x72, 0x54, 0x1b, 0x74, 0x4e, 0xbb, 0xda, 0xdd, 0xef, 0x23, 0x82, 0x95, 0xe2, 0x31, 0xed, 0xd8, - 0x74, 0xca, 0x0b, 0xc6, 0xa0, 0x6e, 0x73, 0xc9, 0xe9, 0xf3, 0xdb, 0x16, 0x8d, 0x71, 0xcd, 0xe7, - 0x72, 0xae, 0x3f, 0x4f, 0x63, 0x76, 0x17, 0x9a, 0x73, 0xe1, 0xcc, 0xe6, 0x92, 0xce, 0x4b, 0xcd, - 0xd2, 0x33, 0xb4, 0xd5, 0x0f, 0xbc, 0x1b, 0x41, 0x47, 0xa3, 0x6d, 0xa9, 0x89, 0xf9, 0x8f, 0x0a, - 0xec, 0x6f, 0xe4, 0x12, 0xea, 0x9d, 0xf3, 0x70, 0x1e, 0x7d, 0x0b, 0xc7, 0xec, 0x17, 0xa8, 0x97, - 0xdb, 0x22, 0xd0, 0x47, 0x76, 0x47, 0x5b, 0x7f, 0x49, 0x8b, 0x96, 0x26, 0xb2, 0x4f, 0x61, 0x9f, - 0x4f, 0x42, 0xe1, 0xca, 0x71, 0xca, 0xdf, 0xda, 0x51, 0x6d, 0xd0, 0xb0, 0xba, 0x8a, 0x10, 0xbb, - 0x1b, 0xb2, 0x21, 0x1c, 0x4e, 0x6e, 0xdf, 0x70, 0x57, 0x3a, 0xae, 0x48, 0xf3, 0xd7, 0x29, 0x3e, - 0x7b, 0xfa, 0x0b, 0xcf, 0x6e, 0x1c, 0x5b, 0xb8, 0x53, 0x61, 0x1d, 0xc4, 0xcc, 0x89, 0x0e, 0xf3, - 0x08, 0x76, 0xb3, 0x29, 0xcd, 0x76, 0xa1, 0x2a, 0xd7, 0xda, 0xf6, 0xaa, 0x5c, 0x9b, 0x66, 0xbc, - 0x1f, 0x71, 0xfa, 0x6e, 0xf0, 0x3c, 0x84, 0xbd, 0x5c, 0xa6, 0xa6, 0x02, 0x59, 0x49, 0x07, 0xd2, - 0xdc, 0x83, 0x9d, 0x4c, 0x82, 0x9a, 0x3f, 0x35, 0xa0, 0x6d, 0x89, 0xd0, 0xf7, 0xdc, 0x50, 0xb0, - 0x27, 0x60, 0x88, 0xf5, 0x54, 0x28, 0x54, 0xa9, 0xe4, 0xce, 0xac, 0xe2, 0x79, 0x16, 0xd1, 0xf1, - 0x10, 0xc5, 0xcc, 0xec, 0x61, 0x06, 0x11, 0x0f, 0xf2, 0x42, 0x69, 0x48, 0xfc, 0x2c, 0x0b, 0x89, - 0x87, 0x39, 0xde, 0x1c, 0x26, 0x3e, 0xcc, 0x60, 0x62, 0x5e, 0x71, 0x06, 0x14, 0xcf, 0x0a, 0x40, - 0x31, 0x6f, 0x7e, 0x09, 0x2a, 0x9e, 0x15, 0xa0, 0x62, 0x6f, 0xe3, 0x5b, 0x85, 0xb0, 0xf8, 0x59, - 0x16, 0x16, 0xf3, 0xee, 0xe4, 0x70, 0xf1, 0x57, 0x45, 0xb8, 0xf8, 0x41, 0x4e, 0xa6, 0x14, 0x18, - 0xbf, 0xdc, 0x00, 0xc6, 0xbb, 0x39, 0xd1, 0x02, 0x64, 0x3c, 0xcb, 0x20, 0x23, 0x14, 0xfa, 0x56, - 0x02, 0x8d, 0xbf, 0xdc, 0x84, 0xc6, 0x7b, 0xf9, 0xad, 0x2d, 0xc2, 0xc6, 0x93, 0x1c, 0x36, 0xde, - 0xc9, 0x5b, 0x59, 0x0a, 0x8e, 0x0f, 0xf1, 0x44, 0xe7, 0x32, 0x0d, 0x4f, 0xbf, 0x08, 0x02, 0x2f, - 0xd0, 0xe8, 0xa5, 0x26, 0xe6, 0x00, 0x31, 0x26, 0xc9, 0xaf, 0xff, 0x01, 0xa4, 0x94, 0xf4, 0xa9, - 0xec, 0x32, 0xff, 0x5c, 0x49, 0x64, 0x09, 0x4b, 0xd3, 0xf8, 0x64, 0x68, 0x7c, 0x4a, 0xe1, 0x6b, - 0x35, 0x83, 0xaf, 0xec, 0x13, 0xd8, 0x5f, 0xf0, 0x50, 0xaa, 0xb8, 0x8c, 0x33, 0x80, 0xb5, 0x87, - 0x04, 0x15, 0x10, 0x85, 0x5c, 0x8f, 0xe0, 0x20, 0xc5, 0xcb, 0x7d, 0x7f, 0x4c, 0xe0, 0x54, 0xa7, - 0xc3, 0xdb, 0x8d, 0xb9, 0x9f, 0xfa, 0xfe, 0x25, 0x0f, 0xe7, 0xe6, 0x59, 0xe2, 0x7f, 0x82, 0xdd, - 0x0c, 0xea, 0x53, 0xcf, 0x56, 0x6e, 0xed, 0x58, 0x34, 0x46, 0x3c, 0x5f, 0x78, 0x33, 0x6d, 0x19, - 0x0e, 0xcd, 0x83, 0x44, 0x34, 0x4e, 0x55, 0xf3, 0xef, 0xd5, 0xc4, 0xf7, 0x18, 0x8a, 0x37, 0x94, - 0x1d, 0x42, 0xc3, 0x71, 0x6d, 0xb1, 0x26, 0x75, 0x35, 0x4b, 0x4d, 0xd8, 0x50, 0x95, 0x0c, 0x74, - 0x6c, 0x7b, 0xf8, 0xf9, 0xbf, 0xdf, 0x3e, 0xd8, 0xfa, 0xcf, 0xdb, 0x07, 0x83, 0x54, 0xd7, 0x24, - 0x85, 0x6b, 0x8b, 0x60, 0xe9, 0xb8, 0xf2, 0x64, 0xe6, 0x3d, 0xfa, 0xd1, 0x09, 0xc4, 0x09, 0x46, - 0xee, 0x78, 0x78, 0x2b, 0x45, 0xa8, 0x8a, 0xcc, 0xb7, 0x51, 0x91, 0xa9, 0xbf, 0xa3, 0x16, 0x25, - 0x8e, 0x7a, 0xfc, 0xc0, 0xf3, 0xae, 0xe9, 0x58, 0xbf, 0x93, 0x1e, 0x12, 0x4f, 0xe1, 0x62, 0x33, - 0x53, 0x60, 0x74, 0x38, 0x5b, 0x49, 0x38, 0x0f, 0x81, 0x6d, 0x9e, 0x47, 0xf3, 0x2f, 0x15, 0xc4, - 0xda, 0xcc, 0x59, 0x2b, 0x8c, 0xe8, 0x85, 0x4e, 0xa8, 0xea, 0x3b, 0x9a, 0xab, 0x52, 0x50, 0x5b, - 0x55, 0x8b, 0xad, 0xc2, 0x95, 0x19, 0x0f, 0x29, 0x9a, 0x35, 0x0b, 0x87, 0xb8, 0x72, 0x2d, 0x04, - 0xc5, 0xa5, 0x66, 0xe1, 0xd0, 0xfc, 0x6b, 0x25, 0xc9, 0x84, 0xa4, 0x68, 0xbc, 0x4f, 0x2b, 0x3f, - 0x84, 0xba, 0xe4, 0xb3, 0xa8, 0x14, 0x46, 0xc5, 0xf6, 0xbb, 0xef, 0x5f, 0x72, 0x27, 0xb0, 0x88, - 0x84, 0x81, 0xec, 0xe6, 0x31, 0x84, 0xfd, 0x1a, 0xf6, 0xe3, 0x42, 0x3a, 0x5e, 0xf9, 0x36, 0x97, - 0xa2, 0xbc, 0xdf, 0xe8, 0xc6, 0xac, 0x7f, 0x50, 0x9c, 0xec, 0x05, 0xdc, 0x9b, 0xa2, 0x3e, 0x37, - 0x5c, 0x85, 0x63, 0x9f, 0x07, 0x7c, 0x19, 0x2b, 0xa9, 0x66, 0xd0, 0xf2, 0x3c, 0xe2, 0x7a, 0x89, - 0x4c, 0xa1, 0x75, 0x67, 0x9a, 0x59, 0xd0, 0xfa, 0xcc, 0x3f, 0x61, 0x75, 0x4e, 0x23, 0xd6, 0xfb, - 0x0c, 0x22, 0xa5, 0x5a, 0xce, 0x50, 0x76, 0x02, 0xa0, 0x80, 0x24, 0x74, 0xde, 0x08, 0x5d, 0xa1, - 0xa3, 0xc8, 0x50, 0x08, 0x5f, 0x39, 0x6f, 0x84, 0x65, 0x4c, 0xa2, 0x21, 0xfb, 0x08, 0x5a, 0x72, - 0xad, 0xb8, 0xb3, 0x9d, 0xcf, 0xd5, 0x9a, 0x58, 0x9b, 0x92, 0xfe, 0xd9, 0x63, 0xd8, 0x56, 0x8a, - 0x67, 0x5e, 0x18, 0x3a, 0xbe, 0xae, 0xcd, 0x2c, 0xad, 0xfa, 0x39, 0x51, 0xac, 0xce, 0x24, 0x99, - 0x98, 0x7f, 0x04, 0x23, 0xfe, 0x2c, 0xbb, 0x0f, 0xc6, 0x92, 0xaf, 0xc7, 0x93, 0x5b, 0xb5, 0x6b, - 0x95, 0x41, 0xc3, 0x6a, 0x2f, 0xf9, 0x9a, 0xbc, 0x64, 0xf7, 0xa0, 0x85, 0x44, 0xb9, 0x56, 0x7b, - 0xd1, 0xb0, 0x9a, 0x4b, 0xbe, 0xbe, 0x5a, 0xc7, 0x04, 0xcc, 0x6a, 0xdd, 0xf3, 0x2d, 0xf9, 0xfa, - 0x39, 0x0f, 0xcd, 0x6f, 0xa0, 0xa9, 0x8c, 0xfc, 0xbf, 0x14, 0xa3, 0x7c, 0x35, 0x23, 0xff, 0x1b, - 0xe8, 0xa4, 0xec, 0x66, 0x5f, 0xc0, 0x1d, 0xe5, 0xa1, 0xcf, 0x03, 0x49, 0x11, 0xc9, 0x28, 0x64, - 0x44, 0x7c, 0xc9, 0x03, 0x89, 0x9f, 0x24, 0xd5, 0xe6, 0x3f, 0xab, 0xd0, 0x54, 0x1d, 0x22, 0xfb, - 0x08, 0x2b, 0x2f, 0x77, 0xdc, 0xb1, 0x63, 0xab, 0x22, 0x31, 0xec, 0xfc, 0xfc, 0xf6, 0x41, 0x8b, - 0x40, 0x76, 0x74, 0x81, 0xc5, 0x16, 0x07, 0x76, 0x0a, 0x5f, 0xaa, 0x19, 0x7c, 0x61, 0x50, 0x97, - 0xce, 0x52, 0x68, 0x17, 0x69, 0x8c, 0x96, 0xbb, 0xab, 0x25, 0x85, 0xa4, 0xae, 0x42, 0xe2, 0xae, - 0x96, 0x18, 0x92, 0x73, 0xd8, 0x49, 0xd5, 0x0c, 0xc7, 0xd6, 0xbd, 0xcc, 0x6e, 0x7a, 0x37, 0x46, - 0x17, 0xc3, 0xbd, 0x9f, 0xdf, 0x3e, 0xe8, 0xfc, 0x36, 0xaa, 0x20, 0xa3, 0x0b, 0xab, 0x13, 0x97, - 0x93, 0x91, 0xcd, 0x06, 0x40, 0xd5, 0x65, 0xac, 0x2a, 0xac, 0xaa, 0x3a, 0x4d, 0xaa, 0x3a, 0xbb, - 0xb8, 0xae, 0x4b, 0x30, 0x36, 0xc7, 0xf7, 0xc1, 0xc0, 0x14, 0x54, 0x2c, 0x2d, 0x62, 0x69, 0xe3, - 0x02, 0x11, 0x3f, 0x86, 0xbd, 0xa4, 0xb7, 0x55, 0x2c, 0x6d, 0xa5, 0x25, 0x59, 0x26, 0xc6, 0x0f, - 0xa0, 0x1d, 0x57, 0x37, 0x83, 0x38, 0x5a, 0x5c, 0x17, 0xb5, 0x11, 0xb4, 0xb4, 0x89, 0x85, 0xcd, - 0xf9, 0x27, 0xd0, 0xc0, 0x3d, 0x89, 0x0e, 0x69, 0xd4, 0x41, 0xd1, 0x5e, 0x08, 0xa9, 0x5b, 0x74, - 0xc5, 0x62, 0x9e, 0xc1, 0x4e, 0x66, 0x1d, 0x4b, 0x97, 0xf4, 0x24, 0x5f, 0xe8, 0x6d, 0x54, 0x93, - 0xf8, 0x33, 0xd5, 0xe4, 0x33, 0xe6, 0x57, 0x60, 0xc4, 0xe0, 0x81, 0xb1, 0xf7, 0x57, 0x93, 0x71, - 0x74, 0x25, 0xda, 0xb6, 0x9a, 0xfe, 0x6a, 0xf2, 0x9d, 0xba, 0x15, 0xf9, 0xde, 0x8f, 0xfa, 0xa2, - 0x50, 0xb3, 0xd4, 0xc4, 0xfc, 0x1a, 0xda, 0x51, 0x23, 0x5f, 0x2e, 0x5a, 0xb2, 0xf7, 0xe6, 0xdf, - 0x2a, 0xd0, 0x54, 0xd8, 0x57, 0x70, 0x0b, 0xfb, 0x82, 0xee, 0x56, 0x2b, 0x31, 0x46, 0xa7, 0x49, - 0x70, 0x37, 0x3e, 0x76, 0x4a, 0xe8, 0xf8, 0xea, 0xd6, 0x17, 0x96, 0x41, 0x5c, 0x38, 0x64, 0x1f, - 0xc2, 0xb6, 0x12, 0x09, 0x65, 0xe0, 0xb8, 0x11, 0x66, 0x74, 0x68, 0xed, 0x15, 0x2d, 0xe1, 0x96, - 0x2a, 0x16, 0xc7, 0x95, 0xba, 0x58, 0xb4, 0x69, 0x61, 0xe4, 0x4a, 0xf3, 0x3e, 0xd4, 0x49, 0x0f, - 0x40, 0xf3, 0xd5, 0x95, 0x35, 0x7a, 0xf1, 0xbc, 0xbb, 0xc5, 0x5a, 0x50, 0x1b, 0xbd, 0xb8, 0xea, - 0x56, 0x4e, 0x7f, 0x6a, 0xc0, 0xde, 0xd3, 0xe1, 0xf9, 0xe8, 0xa9, 0xef, 0x2f, 0x9c, 0x29, 0xa7, - 0xfe, 0xe3, 0x04, 0xea, 0xd4, 0x61, 0x15, 0x3c, 0x74, 0xf4, 0x8b, 0x5a, 0x7d, 0x76, 0x0a, 0x0d, - 0x6a, 0xb4, 0x58, 0xd1, 0x7b, 0x47, 0xbf, 0xb0, 0xe3, 0xc7, 0x8f, 0xa8, 0x56, 0x6c, 0xf3, 0xd9, - 0xa3, 0x5f, 0xd4, 0xf6, 0xb3, 0x6f, 0xc0, 0x48, 0x5a, 0xa4, 0xb2, 0xc7, 0x8f, 0x7e, 0xe9, 0x05, - 0x00, 0xe5, 0x93, 0xea, 0x58, 0xf6, 0x54, 0xd0, 0x2f, 0xed, 0x94, 0xd9, 0x13, 0x68, 0x45, 0x1d, - 0x40, 0xf1, 0xf3, 0x44, 0xbf, 0xa4, 0x39, 0xc7, 0xf0, 0xa8, 0x5e, 0xac, 0xe8, 0x0d, 0xa5, 0x5f, - 0x78, 0x83, 0x60, 0x8f, 0xa1, 0xa9, 0x6b, 0x50, 0xe1, 0x43, 0x43, 0xbf, 0xb8, 0xc5, 0x46, 0x27, - 0x93, 0x7b, 0x7c, 0xd9, 0x3b, 0x4f, 0xbf, 0xf4, 0xaa, 0xc3, 0x9e, 0x02, 0xa4, 0xae, 0xd6, 0xa5, - 0x0f, 0x38, 0xfd, 0xf2, 0x2b, 0x0c, 0xc3, 0xb3, 0x13, 0x5f, 0x4b, 0x8b, 0x1f, 0x56, 0xfa, 0x65, - 0xb7, 0x8a, 0x49, 0x93, 0x1e, 0xdf, 0xbe, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xb9, - 0xeb, 0x12, 0xc7, 0x13, 0x00, 0x00, + // 1759 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdd, 0x6e, 0x1b, 0xb9, + 0x15, 0xb6, 0xfe, 0x35, 0x47, 0xb6, 0x64, 0xd3, 0x4e, 0xa2, 0x68, 0x51, 0xc4, 0x18, 0x14, 0x59, + 0xa5, 0xc9, 0x5a, 0xad, 0xb7, 0x09, 0x92, 0x6c, 0xb1, 0x68, 0x64, 0xa7, 0x91, 0xb0, 0x6d, 0x37, + 0x9d, 0x64, 0x53, 0xa0, 0x37, 0x02, 0xa5, 0xa1, 0xa5, 0x41, 0x34, 0x3f, 0x3b, 0xa4, 0xbc, 0x72, + 0x9e, 0x61, 0xef, 0x7b, 0xdd, 0xab, 0x3e, 0x41, 0x5f, 0xa1, 0x68, 0xd1, 0x07, 0xe8, 0x9d, 0x2f, + 0x16, 0xbd, 0xea, 0x53, 0x14, 0x87, 0xe4, 0xfc, 0x7a, 0x66, 0xb1, 0x68, 0x81, 0xde, 0x48, 0x3c, + 0x3c, 0xdf, 0x21, 0x79, 0xc8, 0xc3, 0xef, 0x9c, 0x21, 0x1c, 0x88, 0xab, 0x80, 0xf1, 0x91, 0xfc, + 0x3d, 0x09, 0x42, 0x5f, 0xf8, 0xa4, 0x21, 0x85, 0xc1, 0x27, 0x4b, 0x47, 0xac, 0x36, 0xf3, 0x93, + 0x85, 0xef, 0x8e, 0x96, 0xfe, 0xd2, 0x1f, 0x49, 0xed, 0x7c, 0x73, 0x21, 0x25, 0x29, 0xc8, 0x96, + 0xb2, 0x1a, 0x8c, 0x52, 0x70, 0xc1, 0x3c, 0x9b, 0x85, 0xae, 0xe3, 0x89, 0x91, 0x70, 0xd7, 0xce, + 0x9c, 0x8f, 0x16, 0xbe, 0xeb, 0xfa, 0x5e, 0x7a, 0x1a, 0xf3, 0xaf, 0x75, 0x68, 0x59, 0xec, 0xeb, + 0x0d, 0xe3, 0x82, 0x0c, 0xa1, 0xce, 0x16, 0x2b, 0xbf, 0x5f, 0x3d, 0xae, 0x0c, 0x3b, 0xa7, 0xe4, + 0x44, 0xe1, 0xb4, 0xf6, 0xe5, 0x62, 0xe5, 0x4f, 0x76, 0x2c, 0x89, 0x20, 0x0f, 0xa1, 0x71, 0xb1, + 0xde, 0xf0, 0x55, 0xbf, 0x26, 0xa1, 0x87, 0x59, 0xe8, 0xaf, 0x50, 0x35, 0xd9, 0xb1, 0x14, 0x06, + 0x87, 0x75, 0xbc, 0x0b, 0xbf, 0x5f, 0x2f, 0x1a, 0x76, 0xea, 0x5d, 0xc8, 0x61, 0x11, 0x41, 0x9e, + 0x02, 0x70, 0x26, 0x66, 0x7e, 0x20, 0x1c, 0xdf, 0xeb, 0x37, 0x24, 0xfe, 0x4e, 0x16, 0xff, 0x86, + 0x89, 0x2f, 0xa5, 0x7a, 0xb2, 0x63, 0x19, 0x3c, 0x12, 0xd0, 0xd2, 0xf1, 0x1c, 0x31, 0x5b, 0xac, + 0xa8, 0xe3, 0xf5, 0x9b, 0x45, 0x96, 0x53, 0xcf, 0x11, 0x67, 0xa8, 0x46, 0x4b, 0x27, 0x12, 0xd0, + 0x95, 0xaf, 0x37, 0x2c, 0xbc, 0xea, 0xb7, 0x8a, 0x5c, 0xf9, 0x1d, 0xaa, 0xd0, 0x15, 0x89, 0x21, + 0x9f, 0x41, 0x67, 0xce, 0x96, 0x8e, 0x37, 0x9b, 0xaf, 0xfd, 0xc5, 0xfb, 0x7e, 0x5b, 0x9a, 0xf4, + 0xb3, 0x26, 0x63, 0x04, 0x8c, 0x51, 0x3f, 0xd9, 0xb1, 0x60, 0x1e, 0x4b, 0xe4, 0x14, 0xda, 0x8b, + 0x15, 0x5b, 0xbc, 0x9f, 0x89, 0x6d, 0xdf, 0x90, 0x96, 0xb7, 0xb2, 0x96, 0x67, 0xa8, 0x7d, 0xbb, + 0x9d, 0xec, 0x58, 0xad, 0x85, 0x6a, 0xa2, 0x5f, 0x36, 0x5b, 0x3b, 0x97, 0x2c, 0x44, 0xab, 0xc3, + 0x22, 0xbf, 0xce, 0x95, 0x5e, 0xda, 0x19, 0x76, 0x24, 0x90, 0xc7, 0x60, 0x30, 0xcf, 0xd6, 0x0b, + 0xed, 0x48, 0xc3, 0xdb, 0xb9, 0x13, 0xf5, 0xec, 0x68, 0x99, 0x6d, 0xa6, 0xdb, 0xe4, 0x04, 0x9a, + 0x18, 0x25, 0x8e, 0xe8, 0xef, 0x4a, 0x9b, 0xa3, 0xdc, 0x12, 0xa5, 0x6e, 0xb2, 0x63, 0x69, 0xd4, + 0xb8, 0x05, 0x8d, 0x4b, 0xba, 0xde, 0x30, 0xf3, 0x63, 0xe8, 0xa4, 0x22, 0x85, 0xf4, 0xa1, 0xe5, + 0x32, 0xce, 0xe9, 0x92, 0xf5, 0x2b, 0xc7, 0x95, 0xa1, 0x61, 0x45, 0xa2, 0xd9, 0x85, 0xdd, 0x74, + 0x9c, 0xa4, 0x0c, 0x31, 0x16, 0xd0, 0xf0, 0x92, 0x85, 0x1c, 0x03, 0x40, 0x1b, 0x6a, 0xd1, 0x7c, + 0x0e, 0xfb, 0xf9, 0x20, 0x20, 0xfb, 0x50, 0x7b, 0xcf, 0xae, 0x34, 0x12, 0x9b, 0xe4, 0x48, 0x2f, + 0x48, 0x46, 0xb1, 0x61, 0xe9, 0xd5, 0x85, 0xb1, 0x6d, 0x1c, 0x06, 0xe4, 0x09, 0xc0, 0x25, 0x5d, + 0x3b, 0x36, 0x15, 0x7e, 0xc8, 0xfb, 0x95, 0xe3, 0xda, 0xb0, 0x73, 0xba, 0xaf, 0xdd, 0x7d, 0x17, + 0x29, 0xc6, 0xf5, 0xbf, 0x5d, 0xdf, 0xdb, 0xb1, 0x52, 0x48, 0x72, 0x1f, 0x7a, 0x34, 0x08, 0x66, + 0x5c, 0x50, 0xc1, 0x66, 0xf3, 0x2b, 0xc1, 0xb8, 0x9c, 0x6b, 0xd7, 0xda, 0xa3, 0x41, 0xf0, 0x06, + 0x7b, 0xc7, 0xd8, 0x69, 0xda, 0xb1, 0xa3, 0x32, 0x8a, 0x08, 0x81, 0xba, 0x4d, 0x05, 0x95, 0x8b, + 0xdd, 0xb5, 0x64, 0x1b, 0xfb, 0x02, 0x2a, 0x56, 0x7a, 0xb1, 0xb2, 0x4d, 0x6e, 0x43, 0x73, 0xc5, + 0x9c, 0xe5, 0x4a, 0xc8, 0xdb, 0x55, 0xb3, 0xb4, 0x84, 0x9e, 0x05, 0xa1, 0x7f, 0xc9, 0xe4, 0x45, + 0x6a, 0x5b, 0x4a, 0x30, 0xff, 0x51, 0x81, 0x83, 0x1b, 0x91, 0x87, 0xe3, 0xae, 0x28, 0x5f, 0x45, + 0x73, 0x61, 0x9b, 0x3c, 0xc4, 0x71, 0xa9, 0xcd, 0x42, 0x7d, 0xc1, 0xf7, 0xb4, 0xaf, 0x13, 0xd9, + 0xa9, 0x1d, 0xd5, 0x10, 0xf2, 0x10, 0x0e, 0xe8, 0x9c, 0x33, 0x4f, 0xcc, 0x52, 0x7b, 0x54, 0x3b, + 0xae, 0x0d, 0x1b, 0xd6, 0xbe, 0x52, 0xbc, 0x4b, 0x76, 0x64, 0x02, 0x47, 0xf3, 0xab, 0x0f, 0xd4, + 0x13, 0x8e, 0xc7, 0xd2, 0xf8, 0xba, 0xdc, 0xd3, 0x9e, 0x9e, 0xe7, 0xe5, 0xa5, 0x63, 0x33, 0x6f, + 0xc1, 0xf4, 0x4c, 0x87, 0xb1, 0x49, 0x32, 0x92, 0x79, 0x0c, 0xdd, 0xec, 0x65, 0x20, 0x5d, 0xa8, + 0x8a, 0xad, 0xf6, 0xa3, 0x2a, 0xb6, 0xa6, 0x19, 0x9f, 0x64, 0x1c, 0xf8, 0x37, 0x30, 0x0f, 0xa0, + 0x97, 0x8b, 0xf1, 0xd4, 0xa6, 0x56, 0xd2, 0x9b, 0x6a, 0xf6, 0x60, 0x2f, 0x13, 0xda, 0xe6, 0xb7, + 0x0d, 0x68, 0x5b, 0x8c, 0x07, 0xbe, 0xc7, 0x19, 0x79, 0x0a, 0x06, 0xdb, 0x2e, 0x98, 0xe2, 0xa3, + 0x4a, 0xee, 0xb6, 0x2b, 0xcc, 0xcb, 0x48, 0x8f, 0xd7, 0x2f, 0x06, 0x93, 0x07, 0x19, 0x2e, 0x3d, + 0xcc, 0x1b, 0xa5, 0xc9, 0xf4, 0x51, 0x96, 0x4c, 0x8f, 0x72, 0xd8, 0x1c, 0x9b, 0x3e, 0xc8, 0xb0, + 0x69, 0x7e, 0xe0, 0x0c, 0x9d, 0x3e, 0x2b, 0xa0, 0xd3, 0xfc, 0xf2, 0x4b, 0xf8, 0xf4, 0x59, 0x01, + 0x9f, 0xf6, 0x6f, 0xcc, 0x55, 0x48, 0xa8, 0x8f, 0xb2, 0x84, 0x9a, 0x77, 0x27, 0xc7, 0xa8, 0xbf, + 0x28, 0x62, 0xd4, 0xbb, 0x39, 0x9b, 0x52, 0x4a, 0xfd, 0xf4, 0x06, 0xa5, 0xde, 0xce, 0x99, 0x16, + 0x70, 0xea, 0xb3, 0x0c, 0xa7, 0x42, 0xa1, 0x6f, 0x25, 0xa4, 0xfa, 0xe4, 0x26, 0xa9, 0xde, 0xc9, + 0x1f, 0x6d, 0x11, 0xab, 0x8e, 0x72, 0xac, 0x7a, 0x2b, 0xbf, 0xca, 0x52, 0x5a, 0x7d, 0x80, 0xb7, + 0x3b, 0x17, 0x69, 0xc8, 0x04, 0x2c, 0x0c, 0xfd, 0x50, 0xf3, 0x9e, 0x12, 0xcc, 0x21, 0xf2, 0x4d, + 0x12, 0x5f, 0xdf, 0x43, 0xc1, 0x32, 0xe8, 0x53, 0xd1, 0x65, 0xfe, 0xb1, 0x92, 0xd8, 0x4a, 0x16, + 0x4e, 0x73, 0x95, 0xa1, 0xb9, 0x2a, 0xc5, 0xcc, 0xd5, 0x0c, 0x33, 0x93, 0x9f, 0xc0, 0xc1, 0x9a, + 0x72, 0xa1, 0xf6, 0x65, 0x96, 0x21, 0xaf, 0x1e, 0x2a, 0xd4, 0x86, 0x28, 0x16, 0xfb, 0x04, 0x0e, + 0x53, 0x58, 0x24, 0x52, 0x49, 0x54, 0x75, 0x79, 0x79, 0xf7, 0x63, 0xf4, 0x8b, 0x20, 0x98, 0x50, + 0xbe, 0x32, 0x7f, 0x93, 0xf8, 0x9f, 0xb0, 0x3e, 0x81, 0xfa, 0xc2, 0xb7, 0x95, 0x5b, 0x7b, 0x96, + 0x6c, 0x63, 0x26, 0x58, 0xfb, 0x4b, 0x39, 0xab, 0x61, 0x61, 0x13, 0x51, 0xf1, 0x4d, 0x31, 0xd4, + 0x95, 0x30, 0x0f, 0x93, 0xe1, 0xe2, 0xf0, 0x35, 0xff, 0x52, 0x49, 0xf6, 0x23, 0xa6, 0xea, 0xff, + 0x6e, 0x02, 0x3c, 0x1a, 0xc7, 0xb3, 0xd9, 0x56, 0x5e, 0xb7, 0x9a, 0xa5, 0x84, 0x28, 0x4d, 0x35, + 0xa5, 0x93, 0xd9, 0x34, 0xd5, 0x92, 0x7d, 0x4a, 0xd0, 0x14, 0xef, 0x5f, 0xc8, 0x7b, 0xb0, 0x6b, + 0x29, 0x21, 0xc5, 0x5d, 0x46, 0x86, 0xbb, 0x8e, 0x80, 0xdc, 0xbc, 0x21, 0xe6, 0xbf, 0x2a, 0xc8, + 0x7e, 0x99, 0xe8, 0x2f, 0xf4, 0x27, 0x3a, 0xe2, 0x6a, 0x2a, 0x1d, 0xfd, 0x30, 0x1f, 0x7f, 0x04, + 0xb0, 0xa4, 0x7c, 0xf6, 0x0d, 0xf5, 0x04, 0xb3, 0xb5, 0xa3, 0xc6, 0x92, 0xf2, 0xdf, 0xcb, 0x0e, + 0xf2, 0x1c, 0xea, 0x82, 0x2e, 0x79, 0xbf, 0x25, 0xd9, 0xbf, 0x7b, 0xa2, 0xaa, 0xce, 0x93, 0x2f, + 0xde, 0xbd, 0xa6, 0x4e, 0x38, 0xbe, 0x8d, 0xe4, 0xff, 0xef, 0xeb, 0x7b, 0x5d, 0xc4, 0x3c, 0xf2, + 0x5d, 0x47, 0x30, 0x37, 0x10, 0x57, 0x96, 0xb4, 0x21, 0x43, 0xa8, 0x5d, 0x30, 0xa6, 0x69, 0x60, + 0x3f, 0x36, 0x9d, 0x3e, 0xf9, 0xb9, 0x34, 0x56, 0x99, 0x03, 0x21, 0xe6, 0x3f, 0x2b, 0xc9, 0x51, + 0x26, 0x99, 0xe0, 0xff, 0xea, 0xe8, 0x5d, 0x68, 0xa3, 0x7a, 0xc3, 0x99, 0x2d, 0x8f, 0xb6, 0x66, + 0xb5, 0x96, 0x94, 0x7f, 0xc5, 0xff, 0xb7, 0x3d, 0x30, 0xff, 0x5c, 0xc1, 0x14, 0x97, 0x65, 0x13, + 0x72, 0x06, 0x07, 0x71, 0x62, 0x9d, 0x6d, 0x02, 0x9b, 0x62, 0xd9, 0xf1, 0xfd, 0x35, 0xcb, 0x7e, + 0x6c, 0xf0, 0x95, 0xc2, 0x93, 0xdf, 0xc2, 0x9d, 0x05, 0x8e, 0xea, 0xf1, 0x0d, 0x9f, 0x05, 0x34, + 0xa4, 0x6e, 0x3c, 0x54, 0x35, 0xc3, 0x9e, 0x67, 0x11, 0xea, 0x35, 0x82, 0xb8, 0x75, 0x6b, 0x91, + 0xe9, 0xd0, 0xe3, 0x99, 0x3f, 0xc6, 0x6c, 0x9d, 0x66, 0xb0, 0xa2, 0xbd, 0x36, 0xff, 0x54, 0x81, + 0x5e, 0x6e, 0x40, 0x32, 0x02, 0x50, 0x04, 0xc0, 0x9d, 0x0f, 0x4c, 0x67, 0xd6, 0xc8, 0x0f, 0xe9, + 0xf0, 0x1b, 0xe7, 0x03, 0xb3, 0x8c, 0x79, 0xd4, 0x24, 0xf7, 0xa1, 0x25, 0xb6, 0x0a, 0x9d, 0xad, + 0x5e, 0xde, 0x6e, 0x25, 0xb4, 0x29, 0xe4, 0x3f, 0x79, 0x0c, 0xbb, 0x6a, 0xe0, 0xa5, 0xcf, 0xb9, + 0x13, 0xe8, 0x9c, 0x4a, 0xd2, 0x43, 0xbf, 0x92, 0x1a, 0xab, 0x33, 0x4f, 0x04, 0xf3, 0x0f, 0x60, + 0xc4, 0xd3, 0x92, 0x8f, 0xc0, 0x70, 0xe9, 0x56, 0x97, 0x76, 0xb8, 0xb6, 0x86, 0xd5, 0x76, 0xe9, + 0x56, 0x56, 0x75, 0xe4, 0x0e, 0xb4, 0x50, 0x29, 0xb6, 0x6a, 0xcf, 0x1a, 0x56, 0xd3, 0xa5, 0xdb, + 0xb7, 0xdb, 0x58, 0xb1, 0xa4, 0x3c, 0xaa, 0xdb, 0x5c, 0xba, 0x7d, 0x45, 0xb9, 0xf9, 0x39, 0x34, + 0xd5, 0x22, 0x7f, 0xd0, 0xc0, 0x68, 0x5f, 0xcd, 0xd8, 0xff, 0x12, 0x3a, 0xa9, 0x75, 0x93, 0x9f, + 0xc1, 0x2d, 0xe5, 0x61, 0x40, 0x43, 0x21, 0x77, 0x24, 0x33, 0x20, 0x91, 0xca, 0xd7, 0x34, 0x14, + 0x38, 0xa5, 0xaa, 0x44, 0xff, 0x5e, 0x85, 0xa6, 0xaa, 0xf2, 0xc8, 0x7d, 0xcc, 0x98, 0xd4, 0xf1, + 0x66, 0x8e, 0xad, 0xc8, 0x7d, 0xdc, 0xf9, 0xee, 0xfa, 0x5e, 0x4b, 0x12, 0xe1, 0xf4, 0x1c, 0x93, + 0x24, 0x36, 0xec, 0x14, 0xe7, 0x54, 0x33, 0x45, 0x28, 0x81, 0xba, 0x70, 0x5c, 0xa6, 0x5d, 0x94, + 0x6d, 0x5c, 0xb9, 0xb7, 0x71, 0xe5, 0x96, 0xd4, 0xd5, 0x96, 0x78, 0x1b, 0x17, 0xb7, 0xe4, 0x15, + 0xec, 0xa5, 0xb8, 0xde, 0xb1, 0x75, 0x0d, 0xd2, 0x4d, 0x9f, 0xc6, 0xf4, 0x7c, 0x7c, 0x88, 0xe1, + 0xfa, 0xdd, 0xf5, 0xbd, 0xce, 0xaf, 0x23, 0xf6, 0x9f, 0x9e, 0x5b, 0x9d, 0x38, 0x15, 0x4c, 0x6d, + 0x32, 0x04, 0x99, 0x19, 0x66, 0x2a, 0x3b, 0xaa, 0x8c, 0xa1, 0xc8, 0xb4, 0x8b, 0xfd, 0x3a, 0x7d, + 0x62, 0x91, 0xfb, 0x11, 0x18, 0x18, 0x74, 0x0a, 0xa2, 0xb8, 0xb5, 0x8d, 0x1d, 0x52, 0xf9, 0x31, + 0xf4, 0x92, 0xea, 0x54, 0x41, 0x14, 0xd1, 0x76, 0x93, 0x6e, 0x09, 0xbc, 0x0b, 0xed, 0x38, 0x33, + 0x19, 0x12, 0xd1, 0xa2, 0x3a, 0x21, 0x7d, 0x09, 0x2d, 0xbd, 0xc4, 0xc2, 0x22, 0xfb, 0xa7, 0xd0, + 0xc0, 0x73, 0x89, 0x2e, 0x54, 0x54, 0xfd, 0xc8, 0xf3, 0x60, 0x22, 0x53, 0x6a, 0x2b, 0xa0, 0xf9, + 0x0c, 0xf6, 0x32, 0x5a, 0x4c, 0x02, 0xc2, 0x17, 0x74, 0xad, 0x0f, 0x54, 0x09, 0xf1, 0x64, 0xd5, + 0x64, 0x32, 0xf3, 0x39, 0x18, 0xf1, 0xa5, 0xc7, 0x53, 0x08, 0x36, 0xf3, 0x59, 0xf4, 0x39, 0xb4, + 0x6b, 0x35, 0x83, 0xcd, 0xfc, 0x0b, 0x95, 0x6a, 0x02, 0xff, 0x1b, 0x5d, 0xf6, 0xd7, 0x2c, 0x25, + 0x98, 0x9f, 0x41, 0x3b, 0x2a, 0xc8, 0xcb, 0x4d, 0x4b, 0xa2, 0xe0, 0xf4, 0xdb, 0x06, 0xf4, 0x5e, + 0x8c, 0xcf, 0xa6, 0x2f, 0x82, 0x60, 0xed, 0x2c, 0xa8, 0x4c, 0xca, 0x23, 0xa8, 0xcb, 0xb2, 0xa3, + 0xe0, 0xdd, 0x60, 0x50, 0x54, 0xff, 0x92, 0x53, 0x68, 0xc8, 0xea, 0x83, 0x14, 0x3d, 0x1f, 0x0c, + 0x0a, 0xcb, 0x60, 0x9c, 0x44, 0xd5, 0x27, 0x37, 0x5f, 0x11, 0x06, 0x45, 0xb5, 0x30, 0xf9, 0x1c, + 0x8c, 0xa4, 0x6e, 0x28, 0x7b, 0x4b, 0x18, 0x94, 0x56, 0xc5, 0x68, 0x9f, 0x64, 0x97, 0xb2, 0x2f, + 0xef, 0x41, 0x69, 0xf9, 0x48, 0x9e, 0x42, 0x2b, 0x4a, 0xc2, 0xc5, 0x5f, 0xfb, 0x83, 0x92, 0x8a, + 0x15, 0xb7, 0x47, 0x15, 0x23, 0x45, 0x4f, 0x12, 0x83, 0xc2, 0xb2, 0x9a, 0x3c, 0x86, 0xa6, 0x26, + 0xe2, 0xc2, 0xef, 0xf6, 0x41, 0x71, 0xdd, 0x89, 0x4e, 0x26, 0x9f, 0xc5, 0x65, 0xcf, 0x26, 0x83, + 0xd2, 0xfa, 0x9f, 0xbc, 0x00, 0x48, 0x7d, 0x7b, 0x96, 0xbe, 0x87, 0x0c, 0xca, 0xeb, 0x7a, 0x82, + 0xe1, 0x18, 0x7f, 0xab, 0x15, 0xbf, 0x53, 0x0c, 0xca, 0x4a, 0xed, 0x79, 0x53, 0xbe, 0x65, 0x7d, + 0xfa, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0xd7, 0x9f, 0xcd, 0x47, 0x13, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index c80261e08..ba8a23cfe 100644 --- a/types/types.proto +++ b/types/types.proto @@ -4,8 +4,11 @@ package types; // For more information on gogo.proto, see: // https://github.com/gogo/protobuf/blob/master/extensions.md import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "github.com/tendermint/tmlibs/common/types.proto"; // This file is copied from http://github.com/tendermint/abci +// NOTE: When using custom types, mind the warnings. +// https://github.com/gogo/protobuf/blob/master/custom_types.md#warnings-and-issues //---------------------------------------- // Request types @@ -37,16 +40,18 @@ message RequestInfo { string version = 1; } +// nondeterministic message RequestSetOption { string key = 1; string value = 2; } message RequestInitChain { - repeated Validator validators = 1; + repeated Validator validators = 1 [(gogoproto.nullable)=false]; + bytes app_state_bytes = 2; } -message RequestQuery{ +message RequestQuery { bytes data = 1; string path = 2; int64 height = 3; @@ -55,9 +60,9 @@ message RequestQuery{ message RequestBeginBlock { bytes hash = 1; - Header header = 2; + Header header = 2 [(gogoproto.nullable)=false]; repeated int32 absent_validators = 3; - repeated Evidence byzantine_validators = 4; + repeated Evidence byzantine_validators = 4 [(gogoproto.nullable)=false]; } message RequestCheckTx { @@ -68,7 +73,7 @@ message RequestDeliverTx { bytes tx = 1; } -message RequestEndBlock{ +message RequestEndBlock { int64 height = 1; } @@ -95,6 +100,7 @@ message Response { } } +// nondeterministic message ResponseException { string error = 1; } @@ -113,9 +119,12 @@ message ResponseInfo { bytes last_block_app_hash = 4; } +// nondeterministic message ResponseSetOption { uint32 code = 1; - string log = 2; + // bytes data = 2; + string log = 3; + string info = 4; } message ResponseInitChain { @@ -123,12 +132,14 @@ message ResponseInitChain { 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; + // bytes data = 2; // use "value" instead. + string log = 3; // nondeterministic + string info = 4; // nondeterministic + int64 index = 5; + bytes key = 6; + bytes value = 7; + bytes proof = 8; + int64 height = 9; } message ResponseBeginBlock { @@ -136,28 +147,34 @@ message ResponseBeginBlock { 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; + bytes data = 2; + string log = 3; // nondeterministic + string info = 4; // nondeterministic + int64 gas_wanted = 5; + // int64 gas_used = 6; + repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + common.KI64Pair fee = 8 [(gogoproto.nullable)=false]; } 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; + bytes data = 2; + string log = 3; // nondeterministic + string info = 4; // nondeterministic + int64 gas_wanted = 5; + int64 gas_used = 6; + repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + // common.KI64Pair fee = 8; } message ResponseEndBlock { - repeated Validator validator_updates = 1; + repeated Validator validator_updates = 1 [(gogoproto.nullable)=false]; 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; + // reserve 1 + bytes data = 2; } //---------------------------------------- @@ -179,7 +196,7 @@ message BlockSize { } // TxSize contain limits on the tx size. -message TxSize{ +message TxSize { int32 max_bytes = 1; int64 max_gas = 2; } @@ -195,11 +212,11 @@ message BlockGossip { // Blockchain Types message Header { - string chain_id = 1 [(gogoproto.customname) = "ChainID"]; + string chain_id = 1 [(gogoproto.customname)="ChainID"]; int64 height = 2; int64 time = 3; int32 num_txs = 4; - BlockID last_block_id = 5 [(gogoproto.customname) = "LastBlockID"]; + BlockID last_block_id = 5 [(gogoproto.customname)="LastBlockID", (gogoproto.nullable)=false]; bytes last_commit_hash = 6; bytes data_hash = 7; bytes validators_hash = 8; @@ -208,7 +225,7 @@ message Header { message BlockID { bytes hash = 1; - PartSetHeader parts = 2; + PartSetHeader parts = 2 [(gogoproto.nullable)=false]; } message PartSetHeader { @@ -226,20 +243,6 @@ message Evidence { int64 height = 2; } -//---------------------------------------- -// Abstract types - -message KVPair { - string key = 1; - enum Type { - STRING = 0; - INT = 1; - } - Type value_type = 2; - string value_string = 3; - int64 value_int = 4; -} - //---------------------------------------- // Service Definition diff --git a/types/util.go b/types/util.go index 17c53f659..39a24e02e 100644 --- a/types/util.go +++ b/types/util.go @@ -3,15 +3,12 @@ package types import ( "bytes" "encoding/json" - - "github.com/tendermint/go-wire/data" - cmn "github.com/tendermint/tmlibs/common" ) //------------------------------------------------------------------------------ // Validators is a list of validators that implements the Sort interface -type Validators []*Validator +type Validators []Validator func (v Validators) Len() int { return len(v) @@ -31,36 +28,16 @@ func (v Validators) Swap(i, j int) { func ValidatorsString(vs Validators) string { s := make([]validatorPretty, len(vs)) for i, v := range vs { - s[i] = validatorPretty{v.PubKey, v.Power} + s[i] = validatorPretty(v) } b, err := json.Marshal(s) if err != nil { - cmn.PanicSanity(err.Error()) + panic(err.Error()) } return string(b) } type validatorPretty struct { - PubKey data.Bytes `json:"pub_key"` - Power int64 `json:"power"` -} - -//------------------------------------------------------------------------------ - -// KVPairInt is a helper method to build KV pair with an integer value. -func KVPairInt(key string, val int64) *KVPair { - return &KVPair{ - Key: key, - ValueInt: val, - ValueType: KVPair_INT, - } -} - -// KVPairString is a helper method to build KV pair with a string value. -func KVPairString(key, val string) *KVPair { - return &KVPair{ - Key: key, - ValueString: val, - ValueType: KVPair_STRING, - } + PubKey []byte `json:"pub_key"` + Power int64 `json:"power"` } diff --git a/types/util_test.go b/types/util_test.go deleted file mode 100644 index d006d56b3..000000000 --- a/types/util_test.go +++ /dev/null @@ -1,15 +0,0 @@ -package types - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestKVPairInt(t *testing.T) { - assert.Equal(t, KVPairInt("a", 1), &KVPair{Key: "a", ValueType: KVPair_INT, ValueInt: 1}) -} - -func TestKVPairString(t *testing.T) { - assert.Equal(t, KVPairString("a", "b"), &KVPair{Key: "a", ValueType: KVPair_STRING, ValueString: "b"}) -} diff --git a/version/version.go b/version/version.go index 982a88867..4f7beb499 100644 --- a/version/version.go +++ b/version/version.go @@ -3,7 +3,7 @@ package version // NOTE: we should probably be versioning the ABCI and the abci-cli separately const Maj = "0" -const Min = "9" +const Min = "10" const Fix = "0" -const Version = "0.9.0" +const Version = "0.10.0"