Merge pull request #1915 from tendermint/release/v0.22.1

Release/v0.22.1

.github/CODEOWNERS

@@ -2,3 +2,6 @@
 
 # Everything goes through Bucky, Anton, Alex. For now.
 *       @ebuchman @melekes @xla
+
+# Precious documentation
+/docs/  @zramsay @jolesbi

.gitignore

@@ -18,6 +18,7 @@ docs/tools
 *.log
 abci-cli
 abci/types/types.pb.go
+docs/node_modules/
 
 scripts/wal2json/wal2json
 scripts/cutWALUntil/cutWALUntil

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.22.1
+
+*July 5th, 2018*
+
+IMPROVEMENTS
+
+* Cleanup post repo-merge.
+* [docs] Various improvements.
+
+BUG FIXES
+
+* [state] Return error when EndBlock returns a 0-power validator that isn't
+  already in the validator set.
+* [consensus] Shut down WAL properly.
+
 ## 0.22.0
 
 *July 2nd, 2018*

abci/specification.rst

@@ -1,294 +0,0 @@
-ABCI Specification
-==================
-
-NOTE: this file has moved to `specification.md <./specification.md>`__. It is left to prevent link breakages for the forseable future. It can safely be deleted in a few months.
-
-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 provide an overview of the messages types and how they
-are used by Tendermint. Then we describe each request-response pair as a
-function with arguments and return values, and add some notes on usage.
-
-Some messages (``Echo, Info, InitChain, BeginBlock, EndBlock, Commit``), don't
-return errors because an error would indicate a critical failure in the
-application and there's nothing Tendermint can do.  The problem should be
-addressed and both Tendermint and the application restarted.  All other
-messages (``SetOption, Query, CheckTx, DeliverTx``) return an
-application-specific response ``Code uint32``, where only ``0`` is reserved for
-``OK``.
-
-Some messages (``SetOption, Query, CheckTx, DeliverTx``) return
-non-deterministic data in the form of ``Info`` and ``Log``. The ``Log`` is
-intended for the literal output from the application's logger, while the
-``Info`` is any additional info that should be returned.
-
-The first time a new blockchain is started, Tendermint calls ``InitChain``.
-From then on, the Block Execution Sequence that causes the committed state to
-be updated is as follows:
-
-``BeginBlock, [DeliverTx], EndBlock, Commit``
-
-where one ``DeliverTx`` is called for each transaction in the block.
-Cryptographic commitments to the results of DeliverTx, EndBlock, and
-Commit are included in the header of the next block.
-
-Tendermint opens three connections to the application to handle the different message
-types:
-
-- ``Consensus Connection - InitChain, BeginBlock, DeliverTx, EndBlock, Commit``
-
-- ``Mempool Connection - CheckTx``
-
-- ``Info Connection - Info, SetOption, Query``
-
-The ``Flush`` message is used on every connection, and the ``Echo`` message
-is only used for debugging.
-
-Note that messages may be sent concurrently across all connections -
-a typical application will thus maintain a distinct state for each
-connection. They may be referred to as the ``DeliverTx state``, the
-``CheckTx state``, and the ``Commit state`` respectively.
-
-See below for more details on the message types and how they are used.
-
-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
-^^^^
-
--  **Arguments**:
-
-   -  ``Version (string)``: The Tendermint version
-
--  **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 Tendermint with the application during a handshake that
-     happens on startup.
-   - Tendermint expects ``LastBlockAppHash`` and ``LastBlockHeight`` to be
-     updated during ``Commit``, ensuring that ``Commit`` is never called twice
-     for the same block height.
-
-SetOption
-^^^^^^^^^
-
--  **Arguments**:
-
-   -  ``Key (string)``: Key to set
-   -  ``Value (string)``: Value to set for key
-
--  **Returns**:
-
-   -  ``Code (uint32)``: Response code
-   -  ``Log (string)``: The output of the application's logger. May be non-deterministic.
-   -  ``Info (string)``: Additional information. May be non-deterministic.
-
--  **Usage**:
-
-   - Set non-consensus critical application specific options.
-   - e.g. Key="min-fee", Value="100fermion" could set the minimum fee required for CheckTx
-     (but not DeliverTx - that would be consensus critical).
-
-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.
-   -  ``Log (string)``: The output of the application's logger. May be non-deterministic.
-   -  ``Info (string)``: Additional information. May be non-deterministic.
-   -  ``Index (int64)``: The index of the key in the tree.
-   -  ``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
-
--  **Usage**:
-
-   - Query for data from the application at current or past height.
-   - Optionally return Merkle proof.
-
-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**:
-
-   -  ``Tx ([]byte)``: The request transaction bytes
-
--  **Returns**:
-
-   -  ``Code (uint32)``: Response code
-   -  ``Data ([]byte)``: Result bytes, if any.
-   -  ``Log (string)``: The output of the application's logger. May be non-deterministic.
-   -  ``Info (string)``: Additional information. May be non-deterministic.
-   -  ``GasWanted (int64)``: Amount of gas request for transaction.
-   -  ``GasUsed (int64)``: Amount of gas consumed by transaction.
-   -  ``Tags ([]cmn.KVPair)``: Key-Value tags for filtering and indexing transactions (eg. by account).
-   -  ``Fee (cmn.KI64Pair)``: Fee paid for the transaction.
-
--  **Usage**: Validate a mempool transaction, prior to broadcasting or
-   proposing. CheckTx should perform stateful but light-weight checks
-   of the validity of the transaction (like checking signatures and account balances),
-   but need not execute in full (like running a smart contract).
-
-   Tendermint runs CheckTx and DeliverTx concurrently with eachother,
-   though on distinct ABCI connections - the mempool connection and the consensus
-   connection, respectively.
-
-   The application should maintain a separate state to support CheckTx.
-   This state can be reset to the latest committed state during ``Commit``,
-   where Tendermint ensures the mempool is locked and not sending new ``CheckTx``.
-   After ``Commit``, the mempool will rerun CheckTx on all remaining
-   transactions, throwing out any that are no longer valid.
-
-   Keys and values in Tags must be UTF-8 encoded strings (e.g. "account.owner": "Bob", "balance": "100.0", "date": "2018-01-02")
-
-
-DeliverTx
-^^^^^^^^^
-
--  **Arguments**:
-
-   -  ``Tx ([]byte)``: The request transaction bytes.
-
--  **Returns**:
-
-   -  ``Code (uint32)``: Response code.
-   -  ``Data ([]byte)``: Result bytes, if any.
-   -  ``Log (string)``: The output of the application's logger. May be non-deterministic.
-   -  ``Info (string)``: Additional information. May be non-deterministic.
-   -  ``GasWanted (int64)``: Amount of gas requested for transaction.
-   -  ``GasUsed (int64)``: Amount of gas consumed by transaction.
-   -  ``Tags ([]cmn.KVPair)``: Key-Value tags for filtering and indexing transactions (eg. by account).
-   -  ``Fee (cmn.KI64Pair)``: Fee paid for the transaction.
-
--  **Usage**:
-
-   - Deliver a transaction to be executed in full by the application. If the transaction is valid,
-     returns CodeType.OK.
-   - Keys and values in Tags must be UTF-8 encoded strings (e.g. "account.owner": "Bob", "balance": "100.0", "time": "2018-01-02T12:30:00Z")
-
-EndBlock
-^^^^^^^^
-
--  **Arguments**:
-
-   -  ``Height (int64)``: Height of the block just executed.
-
--  **Returns**:
-
-   -  ``ValidatorUpdates ([]Validator)``: Changes to validator set (set
-      voting power to 0 to remove).
-   -  ``ConsensusParamUpdates (ConsensusParams)``: Changes to
-      consensus-critical time, size, and other parameters.
-
--  **Usage**:
-
-   - Signals the end of a block.
-   - Called prior to each Commit, after all transactions.
-   - Validator set and consensus params are updated with the result.
-   - Validator pubkeys are expected to be go-wire encoded.
-
-Commit
-^^^^^^
-
--  **Returns**:
-
-   -  ``Data ([]byte)``: The Merkle root hash
-
--  **Usage**:
-
-   - Persist the application state.
-   - Return a Merkle root hash of the application state.
-   - It's critical that all application instances return the same hash. If not,
-     they will not be able to agree on the next block, because the hash is
-     included in the next block!

consensus/reactor.go

@@ -80,6 +80,7 @@ func (conR *ConsensusReactor) OnStop() {
 	conR.BaseReactor.OnStop()
 	conR.unsubscribeFromBroadcastEvents()
 	conR.conS.Stop()
+	conR.conS.Wait()
 }
 
 // SwitchToConsensus switches from fast_sync mode to consensus mode.

consensus/state.go

@@ -314,13 +314,8 @@ func (cs *ConsensusState) startRoutines(maxSteps int) {
 
 // OnStop implements cmn.Service. It stops all routines and waits for the WAL to finish.
 func (cs *ConsensusState) OnStop() {
-	cs.BaseService.OnStop()
-
 	cs.evsw.Stop()
-
 	cs.timeoutTicker.Stop()
-
-	cs.wal.Stop()
 }
 
 // Wait waits for the the main routine to return.
@@ -600,6 +595,7 @@ func (cs *ConsensusState) receiveRoutine(maxSteps int) {
 
 			// close wal now that we're done writing to it
 			cs.wal.Stop()
+			cs.wal.Wait()
 
 			close(cs.done)
 			return

crypto/Gopkg.lock

@@ -1,137 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/btcsuite/btcd"
-  packages = ["btcec"]
-  revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/btcsuite/btcutil"
-  packages = ["base58"]
-  revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
-
-[[projects]]
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/go-kit/kit"
-  packages = [
-    "log",
-    "log/level",
-    "log/term"
-  ]
-  revision = "4dc7be5d2d12881735283bcab7352178e190fc71"
-  version = "v0.6.0"
-
-[[projects]]
-  name = "github.com/go-logfmt/logfmt"
-  packages = ["."]
-  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
-  version = "v0.3.0"
-
-[[projects]]
-  name = "github.com/go-stack/stack"
-  packages = ["."]
-  revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
-  version = "v1.7.0"
-
-[[projects]]
-  name = "github.com/gogo/protobuf"
-  packages = [
-    "gogoproto",
-    "proto",
-    "protoc-gen-gogo/descriptor"
-  ]
-  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/kr/logfmt"
-  packages = ["."]
-  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
-
-[[projects]]
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require"
-  ]
-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
-  version = "v1.2.2"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/tendermint/ed25519"
-  packages = [
-    ".",
-    "edwards25519",
-    "extra25519"
-  ]
-  revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057"
-
-[[projects]]
-  name = "github.com/tendermint/go-amino"
-  packages = ["."]
-  revision = "2106ca61d91029c931fd54968c2bb02dc96b1412"
-  version = "0.10.1"
-
-[[projects]]
-  name = "github.com/tendermint/tmlibs"
-  packages = [
-    "common",
-    "log",
-    "test"
-  ]
-  revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38"
-  version = "v0.8.4"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-  packages = [
-    "bcrypt",
-    "blowfish",
-    "chacha20poly1305",
-    "hkdf",
-    "internal/chacha20",
-    "internal/subtle",
-    "nacl/secretbox",
-    "openpgp/armor",
-    "openpgp/errors",
-    "poly1305",
-    "ripemd160",
-    "salsa20/salsa"
-  ]
-  revision = "7f39a6fea4fe9364fb61e1def6a268a51b4f3a06"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/sys"
-  packages = ["cpu"]
-  revision = "ad87a3a340fa7f3bed189293fbfa7a9b7e021ae1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "027b22b86396a971d5d5c1d298947f531f39743975d65a22e98601140aa1b1a1"
-  solver-name = "gps-cdcl"
-  solver-version = 1

crypto/Gopkg.toml

@@ -1,49 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-[[constraint]]
-  name = "github.com/btcsuite/btcutil"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.1"
-
-[[constraint]]
-  name = "github.com/tendermint/ed25519"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/tendermint/go-amino"
-  version = "0.10.0-rc2"
-
-[[constraint]]
-  name = "github.com/tendermint/tmlibs"
-  version = "0.8.1"
-
-[prune]
-  go-tests = true
-  unused-packages = true

crypto/LICENSE

@@ -1,193 +0,0 @@
-Tendermint Go-Crypto
-Copyright (C) 2015 Tendermint
-
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

docs/DOCS_README.md

@@ -0,0 +1,19 @@
+# Documentation Maintenance Overview
+
+The documentation found in this directory is hosted at:
+
+- https://tendermint.com/docs/
+
+and built using [VuePress](https://vuepress.vuejs.org/) from the tendermint website repo:
+
+- https://github.com/tendermint/tendermint.com
+
+which has a [configuration file](https://github.com/tendermint/tendermint.com/blob/develop/docs/.vuepress/config.js) for displaying
+the Table of Contents that lists all the documentation.
+
+The `README.md` in this directory is the landing page for
+website documentation and the following folders are intentionally
+ommitted:
+
+- `architecture/` ==> contains Architecture Design Records
+- `spec/` ==> contains the detailed specification

docs/abci-cli.md

@@ -10,41 +10,47 @@ Make sure you [have Go installed](https://golang.org/doc/install).
 
 Next, install the `abci-cli` tool and example applications:
 
-    go get github.com/tendermint/tendermint
+```
+go get github.com/tendermint/tendermint
+```
 
 to get vendored dependencies:
 
-    cd $GOPATH/src/github.com/tendermint/tendermint
-    make get_tools
-    make get_vendor_deps
-    make install_abci
+```
+cd $GOPATH/src/github.com/tendermint/tendermint
+make get_tools
+make get_vendor_deps
+make install_abci
+```
 
 Now run `abci-cli` to see the list of commands:
 
-    Usage:
-      abci-cli [command]
-
-    Available Commands:
-      batch       Run a batch of abci commands against an application
-      check_tx    Validate a tx
-      commit      Commit the application state and return the Merkle root hash
-      console     Start an interactive abci console for multiple commands
-      counter     ABCI demo example
-      deliver_tx  Deliver a new tx to the application
-      kvstore       ABCI demo example
-      echo        Have the application echo a message
-      help        Help about any command
-      info        Get some info about the application
-      query       Query the application state
-      set_option  Set an options on the application
-
-    Flags:
-          --abci string      socket or grpc (default "socket")
-          --address string   address of application socket (default "tcp://127.0.0.1:26658")
-      -h, --help             help for abci-cli
-      -v, --verbose          print the command and results as if it were a console session
-
-    Use "abci-cli [command] --help" for more information about a command.
+```
+Usage:
+  abci-cli [command]
+
+Available Commands:
+  batch       Run a batch of abci commands against an application
+  check_tx    Validate a tx
+  commit      Commit the application state and return the Merkle root hash
+  console     Start an interactive abci console for multiple commands
+  counter     ABCI demo example
+  deliver_tx  Deliver a new tx to the application
+  kvstore       ABCI demo example
+  echo        Have the application echo a message
+  help        Help about any command
+  info        Get some info about the application
+  query       Query the application state
+  set_option  Set an options on the application
+
+Flags:
+      --abci string      socket or grpc (default "socket")
+      --address string   address of application socket (default "tcp://127.0.0.1:26658")
+  -h, --help             help for abci-cli
+  -v, --verbose          print the command and results as if it were a console session
+
+Use "abci-cli [command] --help" for more information about a command.
+```
 
 ## KVStore - First Example
 
@@ -63,59 +69,69 @@ Its code can be found
 [here](https://github.com/tendermint/tendermint/blob/develop/abci/cmd/abci-cli/abci-cli.go)
 and looks like:
 
-    func cmdKVStore(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 = kvstore.NewKVStoreApplication()
-        } else {
-            app = kvstore.NewPersistentKVStoreApplication(flagPersist)
-            app.(*kvstore.PersistentKVStoreApplication).SetLogger(logger.With("module", "kvstore"))
-        }
-    
-        // 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
+```
+func cmdKVStore(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 = kvstore.NewKVStoreApplication()
+    } else {
+        app = kvstore.NewPersistentKVStoreApplication(flagPersist)
+        app.(*kvstore.PersistentKVStoreApplication).SetLogger(logger.With("module", "kvstore"))
     }
 
+    // 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
+}
+```
+
 Start by running:
 
-    abci-cli kvstore
+```
+abci-cli kvstore
+```
 
 And in another terminal, run
 
-    abci-cli echo hello
-    abci-cli info
+```
+abci-cli echo hello
+abci-cli info
+```
 
 You'll see something like:
 
-    -> data: hello
-    -> data.hex: 68656C6C6F
+```
+-> data: hello
+-> data.hex: 68656C6C6F
+```
 
 and:
 
-    -> data: {"size":0}
-    -> data.hex: 7B2273697A65223A307D
+```
+-> data: {"size":0}
+-> data.hex: 7B2273697A65223A307D
+```
 
 An ABCI application must provide two things:
 
--   a socket server
--   a handler for ABCI messages
+- a socket server
+- a handler for ABCI messages
 
 When we run the `abci-cli` tool we open a new connection to the
 application's socket server, send the given ABCI message, and wait for a
@@ -144,52 +160,54 @@ speaking ABCI messages to your application.
 
 Try running these commands:
 
-    > echo hello
-    -> code: OK
-    -> data: hello
-    -> data.hex: 0x68656C6C6F
-
-    > info
-    -> code: OK
-    -> data: {"size":0}
-    -> data.hex: 0x7B2273697A65223A307D
-
-    > commit
-    -> code: OK
-    -> data.hex: 0x0000000000000000
-
-    > deliver_tx "abc"
-    -> code: OK
-
-    > info
-    -> code: OK
-    -> data: {"size":1}
-    -> data.hex: 0x7B2273697A65223A317D
-
-    > commit
-    -> code: OK
-    -> data.hex: 0x0200000000000000
-
-    > query "abc"
-    -> code: OK
-    -> log: exists
-    -> height: 0
-    -> value: abc
-    -> value.hex: 616263
-
-    > deliver_tx "def=xyz"
-    -> code: OK
-
-    > commit
-    -> code: OK
-    -> data.hex: 0x0400000000000000
-
-    > query "def"
-    -> code: OK
-    -> log: exists
-    -> height: 0
-    -> value: xyz
-    -> value.hex: 78797A
+```
+> echo hello
+-> code: OK
+-> data: hello
+-> data.hex: 0x68656C6C6F
+
+> info
+-> code: OK
+-> data: {"size":0}
+-> data.hex: 0x7B2273697A65223A307D
+
+> commit
+-> code: OK
+-> data.hex: 0x0000000000000000
+
+> deliver_tx "abc"
+-> code: OK
+
+> info
+-> code: OK
+-> data: {"size":1}
+-> data.hex: 0x7B2273697A65223A317D
+
+> commit
+-> code: OK
+-> data.hex: 0x0200000000000000
+
+> query "abc"
+-> code: OK
+-> log: exists
+-> height: 0
+-> value: abc
+-> value.hex: 616263
+
+> deliver_tx "def=xyz"
+-> code: OK
+
+> commit
+-> code: OK
+-> data.hex: 0x0400000000000000
+
+> query "def"
+-> code: OK
+-> log: exists
+-> height: 0
+-> value: xyz
+-> value.hex: 78797A
+```
 
 Note that if we do `deliver_tx "abc"` it will store `(abc, abc)`, but if
 we do `deliver_tx "abc=efg"` it will store `(abc, efg)`.
@@ -206,29 +224,31 @@ Like the kvstore app, its code can be found
 [here](https://github.com/tendermint/tendermint/blob/master/abci/cmd/abci-cli/abci-cli.go)
 and looks like:
 
-    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
+```
+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
+}
+```
 
 The counter app doesn't use a Merkle tree, it just counts how many times
 we've sent a transaction, asked for a hash, or committed the state. The
@@ -256,38 +276,42 @@ whose integer is greater than the last committed one.
 Let's kill the console and the kvstore application, and start the
 counter app:
 
-    abci-cli counter
+```
+abci-cli counter
+```
 
 In another window, start the `abci-cli console`:
 
-    > set_option serial on
-    -> code: OK
-    -> log: OK (SetOption doesn't return anything.)
+```
+> set_option serial on
+-> code: OK
+-> log: OK (SetOption doesn't return anything.)
 
-    > check_tx 0x00
-    -> code: OK
+> check_tx 0x00
+-> code: OK
 
-    > check_tx 0xff
-    -> code: OK
+> check_tx 0xff
+-> code: OK
 
-    > deliver_tx 0x00
-    -> code: OK
+> deliver_tx 0x00
+-> code: OK
 
-    > check_tx 0x00
-    -> code: BadNonce
-    -> log: Invalid nonce. Expected >= 1, got 0
+> check_tx 0x00
+-> code: BadNonce
+-> log: Invalid nonce. Expected >= 1, got 0
 
-    > deliver_tx 0x01
-    -> code: OK
+> deliver_tx 0x01
+-> code: OK
 
-    > deliver_tx 0x04
-    -> code: BadNonce
-    -> log: Invalid nonce. Expected 2, got 4
+> deliver_tx 0x04
+-> code: BadNonce
+-> log: Invalid nonce. Expected 2, got 4
 
-    > info
-    -> code: OK
-    -> data: {"hashes":0,"txs":2}
-    -> data.hex: 0x7B22686173686573223A302C22747873223A327D
+> info
+-> code: OK
+-> data: {"hashes":0,"txs":2}
+-> data.hex: 0x7B22686173686573223A302C22747873223A327D
+```
 
 This is a very simple application, but between `counter` and `kvstore`,
 its easy to see how you can build out arbitrary application states on
@@ -304,7 +328,9 @@ example directory](https://github.com/tendermint/tendermint/tree/develop/abci/ex
 
 To run the Node JS version, `cd` to `example/js` and run
 
-    node app.js
+```
+node app.js
+```
 
 (you'll have to kill the other counter application process). In another
 window, run the console and those previous ABCI commands. You should get

docs/abci-spec.md

@@ -3,7 +3,7 @@
 ## Message Types
 
 ABCI requests/responses are defined as simple Protobuf messages in [this
-schema file](https://github.com/tendermint/tendermint/blob/develop/abci/types/types.proto).
+schema file](https://github.com/tendermint/tendermint/blob/master/abci/types/types.proto).
 TendermintCore sends the requests, and the ABCI application sends the
 responses. Here, we provide an overview of the messages types and how
 they are used by Tendermint. Then we describe each request-response pair
@@ -36,9 +36,9 @@ Commit are included in the header of the next block.
 Tendermint opens three connections to the application to handle the
 different message types:
 
--   `Consensus Connection - InitChain, BeginBlock, DeliverTx, EndBlock, Commit`
--   `Mempool Connection - CheckTx`
--   `Info Connection - Info, SetOption, Query`
+- `Consensus Connection - InitChain, BeginBlock, DeliverTx, EndBlock, Commit`
+- `Mempool Connection - CheckTx`
+- `Info Connection - Info, SetOption, Query`
 
 The `Flush` message is used on every connection, and the `Echo` message
 is only used for debugging.
@@ -54,271 +54,272 @@ See below for more details on the message types and how they are used.
 
 ### Echo
 
--   **Request**:
-    -   `Message (string)`: A string to echo back
--   **Response**:
-    -   `Message (string)`: The input string
--   **Usage**:
-    -   Echo a string to test an abci client/server implementation
+- **Request**:
+  - `Message (string)`: A string to echo back
+- **Response**:
+  - `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.
+- **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
 
--   **Request**:
-    -   `Version (string)`: The Tendermint version
--   **Response**:
-    -   `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 Tendermint with the application during a handshake
-        that happens on startup.
-    -   Tendermint expects `LastBlockAppHash` and `LastBlockHeight` to
-        be updated during `Commit`, ensuring that `Commit` is never
-        called twice for the same block height.
+- **Request**:
+  - `Version (string)`: The Tendermint version
+- **Response**:
+  - `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 Tendermint with the application during a handshake
+    that happens on startup.
+  - Tendermint expects `LastBlockAppHash` and `LastBlockHeight` to
+    be updated during `Commit`, ensuring that `Commit` is never
+    called twice for the same block height.
 
 ### SetOption
 
--   **Request**:
-    -   `Key (string)`: Key to set
-    -   `Value (string)`: Value to set for key
--   **Response**:
-    -   `Code (uint32)`: Response code
-    -   `Log (string)`: The output of the application's logger. May
-        be non-deterministic.
-    -   `Info (string)`: Additional information. May
-        be non-deterministic.
--   **Usage**:
-    -   Set non-consensus critical application specific options.
-    -   e.g. Key="min-fee", Value="100fermion" could set the minimum fee
-        required for CheckTx (but not DeliverTx - that would be
-        consensus critical).
+- **Request**:
+  - `Key (string)`: Key to set
+  - `Value (string)`: Value to set for key
+- **Response**:
+  - `Code (uint32)`: Response code
+  - `Log (string)`: The output of the application's logger. May
+    be non-deterministic.
+  - `Info (string)`: Additional information. May
+    be non-deterministic.
+- **Usage**:
+  - Set non-consensus critical application specific options.
+  - e.g. Key="min-fee", Value="100fermion" could set the minimum fee
+    required for CheckTx (but not DeliverTx - that would be
+    consensus critical).
 
 ### InitChain
 
--   **Request**:
-    -   `Validators ([]Validator)`: Initial genesis validators
-    -   `AppStateBytes ([]byte)`: Serialized initial application state
--   **Response**:
-    -   `ConsensusParams (ConsensusParams)`: Initial
-        consensus-critical parameters.
-    -   `Validators ([]Validator)`: Initial validator set.
--   **Usage**:
-    -   Called once upon genesis.
+- **Request**:
+  - `Validators ([]Validator)`: Initial genesis validators
+  - `AppStateBytes ([]byte)`: Serialized initial application state
+- **Response**:
+  - `ConsensusParams (ConsensusParams)`: Initial
+    consensus-critical parameters.
+  - `Validators ([]Validator)`: Initial validator set.
+- **Usage**:
+  - Called once upon genesis.
 
 ### Query
 
--   **Request**:
-    -   `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
--   **Response**:
-    -   `Code (uint32)`: Response code.
-    -   `Log (string)`: The output of the application's logger. May
-        be non-deterministic.
-    -   `Info (string)`: Additional information. May
-        be non-deterministic.
-    -   `Index (int64)`: The index of the key in the tree.
-    -   `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
--   **Usage**:
-    -   Query for data from the application at current or past height.
-    -   Optionally return Merkle proof.
+- **Request**:
+  - `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
+- **Response**:
+  - `Code (uint32)`: Response code.
+  - `Log (string)`: The output of the application's logger. May
+    be non-deterministic.
+  - `Info (string)`: Additional information. May
+    be non-deterministic.
+  - `Index (int64)`: The index of the key in the tree.
+  - `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
+- **Usage**:
+  - Query for data from the application at current or past height.
+  - Optionally return Merkle proof.
 
 ### BeginBlock
 
--   **Request**:
-    -   `Hash ([]byte)`: The block's hash. This can be derived from the
-        block header.
-    -   `Header (struct{})`: The block header
-    -   `Validators ([]SigningValidator)`: List of validators in the current validator
-        set and whether or not they signed a vote in the LastCommit
-    -   `ByzantineValidators ([]Evidence)`: List of evidence of
-        validators that acted maliciously
--   **Response**:
-    -   `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
--   **Usage**:
-    -   Signals the beginning of a new block. Called prior to
-        any DeliverTxs.
-    -   The header is expected to at least contain the Height.
-    -   The `Validators` and `ByzantineValidators` can be used to
-        determine rewards and punishments for the validators.
+- **Request**:
+  - `Hash ([]byte)`: The block's hash. This can be derived from the
+    block header.
+  - `Header (struct{})`: The block header
+  - `Validators ([]SigningValidator)`: List of validators in the current validator
+    set and whether or not they signed a vote in the LastCommit
+  - `ByzantineValidators ([]Evidence)`: List of evidence of
+    validators that acted maliciously
+- **Response**:
+  - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
+- **Usage**:
+  - Signals the beginning of a new block. Called prior to
+    any DeliverTxs.
+  - The header is expected to at least contain the Height.
+  - The `Validators` and `ByzantineValidators` can be used to
+    determine rewards and punishments for the validators.
 
 ### CheckTx
 
--   **Request**:
-    -   `Tx ([]byte)`: The request transaction bytes
--   **Response**:
-    -   `Code (uint32)`: Response code
-    -   `Data ([]byte)`: Result bytes, if any.
-    -   `Log (string)`: The output of the application's logger. May
-        be non-deterministic.
-    -   `Info (string)`: Additional information. May
-        be non-deterministic.
-    -   `GasWanted (int64)`: Amount of gas request for transaction.
-    -   `GasUsed (int64)`: Amount of gas consumed by transaction.
-    -   `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
-        transactions (eg. by account).
-    -   `Fee (cmn.KI64Pair)`: Fee paid for the transaction.
--   **Usage**: Validate a mempool transaction, prior to broadcasting
-    or proposing. CheckTx should perform stateful but light-weight
-    checks of the validity of the transaction (like checking signatures
-    and account balances), but need not execute in full (like running a
-    smart contract).
-
-    Tendermint runs CheckTx and DeliverTx concurrently with eachother,
-    though on distinct ABCI connections - the mempool connection and the
-    consensus connection, respectively.
-
-    The application should maintain a separate state to support CheckTx.
-    This state can be reset to the latest committed state during
-    `Commit`, where Tendermint ensures the mempool is locked and not
-    sending new `CheckTx`. After `Commit`, the mempool will rerun
-    CheckTx on all remaining transactions, throwing out any that are no
-    longer valid.
-
-    Keys and values in Tags must be UTF-8 encoded strings (e.g.
-    "account.owner": "Bob", "balance": "100.0", "date": "2018-01-02")
+- **Request**:
+  - `Tx ([]byte)`: The request transaction bytes
+- **Response**:
+  - `Code (uint32)`: Response code
+  - `Data ([]byte)`: Result bytes, if any.
+  - `Log (string)`: The output of the application's logger. May
+    be non-deterministic.
+  - `Info (string)`: Additional information. May
+    be non-deterministic.
+  - `GasWanted (int64)`: Amount of gas request for transaction.
+  - `GasUsed (int64)`: Amount of gas consumed by transaction.
+  - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
+    transactions (eg. by account).
+  - `Fee (cmn.KI64Pair)`: Fee paid for the transaction.
+- **Usage**: Validate a mempool transaction, prior to broadcasting
+  or proposing. CheckTx should perform stateful but light-weight
+  checks of the validity of the transaction (like checking signatures
+  and account balances), but need not execute in full (like running a
+  smart contract).
+
+  Tendermint runs CheckTx and DeliverTx concurrently with eachother,
+  though on distinct ABCI connections - the mempool connection and the
+  consensus connection, respectively.
+
+  The application should maintain a separate state to support CheckTx.
+  This state can be reset to the latest committed state during
+  `Commit`. Before calling Commit, Tendermint will lock and flush the mempool,
+  ensuring that all existing CheckTx are responded to and no new ones can
+  begin. After `Commit`, the mempool will rerun
+  CheckTx for all remaining transactions, throwing out any that are no longer valid.
+  Then the mempool will unlock and start sending CheckTx again.
+
+  Keys and values in Tags must be UTF-8 encoded strings (e.g.
+  "account.owner": "Bob", "balance": "100.0", "date": "2018-01-02")
 
 ### DeliverTx
 
--   **Request**:
-    -   `Tx ([]byte)`: The request transaction bytes.
--   **Response**:
-    -   `Code (uint32)`: Response code.
-    -   `Data ([]byte)`: Result bytes, if any.
-    -   `Log (string)`: The output of the application's logger. May
-        be non-deterministic.
-    -   `Info (string)`: Additional information. May
-        be non-deterministic.
-    -   `GasWanted (int64)`: Amount of gas requested for transaction.
-    -   `GasUsed (int64)`: Amount of gas consumed by transaction.
-    -   `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
-        transactions (eg. by account).
-    -   `Fee (cmn.KI64Pair)`: Fee paid for the transaction.
--   **Usage**:
-    -   Deliver a transaction to be executed in full by the application.
-        If the transaction is valid, returns CodeType.OK.
-    -   Keys and values in Tags must be UTF-8 encoded strings (e.g.
-        "account.owner": "Bob", "balance": "100.0",
-        "time": "2018-01-02T12:30:00Z")
+- **Request**:
+  - `Tx ([]byte)`: The request transaction bytes.
+- **Response**:
+  - `Code (uint32)`: Response code.
+  - `Data ([]byte)`: Result bytes, if any.
+  - `Log (string)`: The output of the application's logger. May
+    be non-deterministic.
+  - `Info (string)`: Additional information. May
+    be non-deterministic.
+  - `GasWanted (int64)`: Amount of gas requested for transaction.
+  - `GasUsed (int64)`: Amount of gas consumed by transaction.
+  - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
+    transactions (eg. by account).
+  - `Fee (cmn.KI64Pair)`: Fee paid for the transaction.
+- **Usage**:
+  - Deliver a transaction to be executed in full by the application.
+    If the transaction is valid, returns CodeType.OK.
+  - Keys and values in Tags must be UTF-8 encoded strings (e.g.
+    "account.owner": "Bob", "balance": "100.0",
+    "time": "2018-01-02T12:30:00Z")
 
 ### EndBlock
 
--   **Request**:
-    -   `Height (int64)`: Height of the block just executed.
--   **Response**:
-    -   `ValidatorUpdates ([]Validator)`: Changes to validator set (set
-        voting power to 0 to remove).
-    -   `ConsensusParamUpdates (ConsensusParams)`: Changes to
-        consensus-critical time, size, and other parameters.
-    -   `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
--   **Usage**:
-    -   Signals the end of a block.
-    -   Called prior to each Commit, after all transactions.
-    -   Validator set and consensus params are updated with the result.
-    -   Validator pubkeys are expected to be go-wire encoded.
+- **Request**:
+  - `Height (int64)`: Height of the block just executed.
+- **Response**:
+  - `ValidatorUpdates ([]Validator)`: Changes to validator set (set
+    voting power to 0 to remove).
+  - `ConsensusParamUpdates (ConsensusParams)`: Changes to
+    consensus-critical time, size, and other parameters.
+  - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing
+- **Usage**:
+  - Signals the end of a block.
+  - Called prior to each Commit, after all transactions.
+  - Validator set and consensus params are updated with the result.
+  - Validator pubkeys are expected to be go-wire encoded.
 
 ### Commit
 
--   **Response**:
-    -   `Data ([]byte)`: The Merkle root hash
--   **Usage**:
-    -   Persist the application state.
-    -   Return a Merkle root hash of the application state.
-    -   It's critical that all application instances return the
-        same hash. If not, they will not be able to agree on the next
-        block, because the hash is included in the next block!
+- **Response**:
+  - `Data ([]byte)`: The Merkle root hash
+- **Usage**:
+  - Persist the application state.
+  - Return a Merkle root hash of the application state.
+  - It's critical that all application instances return the
+    same hash. If not, they will not be able to agree on the next
+    block, because the hash is included in the next block!
 
 ## Data Messages
 
 ### Header
 
 - **Fields**:
-    - `ChainID (string)`: ID of the blockchain
-    - `Height (int64)`: Height of the block in the chain
-    - `Time (int64)`: Unix time of the block
-    - `NumTxs (int32)`: Number of transactions in the block
-    - `TotalTxs (int64)`: Total number of transactions in the blockchain until
-      now
-    - `LastBlockHash ([]byte)`: Hash of the previous (parent) block
-    - `ValidatorsHash ([]byte)`: Hash of the validator set for this block
-    - `AppHash ([]byte)`: Data returned by the last call to `Commit` - typically the
-      Merkle root of the application state after executing the previous block's
-      transactions
-    - `Proposer (Validator)`: Original proposer for the block
+  - `ChainID (string)`: ID of the blockchain
+  - `Height (int64)`: Height of the block in the chain
+  - `Time (int64)`: Unix time of the block
+  - `NumTxs (int32)`: Number of transactions in the block
+  - `TotalTxs (int64)`: Total number of transactions in the blockchain until
+    now
+  - `LastBlockHash ([]byte)`: Hash of the previous (parent) block
+  - `ValidatorsHash ([]byte)`: Hash of the validator set for this block
+  - `AppHash ([]byte)`: Data returned by the last call to `Commit` - typically the
+    Merkle root of the application state after executing the previous block's
+    transactions
+  - `Proposer (Validator)`: Original proposer for the block
 - **Usage**:
-    - Provided in RequestBeginBlock
-    - Provides important context about the current state of the blockchain -
-      especially height and time.
-    - Provides the proposer of the current block, for use in proposer-based
-      reward mechanisms.
+  - Provided in RequestBeginBlock
+  - Provides important context about the current state of the blockchain -
+    especially height and time.
+  - Provides the proposer of the current block, for use in proposer-based
+    reward mechanisms.
 
 ### Validator
 
 - **Fields**:
-    - `Address ([]byte)`: Address of the validator (hash of the public key)
-    - `PubKey (PubKey)`:  Public key of the validator
-    - `Power (int64)`: Voting power of the validator
+  - `Address ([]byte)`: Address of the validator (hash of the public key)
+  - `PubKey (PubKey)`: Public key of the validator
+  - `Power (int64)`: Voting power of the validator
 - **Usage**:
-    - Provides all identifying information about the validator
+  - Provides all identifying information about the validator
 
 ### SigningValidator
 
 - **Fields**:
-    - `Validator (Validator)`: A validator
-    - `SignedLastBlock (bool)`: Indicated whether or not the validator signed
-      the last block
+  - `Validator (Validator)`: A validator
+  - `SignedLastBlock (bool)`: Indicated whether or not the validator signed
+    the last block
 - **Usage**:
-    - Indicates whether a validator signed the last block, allowing for rewards
-      based on validator availability
+  - Indicates whether a validator signed the last block, allowing for rewards
+    based on validator availability
 
 ### PubKey
 
 - **Fields**:
-    - `Type (string)`: Type of the public key. A simple string like `"ed25519"`.
-      In the future, may indicate a serialization algorithm to parse the `Data`,
-      for instance `"amino"`.
-    - `Data ([]byte)`: Public key data. For a simple public key, it's just the
-      raw bytes. If the `Type` indicates an encoding algorithm, this is the
-      encoded public key.
+  - `Type (string)`: Type of the public key. A simple string like `"ed25519"`.
+    In the future, may indicate a serialization algorithm to parse the `Data`,
+    for instance `"amino"`.
+  - `Data ([]byte)`: Public key data. For a simple public key, it's just the
+    raw bytes. If the `Type` indicates an encoding algorithm, this is the
+    encoded public key.
 - **Usage**:
-    - A generic and extensible typed public key
+  - A generic and extensible typed public key
 
 ### Evidence
 
 - **Fields**:
-    - `Type (string)`: Type of the evidence. A hierarchical path like
-      "duplicate/vote".
-    - `Validator (Validator`: The offending validator
-    - `Height (int64)`: Height when the offense was committed
-    - `Time (int64)`: Unix time of the block at height `Height`
-    - `TotalVotingPower (int64)`: Total voting power of the validator set at
-      height `Height`
+  - `Type (string)`: Type of the evidence. A hierarchical path like
+    "duplicate/vote".
+  - `Validator (Validator`: The offending validator
+  - `Height (int64)`: Height when the offense was committed
+  - `Time (int64)`: Unix time of the block at height `Height`
+  - `TotalVotingPower (int64)`: Total voting power of the validator set at
+    height `Height`

docs/app-architecture.md

@@ -17,7 +17,7 @@ transaction is actually processed.
 
 The ABCI application must be a deterministic result of the Tendermint
 consensus - any external influence on the application state that didn't
-come through Tendermint could cause a consensus failure. Thus *nothing*
+come through Tendermint could cause a consensus failure. Thus _nothing_
 should communicate with the application except Tendermint via ABCI.
 
 If the application is written in Go, it can be compiled into the
@@ -43,6 +43,7 @@ all transactions, and possibly all queries, should still pass through
 Tendermint.
 
 See the following for more extensive documentation:
+
 - [Interchain Standard for the Light-Client REST API](https://github.com/cosmos/cosmos-sdk/pull/1028)
 - [Tendermint RPC Docs](https://tendermint.github.io/slate/)
 - [Tendermint in Production](https://github.com/tendermint/tendermint/pull/1618)

docs/app-development.md

@@ -16,28 +16,27 @@ committed in hash-linked blocks.
 
 The ABCI design has a few distinct components:
 
--   message protocol
-    -   pairs of request and response messages
-    -   consensus makes requests, application responds
-    -   defined using protobuf
--   server/client
-    -   consensus engine runs the client
-    -   application runs the server
-    -   two implementations:
-        -   async raw bytes
-        -   grpc
--   blockchain protocol
-    -   abci is connection oriented
-    -   Tendermint Core maintains three connections:
-        -   [mempool connection](#mempool-connection): for checking if
-            transactions should be relayed before they are committed;
-            only uses `CheckTx`
-        -   [consensus connection](#consensus-connection): for executing
-            transactions that have been committed. Message sequence is
-            -for every block
-            -`BeginBlock, [DeliverTx, ...], EndBlock, Commit`
-        -   [query connection](#query-connection): for querying the
-            application state; only uses Query and Info
+- message protocol
+  - pairs of request and response messages
+  - consensus makes requests, application responds
+  - defined using protobuf
+- server/client
+  - consensus engine runs the client
+  - application runs the server
+  - two implementations:
+    - async raw bytes
+    - grpc
+- blockchain protocol
+  - abci is connection oriented
+  - Tendermint Core maintains three connections:
+    - [mempool connection](#mempool-connection): for checking if
+      transactions should be relayed before they are committed;
+      only uses `CheckTx`
+    - [consensus connection](#consensus-connection): for executing
+      transactions that have been committed. Message sequence is
+      -for every block -`BeginBlock, [DeliverTx, ...], EndBlock, Commit`
+    - [query connection](#query-connection): for querying the
+      application state; only uses Query and Info
 
 The mempool and consensus logic act as clients, and each maintains an
 open ABCI connection with the application, which hosts an ABCI server.
@@ -64,9 +63,9 @@ To use ABCI in your programming language of choice, there must be a ABCI
 server in that language. Tendermint supports two kinds of implementation
 of the server:
 
--   Asynchronous, raw socket server (Tendermint Socket Protocol, also
-    known as TSP or Teaspoon)
--   GRPC
+- Asynchronous, raw socket server (Tendermint Socket Protocol, also
+  known as TSP or Teaspoon)
+- GRPC
 
 Both can be tested using the `abci-cli` by setting the `--abci` flag
 appropriately (ie. to `socket` or `grpc`).
@@ -161,7 +160,7 @@ connection, to query the local state of the app.
 
 ### Mempool Connection
 
-The mempool connection is used *only* for CheckTx requests. Transactions
+The mempool connection is used _only_ for CheckTx requests. Transactions
 are run using CheckTx in the same order they were received by the
 validator. If the CheckTx returns `OK`, the transaction is kept in
 memory and relayed to other peers in the same order it was received.
@@ -180,23 +179,27 @@ mempool state (this behaviour can be turned off with
 
 In go:
 
-    func (app *KVStoreApplication) CheckTx(tx []byte) types.Result {
-      return types.OK
-    }
+```
+func (app *KVStoreApplication) CheckTx(tx []byte) types.Result {
+  return types.OK
+}
+```
 
 In Java:
 
-    ResponseCheckTx requestCheckTx(RequestCheckTx req) {
-        byte[] transaction = req.getTx().toByteArray();
+```
+ResponseCheckTx requestCheckTx(RequestCheckTx req) {
+    byte[] transaction = req.getTx().toByteArray();
 
-        // validate transaction
+    // validate transaction
 
-        if (notValid) {
-            return ResponseCheckTx.newBuilder().setCode(CodeType.BadNonce).setLog("invalid tx").build();
-        } else {
-            return ResponseCheckTx.newBuilder().setCode(CodeType.OK).build();
-        }
+    if (notValid) {
+        return ResponseCheckTx.newBuilder().setCode(CodeType.BadNonce).setLog("invalid tx").build();
+    } else {
+        return ResponseCheckTx.newBuilder().setCode(CodeType.OK).build();
     }
+}
+```
 
 ### Replay Protection
 
@@ -242,43 +245,47 @@ merkle root of the data returned by the DeliverTx requests, or both.
 
 In go:
 
-    // tx is either "key=value" or just arbitrary bytes
-    func (app *KVStoreApplication) DeliverTx(tx []byte) types.Result {
-      parts := strings.Split(string(tx), "=")
-      if len(parts) == 2 {
-        app.state.Set([]byte(parts[0]), []byte(parts[1]))
-      } else {
-        app.state.Set(tx, tx)
-      }
-      return types.OK
-    }
+```
+// tx is either "key=value" or just arbitrary bytes
+func (app *KVStoreApplication) DeliverTx(tx []byte) types.Result {
+  parts := strings.Split(string(tx), "=")
+  if len(parts) == 2 {
+    app.state.Set([]byte(parts[0]), []byte(parts[1]))
+  } else {
+    app.state.Set(tx, tx)
+  }
+  return types.OK
+}
+```
 
 In Java:
 
-    /**
-     * Using Protobuf types from the protoc compiler, we always start with a byte[]
-     */
-    ResponseDeliverTx deliverTx(RequestDeliverTx request) {
-        byte[] transaction  = request.getTx().toByteArray();
+```
+/**
+ * Using Protobuf types from the protoc compiler, we always start with a byte[]
+ */
+ResponseDeliverTx deliverTx(RequestDeliverTx request) {
+    byte[] transaction  = request.getTx().toByteArray();
 
-        // validate your transaction
-
-        if (notValid) {
-            return ResponseDeliverTx.newBuilder().setCode(CodeType.BadNonce).setLog("transaction was invalid").build();
-        } else {
-            ResponseDeliverTx.newBuilder().setCode(CodeType.OK).build();
-        }
+    // validate your transaction
 
+    if (notValid) {
+        return ResponseDeliverTx.newBuilder().setCode(CodeType.BadNonce).setLog("transaction was invalid").build();
+    } else {
+        ResponseDeliverTx.newBuilder().setCode(CodeType.OK).build();
     }
 
+}
+```
+
 ### Commit
 
 Once all processing of the block is complete, Tendermint sends the
 Commit request and blocks waiting for a response. While the mempool may
 run concurrently with block processing (the BeginBlock, DeliverTxs, and
 EndBlock), it is locked for the Commit request so that its state can be
-safely reset during Commit. This means the app *MUST NOT* do any
-blocking communication with the mempool (ie. broadcast\_tx) during
+safely reset during Commit. This means the app _MUST NOT_ do any
+blocking communication with the mempool (ie. broadcast_tx) during
 Commit, or there will be deadlock. Note also that all remaining
 transactions in the mempool are replayed on the mempool connection
 (CheckTx) following a commit.
@@ -294,21 +301,25 @@ job of the [Handshake](#handshake).
 
 In go:
 
-    func (app *KVStoreApplication) Commit() types.Result {
-      hash := app.state.Hash()
-      return types.NewResultOK(hash, "")
-    }
+```
+func (app *KVStoreApplication) Commit() types.Result {
+  hash := app.state.Hash()
+  return types.NewResultOK(hash, "")
+}
+```
 
 In Java:
 
-    ResponseCommit requestCommit(RequestCommit requestCommit) {
+```
+ResponseCommit requestCommit(RequestCommit requestCommit) {
 
-        // update the internal app-state
-        byte[] newAppState = calculateAppState();
+    // update the internal app-state
+    byte[] newAppState = calculateAppState();
 
-        // and return it to the node
-        return ResponseCommit.newBuilder().setCode(CodeType.OK).setData(ByteString.copyFrom(newAppState)).build();
-    }
+    // and return it to the node
+    return ResponseCommit.newBuilder().setCode(CodeType.OK).setData(ByteString.copyFrom(newAppState)).build();
+}
+```
 
 ### BeginBlock
 
@@ -322,31 +333,35 @@ pick up from when it restarts. See information on the Handshake, below.
 
 In go:
 
-    // Track the block hash and header information
-    func (app *PersistentKVStoreApplication) BeginBlock(params types.RequestBeginBlock) {
-      // update latest block info
-      app.blockHeader = params.Header
+```
+// Track the block hash and header information
+func (app *PersistentKVStoreApplication) BeginBlock(params types.RequestBeginBlock) {
+  // update latest block info
+  app.blockHeader = params.Header
 
-      // reset valset changes
-      app.changes = make([]*types.Validator, 0)
-    }
+  // reset valset changes
+  app.changes = make([]*types.Validator, 0)
+}
+```
 
 In Java:
 
-    /*
-     * all types come from protobuf definition
-     */
-    ResponseBeginBlock requestBeginBlock(RequestBeginBlock req) {
+```
+/*
+ * all types come from protobuf definition
+ */
+ResponseBeginBlock requestBeginBlock(RequestBeginBlock req) {
 
-        Header header = req.getHeader();
-        byte[] prevAppHash = header.getAppHash().toByteArray();
-        long prevHeight = header.getHeight();
-        long numTxs = header.getNumTxs();
+    Header header = req.getHeader();
+    byte[] prevAppHash = header.getAppHash().toByteArray();
+    long prevHeight = header.getHeight();
+    long numTxs = header.getNumTxs();
 
-        // run your pre-block logic. Maybe prepare a state snapshot, message components, etc
+    // run your pre-block logic. Maybe prepare a state snapshot, message components, etc
 
-        return ResponseBeginBlock.newBuilder().build();
-    }
+    return ResponseBeginBlock.newBuilder().build();
+}
+```
 
 ### EndBlock
 
@@ -364,25 +379,29 @@ for details on how it tracks validators.
 
 In go:
 
-    // Update the validator set
-    func (app *PersistentKVStoreApplication) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock {
-      return types.ResponseEndBlock{ValidatorUpdates: app.ValUpdates}
-    }
+```
+// Update the validator set
+func (app *PersistentKVStoreApplication) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock {
+  return types.ResponseEndBlock{ValidatorUpdates: app.ValUpdates}
+}
+```
 
 In Java:
 
-    /*
-     * Assume that one validator changes. The new validator has a power of 10
-     */
-    ResponseEndBlock requestEndBlock(RequestEndBlock req) {
-        final long currentHeight = req.getHeight();
-        final byte[] validatorPubKey = getValPubKey();
+```
+/*
+ * Assume that one validator changes. The new validator has a power of 10
+ */
+ResponseEndBlock requestEndBlock(RequestEndBlock req) {
+    final long currentHeight = req.getHeight();
+    final byte[] validatorPubKey = getValPubKey();
 
-        ResponseEndBlock.Builder builder = ResponseEndBlock.newBuilder();
-        builder.addDiffs(1, Types.Validator.newBuilder().setPower(10L).setPubKey(ByteString.copyFrom(validatorPubKey)).build());
+    ResponseEndBlock.Builder builder = ResponseEndBlock.newBuilder();
+    builder.addDiffs(1, Types.Validator.newBuilder().setPower(10L).setPubKey(ByteString.copyFrom(validatorPubKey)).build());
 
-        return builder.build();
-    }
+    return builder.build();
+}
+```
 
 ### Query Connection
 
@@ -398,67 +417,71 @@ connecting, according to IP address or node ID. For instance,
 returning non-OK ABCI response to either of the following queries will
 cause Tendermint to not connect to the corresponding peer:
 
--   `p2p/filter/addr/<ip addr>`, where `<ip addr>` is an IP address.
--   `p2p/filter/id/<id>`, where `<is>` is the hex-encoded node ID (the hash of
-    the node's p2p pubkey).
+- `p2p/filter/addr/<ip addr>`, where `<ip addr>` is an IP address.
+- `p2p/filter/id/<id>`, where `<is>` is the hex-encoded node ID (the hash of
+  the node's p2p pubkey).
 
 Note: these query formats are subject to change!
 
 In go:
 
-    func (app *KVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) {
-      if reqQuery.Prove {
-        value, proof, exists := app.state.Proof(reqQuery.Data)
-        resQuery.Index = -1 // TODO make Proof return index
-        resQuery.Key = reqQuery.Data
-        resQuery.Value = value
-        resQuery.Proof = proof
-        if exists {
-          resQuery.Log = "exists"
-        } else {
-          resQuery.Log = "does not exist"
-        }
-        return
-      } else {
-        index, value, exists := app.state.Get(reqQuery.Data)
-        resQuery.Index = int64(index)
-        resQuery.Value = value
-        if exists {
-          resQuery.Log = "exists"
-        } else {
-          resQuery.Log = "does not exist"
-        }
-        return
-      }
+```
+func (app *KVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) {
+  if reqQuery.Prove {
+    value, proof, exists := app.state.Proof(reqQuery.Data)
+    resQuery.Index = -1 // TODO make Proof return index
+    resQuery.Key = reqQuery.Data
+    resQuery.Value = value
+    resQuery.Proof = proof
+    if exists {
+      resQuery.Log = "exists"
+    } else {
+      resQuery.Log = "does not exist"
     }
+    return
+  } else {
+    index, value, exists := app.state.Get(reqQuery.Data)
+    resQuery.Index = int64(index)
+    resQuery.Value = value
+    if exists {
+      resQuery.Log = "exists"
+    } else {
+      resQuery.Log = "does not exist"
+    }
+    return
+  }
+}
+```
 
 In Java:
 
-    ResponseQuery requestQuery(RequestQuery req) {
-        final boolean isProveQuery = req.getProve();
-        final ResponseQuery.Builder responseBuilder = ResponseQuery.newBuilder();
-
-        if (isProveQuery) {
-            com.app.example.ProofResult proofResult = generateProof(req.getData().toByteArray());
-            final byte[] proofAsByteArray = proofResult.getAsByteArray();
+```
+ResponseQuery requestQuery(RequestQuery req) {
+    final boolean isProveQuery = req.getProve();
+    final ResponseQuery.Builder responseBuilder = ResponseQuery.newBuilder();
 
-            responseBuilder.setProof(ByteString.copyFrom(proofAsByteArray));
-            responseBuilder.setKey(req.getData());
-            responseBuilder.setValue(ByteString.copyFrom(proofResult.getData()));
-            responseBuilder.setLog(result.getLogValue());
-        } else {
-            byte[] queryData = req.getData().toByteArray();
+    if (isProveQuery) {
+        com.app.example.ProofResult proofResult = generateProof(req.getData().toByteArray());
+        final byte[] proofAsByteArray = proofResult.getAsByteArray();
 
-            final com.app.example.QueryResult result = generateQueryResult(queryData);
+        responseBuilder.setProof(ByteString.copyFrom(proofAsByteArray));
+        responseBuilder.setKey(req.getData());
+        responseBuilder.setValue(ByteString.copyFrom(proofResult.getData()));
+        responseBuilder.setLog(result.getLogValue());
+    } else {
+        byte[] queryData = req.getData().toByteArray();
 
-            responseBuilder.setIndex(result.getIndex());
-            responseBuilder.setValue(ByteString.copyFrom(result.getValue()));
-            responseBuilder.setLog(result.getLogValue());
-        }
+        final com.app.example.QueryResult result = generateQueryResult(queryData);
 
-        return responseBuilder.build();
+        responseBuilder.setIndex(result.getIndex());
+        responseBuilder.setValue(ByteString.copyFrom(result.getValue()));
+        responseBuilder.setLog(result.getLogValue());
     }
 
+    return responseBuilder.build();
+}
+```
+
 ### Handshake
 
 When the app or tendermint restarts, they need to sync to a common
@@ -477,17 +500,21 @@ all blocks.
 
 In go:
 
-    func (app *KVStoreApplication) Info(req types.RequestInfo) (resInfo types.ResponseInfo) {
-      return types.ResponseInfo{Data: cmn.Fmt("{\"size\":%v}", app.state.Size())}
-    }
+```
+func (app *KVStoreApplication) Info(req types.RequestInfo) (resInfo types.ResponseInfo) {
+  return types.ResponseInfo{Data: cmn.Fmt("{\"size\":%v}", app.state.Size())}
+}
+```
 
 In Java:
 
-    ResponseInfo requestInfo(RequestInfo req) {
-        final byte[] lastAppHash = getLastAppHash();
-        final long lastHeight = getLastHeight();
-        return ResponseInfo.newBuilder().setLastBlockAppHash(ByteString.copyFrom(lastAppHash)).setLastBlockHeight(lastHeight).build();
-    }
+```
+ResponseInfo requestInfo(RequestInfo req) {
+    final byte[] lastAppHash = getLastAppHash();
+    final long lastHeight = getLastHeight();
+    return ResponseInfo.newBuilder().setLastBlockAppHash(ByteString.copyFrom(lastAppHash)).setLastBlockHeight(lastHeight).build();
+}
+```
 
 ### Genesis
 
@@ -497,31 +524,35 @@ consensus params.
 
 In go:
 
-    // Save the validators in the merkle tree
-    func (app *PersistentKVStoreApplication) InitChain(params types.RequestInitChain) {
-      for _, v := range params.Validators {
-        r := app.updateValidator(v)
-        if r.IsErr() {
-          app.logger.Error("Error updating validators", "r", r)
-        }
-      }
+```
+// Save the validators in the merkle tree
+func (app *PersistentKVStoreApplication) InitChain(params types.RequestInitChain) {
+  for _, v := range params.Validators {
+    r := app.updateValidator(v)
+    if r.IsErr() {
+      app.logger.Error("Error updating validators", "r", r)
     }
+  }
+}
+```
 
 In Java:
 
-    /*
-     * all types come from protobuf definition
-     */
-    ResponseInitChain requestInitChain(RequestInitChain req) {
-        final int validatorsCount = req.getValidatorsCount();
-        final List<Types.Validator> validatorsList = req.getValidatorsList();
+```
+/*
+ * all types come from protobuf definition
+ */
+ResponseInitChain requestInitChain(RequestInitChain req) {
+    final int validatorsCount = req.getValidatorsCount();
+    final List<Types.Validator> validatorsList = req.getValidatorsList();
 
-        validatorsList.forEach((validator) -> {
-            long power = validator.getPower();
-            byte[] validatorPubKey = validator.getPubKey().toByteArray();
+    validatorsList.forEach((validator) -> {
+        long power = validator.getPower();
+        byte[] validatorPubKey = validator.getPubKey().toByteArray();
 
-            // do somehing for validator setup in app
-        });
+        // do somehing for validator setup in app
+    });
 
-        return ResponseInitChain.newBuilder().build();
-    }
+    return ResponseInitChain.newBuilder().build();
+}
+```

docs/deploy-testnets.md

@@ -16,39 +16,43 @@ to.
 
 Here are the steps to setting up a testnet manually:
 
-1)  Provision nodes on your cloud provider of choice
-2)  Install Tendermint and the application of interest on all nodes
-3)  Generate a private key and a node key for each validator using
+1.  Provision nodes on your cloud provider of choice
+2.  Install Tendermint and the application of interest on all nodes
+3.  Generate a private key and a node key for each validator using
     `tendermint init`
-4)  Compile a list of public keys for each validator into a
+4.  Compile a list of public keys for each validator into a
     `genesis.json` file and replace the existing file with it.
-5)  Run
-    `tendermint node --proxy_app=kvstore --p2p.persistent_peers=< peer addresses >`
-    on each node, where `< peer addresses >` is a comma separated list
-    of the IP:PORT combination for each node. The default port for
-    Tendermint is `26656`. Thus, if the IP addresses of your nodes were
-    `192.168.0.1, 192.168.0.2, 192.168.0.3, 192.168.0.4`, the command
+5.  Run
+    `tendermint node --proxy_app=kvstore --p2p.persistent_peers=< peer addresses >` on each node, where `< peer addresses >` is a comma separated
+    list of the ID@IP:PORT combination for each node. The default port for
+    Tendermint is `26656`. The ID of a node can be obtained by running
+    `tendermint show_node_id` command. Thus, if the IP addresses of your nodes
+    were `192.168.0.1, 192.168.0.2, 192.168.0.3, 192.168.0.4`, the command
     would look like:
 
-
-    tendermint node --proxy_app=kvstore --p2p.persistent_peers=96663a3dd0d7b9d17d4c8211b191af259621c693@192.168.0.1:26656, 429fcf25974313b95673f58d77eacdd434402665@192.168.0.2:26656, 0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@192.168.0.3:26656, f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@192.168.0.4:26656
+```
+tendermint node --proxy_app=kvstore --p2p.persistent_peers=96663a3dd0d7b9d17d4c8211b191af259621c693@192.168.0.1:26656, 429fcf25974313b95673f58d77eacdd434402665@192.168.0.2:26656, 0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@192.168.0.3:26656, f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@192.168.0.4:26656
+```
 
 After a few seconds, all the nodes should connect to each other and
 start making blocks! For more information, see the Tendermint Networks
 section of [the guide to using Tendermint](./using-tendermint.md).
 
-But wait! Steps 3 and 4 are quite manual. Instead, use [this
-script](https://github.com/tendermint/tendermint/blob/develop/docs/examples/init_testnet.sh),
-which does the heavy lifting for you. And it gets better.
+But wait! Steps 3, 4 and 5 are quite manual. Instead, use the `tendermint testnet` command. By default, running `tendermint testnet` will create all the
+required files, but it won't populate the list of persistent peers. It will do
+it however if you provide the `--populate-persistent-peers` flag and optional
+`--starting-ip-address` flag. Run `tendermint testnet --help` for more details
+on the available flags.
+
+```
+tendermint testnet --populate-persistent-peers --starting-ip-address 192.168.0.1
+```
+
+This command will generate four folders, prefixed with "node" and put them into
+the "./mytestnet" directory by default.
 
-Instead of the previously linked script to initialize the files required
-for a testnet, we have the `tendermint testnet` command. By default,
-running `tendermint testnet` will create all the required files, just
-like the script. Of course, you'll still need to manually edit some
-fields in the `config.toml`. Alternatively, see the available flags to
-auto-populate the `config.toml` with the fields that would otherwise be
-passed in via flags when running `tendermint node`. As you might
-imagine, this command is useful for manual or automated deployments.
+As you might imagine, this command is useful for manual or automated
+deployments.
 
 ## Automated Deployments
 
@@ -58,7 +62,9 @@ The easiest and fastest way to get a testnet up in less than 5 minutes.
 
 With `docker` and `docker-compose` installed, run the command:
 
-    make localnet-start
+```
+make localnet-start
+```
 
 from the root of the tendermint repository. This will spin up a 4-node
 local testnet. Review the target in the Makefile to debug any problems.

docs/ecosystem.md

@@ -3,7 +3,7 @@
 The growing list of applications built using various pieces of the
 Tendermint stack can be found at:
 
--   https://tendermint.com/ecosystem
+- https://tendermint.com/ecosystem
 
 We thank the community for their contributions thus far and welcome the
 addition of new projects. A pull request can be submitted to [this

docs/examples/getting-started.md

@@ -10,10 +10,10 @@ documentation](http://tendermint.readthedocs.io/en/master/).
 
 ### Quick Install
 
-On a fresh Ubuntu 16.04 machine can be done with [this script](https://git.io/vpgEI), like so:
+On a fresh Ubuntu 16.04 machine can be done with [this script](https://git.io/fFfOR), like so:
 
 ```
-curl -L https://git.io/vpgEI | bash
+curl -L https://git.io/fFfOR | bash
 source ~/.profile
 ```
 
@@ -24,6 +24,7 @@ The script is also used to facilitate cluster deployment below.
 ### Manual Install
 
 Requires:
+
 - `go` minimum version 1.10
 - `$GOPATH` environment variable must be set
 - `$GOPATH/bin` must be on your `$PATH` (see https://github.com/tendermint/tendermint/wiki/Setting-GOPATH)
@@ -43,7 +44,7 @@ Confirm installation:
 
 ```
 $ tendermint version
-0.18.0-XXXXXXX
+0.23.0-dev
 ```
 
 ## Initialization
@@ -122,22 +123,22 @@ First create four Ubuntu cloud machines. The following was tested on Digital
 Ocean Ubuntu 16.04 x64 (3GB/1CPU, 20GB SSD). We'll refer to their respective IP
 addresses below as IP1, IP2, IP3, IP4.
 
-Then, `ssh` into each machine, and execute [this script](https://git.io/vNLfY):
+Then, `ssh` into each machine, and execute [this script](https://git.io/fFfOR):
 
 ```
-curl -L https://git.io/vpgEI | bash
+curl -L https://git.io/fFfOR | bash
 source ~/.profile
 ```
 
 This will install `go` and other dependencies, get the Tendermint source code, then compile the `tendermint` binary.
 
-Next, `cd` into `docs/examples`. Each command below should be run from each node, in sequence:
+Next, use the `tendermint testnet` command to create four directories of config files (found in `./mytestnet`) and copy each directory to the relevant machine in the cloud, so that each machine has `$HOME/mytestnet/node[0-3]` directory. Then from each machine, run:
 
 ```
-tendermint node --home ./node0 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
-tendermint node --home ./node1 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
-tendermint node --home ./node2 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
-tendermint node --home ./node3 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
+tendermint node --home ./mytestnet/node0 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
+tendermint node --home ./mytestnet/node1 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
+tendermint node --home ./mytestnet/node2 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
+tendermint node --home ./mytestnet/node3 --proxy_app=kvstore --p2p.persistent_peers="167b80242c300bf0ccfb3ced3dec60dc2a81776e@IP1:26656,3c7a5920811550c04bf7a0b2f1e02ab52317b5e6@IP2:26656,303a1a4312c30525c99ba66522dd81cca56a361a@IP3:26656,b686c2a7f4b1b46dca96af3a0f31a6a7beae0be4@IP4:26656"
 ```
 
 Note that after the third node is started, blocks will start to stream in

docs/examples/init_testnet.sh

@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-# make all the files
-tendermint init --home ./tester/node0
-tendermint init --home ./tester/node1
-tendermint init --home ./tester/node2
-tendermint init --home ./tester/node3
-
-file0=./tester/node0/config/genesis.json
-file1=./tester/node1/config/genesis.json
-file2=./tester/node2/config/genesis.json
-file3=./tester/node3/config/genesis.json
-
-genesis_time=`cat $file0 | jq '.genesis_time'`
-chain_id=`cat $file0 | jq '.chain_id'`
-
-value0=`cat $file0 | jq '.validators[0].pub_key.value'`
-value1=`cat $file1 | jq '.validators[0].pub_key.value'`
-value2=`cat $file2 | jq '.validators[0].pub_key.value'`
-value3=`cat $file3 | jq '.validators[0].pub_key.value'`
-
-rm $file0
-rm $file1
-rm $file2
-rm $file3
-
-echo "{
-  \"genesis_time\": $genesis_time,
-  \"chain_id\": $chain_id,
-  \"validators\": [
-    {
-     \"pub_key\": {
-       \"type\": \"tendermint/PubKeyEd25519\",
-       \"value\": $value0
-     },
-      \"power:\": 10,
-      \"name\":, \"\"
-    },
-    {
-     \"pub_key\": {
-       \"type\": \"tendermint/PubKeyEd25519\",
-       \"value\": $value1
-     },
-      \"power:\": 10,
-      \"name\":, \"\"
-    },
-    {
-     \"pub_key\": {
-       \"type\": \"tendermint/PubKeyEd25519\",
-       \"value\": $value2
-     },
-      \"power:\": 10,
-      \"name\":, \"\"
-    },
-    {
-     \"pub_key\": {
-       \"type\": \"tendermint/PubKeyEd25519\",
-       \"value\": $value3
-     },
-      \"power:\": 10,
-      \"name\":, \"\"
-    }
-   ],
-   \"app_hash\": \"\"
-}" >> $file0
-
-cp $file0 $file1
-cp $file0 $file2
-cp $file2 $file3

docs/examples/install_tendermint.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# XXX: this script is meant to be used only on a fresh Ubuntu 16.04 instance
-# and has only been tested on Digital Ocean
-
-# get and unpack golang
-curl -O https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz
-tar -xvf go1.10.linux-amd64.tar.gz
-
-apt install make
-
-## move go and add binary to path
-mv go /usr/local
-echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.profile
-
-## create the GOPATH directory, set GOPATH and put on PATH
-mkdir goApps
-echo "export GOPATH=/root/goApps" >> ~/.profile
-echo "export PATH=\$PATH:\$GOPATH/bin" >> ~/.profile
-
-source ~/.profile
-
-## get the code and move into it
-REPO=github.com/tendermint/tendermint
-go get $REPO
-cd $GOPATH/src/$REPO
-
-## build
-git checkout master
-make get_tools
-make get_vendor_deps
-make install

docs/examples/node0/config/config.toml

@@ -1,166 +0,0 @@
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base config options #####
-
-# TCP or UNIX socket address of the ABCI application,
-# or the name of an ABCI application compiled in with the Tendermint binary
-proxy_app = "tcp://127.0.0.1:26658"
-
-# A custom human readable name for this node
-moniker = "alpha"
-
-# If this node is many blocks behind the tip of the chain, FastSync
-# allows them to catchup quickly by downloading blocks in parallel
-# and verifying their commits
-fast_sync = true
-
-# Database backend: leveldb | memdb
-db_backend = "leveldb"
-
-# Database directory
-db_path = "data"
-
-# Output level for logging, including package level options
-log_level = "main:info,state:info,*:error"
-
-##### additional base config options #####
-
-# Path to the JSON file containing the initial validator set and other meta data
-genesis_file = "config/genesis.json"
-
-# Path to the JSON file containing the private key to use as a validator in the consensus protocol
-priv_validator_file = "config/priv_validator.json"
-
-# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
-node_key_file = "config/node_key.json"
-
-# Mechanism to connect to the ABCI application: socket | grpc
-abci = "socket"
-
-# TCP or UNIX socket address for the profiling server to listen on
-prof_laddr = ""
-
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = false
-
-##### advanced configuration options #####
-
-##### rpc server configuration options #####
-[rpc]
-
-# TCP or UNIX socket address for the RPC server to listen on
-laddr = "tcp://0.0.0.0:26657"
-
-# TCP or UNIX socket address for the gRPC server to listen on
-# NOTE: This server only supports /broadcast_tx_commit
-grpc_laddr = ""
-
-# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
-unsafe = false
-
-##### peer to peer configuration options #####
-[p2p]
-
-# Address to listen for incoming connections
-laddr = "tcp://0.0.0.0:26656"
-
-# Comma separated list of seed nodes to connect to
-seeds = ""
-
-# Comma separated list of nodes to keep persistent connections to
-# Do not add private peers to this list if you don't want them advertised
-persistent_peers = ""
-
-# Path to address book
-addr_book_file = "config/addrbook.json"
-
-# Set true for strict address routability rules
-addr_book_strict = true
-
-# Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = 100
-
-# Maximum number of peers to connect to
-max_num_peers = 50
-
-# Maximum size of a message packet payload, in bytes
-max_packet_msg_payload_size = 1024
-
-# Rate at which packets can be sent, in bytes/second
-send_rate = 512000
-
-# Rate at which packets can be received, in bytes/second
-recv_rate = 512000
-
-# Set true to enable the peer-exchange reactor
-pex = true
-
-# Seed mode, in which node constantly crawls the network and looks for
-# peers. If another node asks it for addresses, it responds and disconnects.
-#
-# Does not work if the peer-exchange reactor is disabled.
-seed_mode = false
-
-# Comma separated list of peer IDs to keep private (will not be gossiped to other peers)
-private_peer_ids = ""
-
-##### mempool configuration options #####
-[mempool]
-
-recheck = true
-recheck_empty = true
-broadcast = true
-wal_dir = "data/mempool.wal"
-
-##### consensus configuration options #####
-[consensus]
-
-wal_file = "data/cs.wal/wal"
-
-# All timeouts are in milliseconds
-timeout_propose = 3000
-timeout_propose_delta = 500
-timeout_prevote = 1000
-timeout_prevote_delta = 500
-timeout_precommit = 1000
-timeout_precommit_delta = 500
-timeout_commit = 1000
-
-# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
-skip_timeout_commit = false
-
-# BlockSize
-max_block_size_txs = 10000
-max_block_size_bytes = 1
-
-# EmptyBlocks mode and possible interval between empty blocks in seconds
-create_empty_blocks = true
-create_empty_blocks_interval = 0
-
-# Reactor sleep duration parameters are in milliseconds
-peer_gossip_sleep_duration = 100
-peer_query_maj23_sleep_duration = 2000
-
-##### transactions indexer configuration options #####
-[tx_index]
-
-# What indexer to use for transactions
-#
-# Options:
-#   1) "null" (default)
-#   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-indexer = "kv"
-
-# Comma-separated list of tags to index (by default the only tag is tx hash)
-#
-# It's recommended to index only a subset of tags due to possible memory
-# bloat. This is, of course, depends on the indexer's DB and the volume of
-# transactions.
-index_tags = ""
-
-# When set to true, tells indexer to index all tags. Note this may be not
-# desirable (see the comment above). IndexTags has a precedence over
-# IndexAllTags (i.e. when given both, IndexTags will be indexed).
-index_all_tags = false

docs/examples/node0/config/genesis.json

@@ -1,39 +0,0 @@
-{
-  "genesis_time": "0001-01-01T00:00:00Z",
-  "chain_id": "test-chain-A2i3OZ",
-  "validators": [
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
-      },
-      "power": "10",
-      "name": ""
-    }
-  ],
-  "app_hash": ""
-}

docs/examples/node0/config/node_key.json

@@ -1 +0,0 @@
-{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"7lY+k6EDllG8Q9gVbF5313t/ag2YGkBVKdVa0YHJ9xO5k0w3Q/hke0Z7UFT1KgVDGRUEKzwAwwjwFQUvgF0ZWg=="}}

docs/examples/node0/config/priv_validator.json

@@ -1,14 +0,0 @@
-{
-  "address": "122A9414774A2FCAD026201DA477EF3F41970EF0",
-  "pub_key": {
-    "type": "tendermint/PubKeyEd25519",
-    "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
-  },
-  "last_height": "0",
-  "last_round": "0",
-  "last_step": 0,
-  "priv_key": {
-    "type": "tendermint/PrivKeyEd25519",
-    "value": "YLxp3ho+kySgAnzjBptbxDzSGw2ntGZLsIHQsaVxY/cP6TgB2Odg9ZsH3CZp3XfsF2mj+QC6U6hNFCsvL9BziQ=="
-  }
-}

docs/examples/node1/config/config.toml

@@ -1,166 +0,0 @@
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base config options #####
-
-# TCP or UNIX socket address of the ABCI application,
-# or the name of an ABCI application compiled in with the Tendermint binary
-proxy_app = "tcp://127.0.0.1:26658"
-
-# A custom human readable name for this node
-moniker = "bravo"
-
-# If this node is many blocks behind the tip of the chain, FastSync
-# allows them to catchup quickly by downloading blocks in parallel
-# and verifying their commits
-fast_sync = true
-
-# Database backend: leveldb | memdb
-db_backend = "leveldb"
-
-# Database directory
-db_path = "data"
-
-# Output level for logging, including package level options
-log_level = "main:info,state:info,*:error"
-
-##### additional base config options #####
-
-# Path to the JSON file containing the initial validator set and other meta data
-genesis_file = "config/genesis.json"
-
-# Path to the JSON file containing the private key to use as a validator in the consensus protocol
-priv_validator_file = "config/priv_validator.json"
-
-# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
-node_key_file = "config/node_key.json"
-
-# Mechanism to connect to the ABCI application: socket | grpc
-abci = "socket"
-
-# TCP or UNIX socket address for the profiling server to listen on
-prof_laddr = ""
-
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = false
-
-##### advanced configuration options #####
-
-##### rpc server configuration options #####
-[rpc]
-
-# TCP or UNIX socket address for the RPC server to listen on
-laddr = "tcp://0.0.0.0:26657"
-
-# TCP or UNIX socket address for the gRPC server to listen on
-# NOTE: This server only supports /broadcast_tx_commit
-grpc_laddr = ""
-
-# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
-unsafe = false
-
-##### peer to peer configuration options #####
-[p2p]
-
-# Address to listen for incoming connections
-laddr = "tcp://0.0.0.0:26656"
-
-# Comma separated list of seed nodes to connect to
-seeds = ""
-
-# Comma separated list of nodes to keep persistent connections to
-# Do not add private peers to this list if you don't want them advertised
-persistent_peers = ""
-
-# Path to address book
-addr_book_file = "config/addrbook.json"
-
-# Set true for strict address routability rules
-addr_book_strict = true
-
-# Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = 100
-
-# Maximum number of peers to connect to
-max_num_peers = 50
-
-# Maximum size of a message packet payload, in bytes
-max_packet_msg_payload_size = 1024
-
-# Rate at which packets can be sent, in bytes/second
-send_rate = 512000
-
-# Rate at which packets can be received, in bytes/second
-recv_rate = 512000
-
-# Set true to enable the peer-exchange reactor
-pex = true
-
-# Seed mode, in which node constantly crawls the network and looks for
-# peers. If another node asks it for addresses, it responds and disconnects.
-#
-# Does not work if the peer-exchange reactor is disabled.
-seed_mode = false
-
-# Comma separated list of peer IDs to keep private (will not be gossiped to other peers)
-private_peer_ids = ""
-
-##### mempool configuration options #####
-[mempool]
-
-recheck = true
-recheck_empty = true
-broadcast = true
-wal_dir = "data/mempool.wal"
-
-##### consensus configuration options #####
-[consensus]
-
-wal_file = "data/cs.wal/wal"
-
-# All timeouts are in milliseconds
-timeout_propose = 3000
-timeout_propose_delta = 500
-timeout_prevote = 1000
-timeout_prevote_delta = 500
-timeout_precommit = 1000
-timeout_precommit_delta = 500
-timeout_commit = 1000
-
-# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
-skip_timeout_commit = false
-
-# BlockSize
-max_block_size_txs = 10000
-max_block_size_bytes = 1
-
-# EmptyBlocks mode and possible interval between empty blocks in seconds
-create_empty_blocks = true
-create_empty_blocks_interval = 0
-
-# Reactor sleep duration parameters are in milliseconds
-peer_gossip_sleep_duration = 100
-peer_query_maj23_sleep_duration = 2000
-
-##### transactions indexer configuration options #####
-[tx_index]
-
-# What indexer to use for transactions
-#
-# Options:
-#   1) "null" (default)
-#   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-indexer = "kv"
-
-# Comma-separated list of tags to index (by default the only tag is tx hash)
-#
-# It's recommended to index only a subset of tags due to possible memory
-# bloat. This is, of course, depends on the indexer's DB and the volume of
-# transactions.
-index_tags = ""
-
-# When set to true, tells indexer to index all tags. Note this may be not
-# desirable (see the comment above). IndexTags has a precedence over
-# IndexAllTags (i.e. when given both, IndexTags will be indexed).
-index_all_tags = false

docs/examples/node1/config/genesis.json

@@ -1,39 +0,0 @@
-{
-  "genesis_time": "0001-01-01T00:00:00Z",
-  "chain_id": "test-chain-A2i3OZ",
-  "validators": [
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
-      },
-      "power": "10",
-      "name": ""
-    }
-  ],
-  "app_hash": ""
-}

docs/examples/node1/config/node_key.json

@@ -1 +0,0 @@
-{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"H71dc/TIG7nTselfa9nG0WRArXLKYnm7P5eFCk2lk8ASKQ3sIHpbdxCSHQD/RcdHe7TiabJeuOssNPvPWiyQEQ=="}}

docs/examples/node1/config/priv_validator.json

@@ -1,14 +0,0 @@
-{
-  "address": "BEA1B57F5806CF9AC4D54C8CF806DED5C0F102E1",
-  "pub_key": {
-    "type": "tendermint/PubKeyEd25519",
-    "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
-  },
-  "last_height": "0",
-  "last_round": "0",
-  "last_step": 0,
-  "priv_key": {
-    "type": "tendermint/PrivKeyEd25519",
-    "value": "o0IqrHSPtd5YqGefodWxpJuRzvuVBjgbH785vbMgk7Vvno3kYJHVp1xVG4Q2N8rD+aubZ2SFPvA1ldX9IOwqxQ=="
-  }
-}

docs/examples/node2/config/config.toml

@@ -1,166 +0,0 @@
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base config options #####
-
-# TCP or UNIX socket address of the ABCI application,
-# or the name of an ABCI application compiled in with the Tendermint binary
-proxy_app = "tcp://127.0.0.1:26658"
-
-# A custom human readable name for this node
-moniker = "charlie"
-
-# If this node is many blocks behind the tip of the chain, FastSync
-# allows them to catchup quickly by downloading blocks in parallel
-# and verifying their commits
-fast_sync = true
-
-# Database backend: leveldb | memdb
-db_backend = "leveldb"
-
-# Database directory
-db_path = "data"
-
-# Output level for logging, including package level options
-log_level = "main:info,state:info,*:error"
-
-##### additional base config options #####
-
-# Path to the JSON file containing the initial validator set and other meta data
-genesis_file = "config/genesis.json"
-
-# Path to the JSON file containing the private key to use as a validator in the consensus protocol
-priv_validator_file = "config/priv_validator.json"
-
-# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
-node_key_file = "config/node_key.json"
-
-# Mechanism to connect to the ABCI application: socket | grpc
-abci = "socket"
-
-# TCP or UNIX socket address for the profiling server to listen on
-prof_laddr = ""
-
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = false
-
-##### advanced configuration options #####
-
-##### rpc server configuration options #####
-[rpc]
-
-# TCP or UNIX socket address for the RPC server to listen on
-laddr = "tcp://0.0.0.0:26657"
-
-# TCP or UNIX socket address for the gRPC server to listen on
-# NOTE: This server only supports /broadcast_tx_commit
-grpc_laddr = ""
-
-# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
-unsafe = false
-
-##### peer to peer configuration options #####
-[p2p]
-
-# Address to listen for incoming connections
-laddr = "tcp://0.0.0.0:26656"
-
-# Comma separated list of seed nodes to connect to
-seeds = ""
-
-# Comma separated list of nodes to keep persistent connections to
-# Do not add private peers to this list if you don't want them advertised
-persistent_peers = ""
-
-# Path to address book
-addr_book_file = "config/addrbook.json"
-
-# Set true for strict address routability rules
-addr_book_strict = true
-
-# Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = 100
-
-# Maximum number of peers to connect to
-max_num_peers = 50
-
-# Maximum size of a message packet payload, in bytes
-max_packet_msg_payload_size = 1024
-
-# Rate at which packets can be sent, in bytes/second
-send_rate = 512000
-
-# Rate at which packets can be received, in bytes/second
-recv_rate = 512000
-
-# Set true to enable the peer-exchange reactor
-pex = true
-
-# Seed mode, in which node constantly crawls the network and looks for
-# peers. If another node asks it for addresses, it responds and disconnects.
-#
-# Does not work if the peer-exchange reactor is disabled.
-seed_mode = false
-
-# Comma separated list of peer IDs to keep private (will not be gossiped to other peers)
-private_peer_ids = ""
-
-##### mempool configuration options #####
-[mempool]
-
-recheck = true
-recheck_empty = true
-broadcast = true
-wal_dir = "data/mempool.wal"
-
-##### consensus configuration options #####
-[consensus]
-
-wal_file = "data/cs.wal/wal"
-
-# All timeouts are in milliseconds
-timeout_propose = 3000
-timeout_propose_delta = 500
-timeout_prevote = 1000
-timeout_prevote_delta = 500
-timeout_precommit = 1000
-timeout_precommit_delta = 500
-timeout_commit = 1000
-
-# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
-skip_timeout_commit = false
-
-# BlockSize
-max_block_size_txs = 10000
-max_block_size_bytes = 1
-
-# EmptyBlocks mode and possible interval between empty blocks in seconds
-create_empty_blocks = true
-create_empty_blocks_interval = 0
-
-# Reactor sleep duration parameters are in milliseconds
-peer_gossip_sleep_duration = 100
-peer_query_maj23_sleep_duration = 2000
-
-##### transactions indexer configuration options #####
-[tx_index]
-
-# What indexer to use for transactions
-#
-# Options:
-#   1) "null" (default)
-#   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-indexer = "kv"
-
-# Comma-separated list of tags to index (by default the only tag is tx hash)
-#
-# It's recommended to index only a subset of tags due to possible memory
-# bloat. This is, of course, depends on the indexer's DB and the volume of
-# transactions.
-index_tags = ""
-
-# When set to true, tells indexer to index all tags. Note this may be not
-# desirable (see the comment above). IndexTags has a precedence over
-# IndexAllTags (i.e. when given both, IndexTags will be indexed).
-index_all_tags = false

docs/examples/node2/config/genesis.json

@@ -1,39 +0,0 @@
-{
-  "genesis_time": "0001-01-01T00:00:00Z",
-  "chain_id": "test-chain-A2i3OZ",
-  "validators": [
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
-      },
-      "power": "10",
-      "name": ""
-    }
-  ],
-  "app_hash": ""
-}

docs/examples/node2/config/node_key.json

@@ -1 +0,0 @@
-{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"COHZ/Y2cWGWxJNkRwtpQBt5sYvOnb6Gpz0lO46XERRJFBIdSWD5x1UMGRSTmnvW1ec5G4bMdg6zUZKOZD+vVPg=="}}

docs/examples/node2/config/priv_validator.json

@@ -1,14 +0,0 @@
-{
-  "address": "F0AA266949FB29ADA0B679C27889ED930BD1BDA1",
-  "pub_key": {
-    "type": "tendermint/PubKeyEd25519",
-    "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
-  },
-  "last_height": "0",
-  "last_round": "0",
-  "last_step": 0,
-  "priv_key": {
-    "type": "tendermint/PrivKeyEd25519",
-    "value": "khADeZ5K/8u/L99DFaZNRq8V5g+EHWbwfqFjhCrppaAiBkOkm8YDRMBqaJwDyKtzL5Ff8GRSWPoNfAzv3XLAhQ=="
-  }
-}

docs/examples/node3/config/config.toml

@@ -1,166 +0,0 @@
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base config options #####
-
-# TCP or UNIX socket address of the ABCI application,
-# or the name of an ABCI application compiled in with the Tendermint binary
-proxy_app = "tcp://127.0.0.1:26658"
-
-# A custom human readable name for this node
-moniker = "delta"
-
-# If this node is many blocks behind the tip of the chain, FastSync
-# allows them to catchup quickly by downloading blocks in parallel
-# and verifying their commits
-fast_sync = true
-
-# Database backend: leveldb | memdb
-db_backend = "leveldb"
-
-# Database directory
-db_path = "data"
-
-# Output level for logging, including package level options
-log_level = "main:info,state:info,*:error"
-
-##### additional base config options #####
-
-# Path to the JSON file containing the initial validator set and other meta data
-genesis_file = "config/genesis.json"
-
-# Path to the JSON file containing the private key to use as a validator in the consensus protocol
-priv_validator_file = "config/priv_validator.json"
-
-# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
-node_key_file = "config/node_key.json"
-
-# Mechanism to connect to the ABCI application: socket | grpc
-abci = "socket"
-
-# TCP or UNIX socket address for the profiling server to listen on
-prof_laddr = ""
-
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = false
-
-##### advanced configuration options #####
-
-##### rpc server configuration options #####
-[rpc]
-
-# TCP or UNIX socket address for the RPC server to listen on
-laddr = "tcp://0.0.0.0:26657"
-
-# TCP or UNIX socket address for the gRPC server to listen on
-# NOTE: This server only supports /broadcast_tx_commit
-grpc_laddr = ""
-
-# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
-unsafe = false
-
-##### peer to peer configuration options #####
-[p2p]
-
-# Address to listen for incoming connections
-laddr = "tcp://0.0.0.0:26656"
-
-# Comma separated list of seed nodes to connect to
-seeds = ""
-
-# Comma separated list of nodes to keep persistent connections to
-# Do not add private peers to this list if you don't want them advertised
-persistent_peers = ""
-
-# Path to address book
-addr_book_file = "config/addrbook.json"
-
-# Set true for strict address routability rules
-addr_book_strict = true
-
-# Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = 100
-
-# Maximum number of peers to connect to
-max_num_peers = 50
-
-# Maximum size of a message packet payload, in bytes
-max_packet_msg_payload_size = 1024
-
-# Rate at which packets can be sent, in bytes/second
-send_rate = 512000
-
-# Rate at which packets can be received, in bytes/second
-recv_rate = 512000
-
-# Set true to enable the peer-exchange reactor
-pex = true
-
-# Seed mode, in which node constantly crawls the network and looks for
-# peers. If another node asks it for addresses, it responds and disconnects.
-#
-# Does not work if the peer-exchange reactor is disabled.
-seed_mode = false
-
-# Comma separated list of peer IDs to keep private (will not be gossiped to other peers)
-private_peer_ids = ""
-
-##### mempool configuration options #####
-[mempool]
-
-recheck = true
-recheck_empty = true
-broadcast = true
-wal_dir = "data/mempool.wal"
-
-##### consensus configuration options #####
-[consensus]
-
-wal_file = "data/cs.wal/wal"
-
-# All timeouts are in milliseconds
-timeout_propose = 3000
-timeout_propose_delta = 500
-timeout_prevote = 1000
-timeout_prevote_delta = 500
-timeout_precommit = 1000
-timeout_precommit_delta = 500
-timeout_commit = 1000
-
-# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
-skip_timeout_commit = false
-
-# BlockSize
-max_block_size_txs = 10000
-max_block_size_bytes = 1
-
-# EmptyBlocks mode and possible interval between empty blocks in seconds
-create_empty_blocks = true
-create_empty_blocks_interval = 0
-
-# Reactor sleep duration parameters are in milliseconds
-peer_gossip_sleep_duration = 100
-peer_query_maj23_sleep_duration = 2000
-
-##### transactions indexer configuration options #####
-[tx_index]
-
-# What indexer to use for transactions
-#
-# Options:
-#   1) "null" (default)
-#   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-indexer = "kv"
-
-# Comma-separated list of tags to index (by default the only tag is tx hash)
-#
-# It's recommended to index only a subset of tags due to possible memory
-# bloat. This is, of course, depends on the indexer's DB and the volume of
-# transactions.
-index_tags = ""
-
-# When set to true, tells indexer to index all tags. Note this may be not
-# desirable (see the comment above). IndexTags has a precedence over
-# IndexAllTags (i.e. when given both, IndexTags will be indexed).
-index_all_tags = false

docs/examples/node3/config/genesis.json

@@ -1,39 +0,0 @@
-{
-  "genesis_time": "0001-01-01T00:00:00Z",
-  "chain_id": "test-chain-A2i3OZ",
-  "validators": [
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
-      },
-      "power": "10",
-      "name": ""
-    },
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyEd25519",
-        "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
-      },
-      "power": "10",
-      "name": ""
-    }
-  ],
-  "app_hash": ""
-}

docs/examples/node3/config/node_key.json

@@ -1 +0,0 @@
-{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"9Y9xp/tUJJ6pHTF5SUV0bGKYSdVbFtMHu+Lr8S0JBSZAwneaejnfOEU1LMKOnQ07skrDUaJcj5di3jAyjxJzqg=="}}

docs/examples/node3/config/priv_validator.json

@@ -1,14 +0,0 @@
-{
-  "address": "9A1A6914EB5F4FF0269C7EEEE627C27310CC64F9",
-  "pub_key": {
-    "type": "tendermint/PubKeyEd25519",
-    "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
-  },
-  "last_height": "0",
-  "last_round": "0",
-  "last_step": 0,
-  "priv_key": {
-    "type": "tendermint/PrivKeyEd25519",
-    "value": "jb52LZ5gp+eQ8nJlFK1z06nBMp1gD8ICmyzdM1icGOgoYBl/Fm8hntptt4hDzlTUQIbr4jrYpJ1ofy6VzT46JQ=="
-  }
-}

docs/getting-started.md

@@ -25,11 +25,13 @@ more info.
 
 Then run
 
-    go get github.com/tendermint/tendermint
-    cd $GOPATH/src/github.com/tendermint/tendermint
-    make get_tools
-    make get_vendor_deps
-    make install_abci
+```
+go get github.com/tendermint/tendermint
+cd $GOPATH/src/github.com/tendermint/tendermint
+make get_tools
+make get_vendor_deps
+make install_abci
+```
 
 Now you should have the `abci-cli` installed; you'll see a couple of
 commands (`counter` and `kvstore`) that are example applications written
@@ -47,13 +49,17 @@ full transaction bytes are stored as the key and the value.
 
 Let's start a kvstore application.
 
-    abci-cli kvstore
+```
+abci-cli kvstore
+```
 
 In another terminal, we can start Tendermint. If you have never run
 Tendermint before, use:
 
-    tendermint init
-    tendermint node
+```
+tendermint init
+tendermint node
+```
 
 If you have used Tendermint, you may want to reset the data for a new
 blockchain by running `tendermint unsafe_reset_all`. Then you can run
@@ -63,14 +69,18 @@ details, see [the guide on using Tendermint](./using-tendermint.md).
 You should see Tendermint making blocks! We can get the status of our
 Tendermint node as follows:
 
-    curl -s localhost:26657/status
+```
+curl -s localhost:26657/status
+```
 
 The `-s` just silences `curl`. For nicer output, pipe the result into a
 tool like [jq](https://stedolan.github.io/jq/) or `json_pp`.
 
 Now let's send some transactions to the kvstore.
 
-    curl -s 'localhost:26657/broadcast_tx_commit?tx="abcd"'
+```
+curl -s 'localhost:26657/broadcast_tx_commit?tx="abcd"'
+```
 
 Note the single quote (`'`) around the url, which ensures that the
 double quotes (`"`) are not escaped by bash. This command sent a
@@ -78,50 +88,56 @@ transaction with bytes `abcd`, so `abcd` will be stored as both the key
 and the value in the Merkle tree. The response should look something
 like:
 
-    {
-      "jsonrpc": "2.0",
-      "id": "",
-      "result": {
-        "check_tx": {
-          "fee": {}
+```
+{
+  "jsonrpc": "2.0",
+  "id": "",
+  "result": {
+    "check_tx": {
+      "fee": {}
+    },
+    "deliver_tx": {
+      "tags": [
+        {
+          "key": "YXBwLmNyZWF0b3I=",
+          "value": "amFl"
         },
-        "deliver_tx": {
-          "tags": [
-            {
-              "key": "YXBwLmNyZWF0b3I=",
-              "value": "amFl"
-            },
-            {
-              "key": "YXBwLmtleQ==",
-              "value": "YWJjZA=="
-            }
-          ],
-          "fee": {}
-        },
-        "hash": "9DF66553F98DE3C26E3C3317A3E4CED54F714E39",
-        "height": 14
-      }
-    }
+        {
+          "key": "YXBwLmtleQ==",
+          "value": "YWJjZA=="
+        }
+      ],
+      "fee": {}
+    },
+    "hash": "9DF66553F98DE3C26E3C3317A3E4CED54F714E39",
+    "height": 14
+  }
+}
+```
 
 We can confirm that our transaction worked and the value got stored by
 querying the app:
 
-    curl -s 'localhost:26657/abci_query?data="abcd"'
+```
+curl -s 'localhost:26657/abci_query?data="abcd"'
+```
 
 The result should look like:
 
-    {
-      "jsonrpc": "2.0",
-      "id": "",
-      "result": {
-        "response": {
-          "log": "exists",
-          "index": "-1",
-          "key": "YWJjZA==",
-          "value": "YWJjZA=="
-        }
-      }
+```
+{
+  "jsonrpc": "2.0",
+  "id": "",
+  "result": {
+    "response": {
+      "log": "exists",
+      "index": "-1",
+      "key": "YWJjZA==",
+      "value": "YWJjZA=="
     }
+  }
+}
+```
 
 Note the `value` in the result (`YWJjZA==`); this is the base64-encoding
 of the ASCII of `abcd`. You can verify this in a python 2 shell by
@@ -132,12 +148,16 @@ human-readable](https://github.com/tendermint/tendermint/issues/1794).
 
 Now let's try setting a different key and value:
 
-    curl -s 'localhost:26657/broadcast_tx_commit?tx="name=satoshi"'
+```
+curl -s 'localhost:26657/broadcast_tx_commit?tx="name=satoshi"'
+```
 
 Now if we query for `name`, we should get `satoshi`, or `c2F0b3NoaQ==`
 in base64:
 
-    curl -s 'localhost:26657/abci_query?data="name"'
+```
+curl -s 'localhost:26657/abci_query?data="name"'
+```
 
 Try some other transactions and queries to make sure everything is
 working!
@@ -171,57 +191,67 @@ Let's kill the previous instance of `tendermint` and the `kvstore`
 application, and start the counter app. We can enable `serial=on` with a
 flag:
 
-    abci-cli counter --serial
+```
+abci-cli counter --serial
+```
 
 In another window, reset then start Tendermint:
 
-    tendermint unsafe_reset_all
-    tendermint node
+```
+tendermint unsafe_reset_all
+tendermint node
+```
 
 Once again, you can see the blocks streaming by. Let's send some
 transactions. Since we have set `serial=on`, the first transaction must
 be the number `0`:
 
-    curl localhost:26657/broadcast_tx_commit?tx=0x00
+```
+curl localhost:26657/broadcast_tx_commit?tx=0x00
+```
 
 Note the empty (hence successful) response. The next transaction must be
 the number `1`. If instead, we try to send a `5`, we get an error:
 
-    > curl localhost:26657/broadcast_tx_commit?tx=0x05
-    {
-      "jsonrpc": "2.0",
-      "id": "",
-      "result": {
-        "check_tx": {
-          "fee": {}
-        },
-        "deliver_tx": {
-          "code": 2,
-          "log": "Invalid nonce. Expected 1, got 5",
-          "fee": {}
-        },
-        "hash": "33B93DFF98749B0D6996A70F64071347060DC19C",
-        "height": 34
-      }
-    }
+```
+> curl localhost:26657/broadcast_tx_commit?tx=0x05
+{
+  "jsonrpc": "2.0",
+  "id": "",
+  "result": {
+    "check_tx": {
+      "fee": {}
+    },
+    "deliver_tx": {
+      "code": 2,
+      "log": "Invalid nonce. Expected 1, got 5",
+      "fee": {}
+    },
+    "hash": "33B93DFF98749B0D6996A70F64071347060DC19C",
+    "height": 34
+  }
+}
+```
 
 But if we send a `1`, it works again:
 
-    > curl localhost:26657/broadcast_tx_commit?tx=0x01
-    {
-      "jsonrpc": "2.0",
-      "id": "",
-      "result": {
-        "check_tx": {
-          "fee": {}
-        },
-        "deliver_tx": {
-          "fee": {}
-        },
-        "hash": "F17854A977F6FA7EEA1BD758E296710B86F72F3D",
-        "height": 60
-      }
-    }
+```
+> curl localhost:26657/broadcast_tx_commit?tx=0x01
+{
+  "jsonrpc": "2.0",
+  "id": "",
+  "result": {
+    "check_tx": {
+      "fee": {}
+    },
+    "deliver_tx": {
+      "fee": {}
+    },
+    "hash": "F17854A977F6FA7EEA1BD758E296710B86F72F3D",
+    "height": 60
+  }
+}
+```
 
 For more details on the `broadcast_tx` API, see [the guide on using
 Tendermint](./using-tendermint.md).
@@ -236,26 +266,34 @@ You'll also need to fetch the relevant repository, from
 [here](https://github.com/tendermint/js-abci) then install it. As go
 devs, we keep all our code under the `$GOPATH`, so run:
 
-    go get github.com/tendermint/js-abci &> /dev/null
-    cd $GOPATH/src/github.com/tendermint/js-abci/example
-    npm install
-    cd ..
+```
+go get github.com/tendermint/js-abci &> /dev/null
+cd $GOPATH/src/github.com/tendermint/js-abci/example
+npm install
+cd ..
+```
 
 Kill the previous `counter` and `tendermint` processes. Now run the app:
 
-    node example/counter.js
+```
+node example/counter.js
+```
 
 In another window, reset and start `tendermint`:
 
-    tendermint unsafe_reset_all
-    tendermint node
+```
+tendermint unsafe_reset_all
+tendermint node
+```
 
 Once again, you should see blocks streaming by - but now, our
 application is written in javascript! Try sending some transactions, and
 like before - the results should be the same:
 
-    curl localhost:26657/broadcast_tx_commit?tx=0x00 # ok
-    curl localhost:26657/broadcast_tx_commit?tx=0x05 # invalid nonce
-    curl localhost:26657/broadcast_tx_commit?tx=0x01 # ok
+```
+curl localhost:26657/broadcast_tx_commit?tx=0x00 # ok
+curl localhost:26657/broadcast_tx_commit?tx=0x05 # invalid nonce
+curl localhost:26657/broadcast_tx_commit?tx=0x01 # ok
+```
 
 Neat, eh?

docs/how-to-read-logs.md

@@ -5,49 +5,59 @@
 We first create three connections (mempool, consensus and query) to the
 application (running `kvstore` locally in this case).
 
-    I[10-04|13:54:27.364] Starting multiAppConn                        module=proxy impl=multiAppConn
-    I[10-04|13:54:27.366] Starting localClient                         module=abci-client connection=query impl=localClient
-    I[10-04|13:54:27.366] Starting localClient                         module=abci-client connection=mempool impl=localClient
-    I[10-04|13:54:27.367] Starting localClient                         module=abci-client connection=consensus impl=localClient
+```
+I[10-04|13:54:27.364] Starting multiAppConn                        module=proxy impl=multiAppConn
+I[10-04|13:54:27.366] Starting localClient                         module=abci-client connection=query impl=localClient
+I[10-04|13:54:27.366] Starting localClient                         module=abci-client connection=mempool impl=localClient
+I[10-04|13:54:27.367] Starting localClient                         module=abci-client connection=consensus impl=localClient
+```
 
 Then Tendermint Core and the application perform a handshake.
 
-    I[10-04|13:54:27.367] ABCI Handshake                               module=consensus appHeight=90 appHash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
-    I[10-04|13:54:27.368] ABCI Replay Blocks                           module=consensus appHeight=90 storeHeight=90 stateHeight=90
-    I[10-04|13:54:27.368] Completed ABCI Handshake - Tendermint and App are synced module=consensus appHeight=90 appHash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+```
+I[10-04|13:54:27.367] ABCI Handshake                               module=consensus appHeight=90 appHash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+I[10-04|13:54:27.368] ABCI Replay Blocks                           module=consensus appHeight=90 storeHeight=90 stateHeight=90
+I[10-04|13:54:27.368] Completed ABCI Handshake - Tendermint and App are synced module=consensus appHeight=90 appHash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+```
 
 After that, we start a few more things like the event switch, reactors,
 and perform UPNP discover in order to detect the IP address.
 
-    I[10-04|13:54:27.374] Starting EventSwitch                         module=types impl=EventSwitch
-    I[10-04|13:54:27.375] This node is a validator                     module=consensus
-    I[10-04|13:54:27.379] Starting Node                                module=main impl=Node
-    I[10-04|13:54:27.381] Local listener                               module=p2p ip=:: port=26656
-    I[10-04|13:54:27.382] Getting UPNP external address                module=p2p
-    I[10-04|13:54:30.386] Could not perform UPNP discover              module=p2p err="write udp4 0.0.0.0:38238->239.255.255.250:1900: i/o timeout"
-    I[10-04|13:54:30.386] Starting DefaultListener                     module=p2p impl=Listener(@10.0.2.15:26656)
-    I[10-04|13:54:30.387] Starting P2P Switch                          module=p2p impl="P2P Switch"
-    I[10-04|13:54:30.387] Starting MempoolReactor                      module=mempool impl=MempoolReactor
-    I[10-04|13:54:30.387] Starting BlockchainReactor                   module=blockchain impl=BlockchainReactor
-    I[10-04|13:54:30.387] Starting ConsensusReactor                    module=consensus impl=ConsensusReactor
-    I[10-04|13:54:30.387] ConsensusReactor                             module=consensus fastSync=false
-    I[10-04|13:54:30.387] Starting ConsensusState                      module=consensus impl=ConsensusState
-    I[10-04|13:54:30.387] Starting WAL                                 module=consensus wal=/home/vagrant/.tendermint/data/cs.wal/wal impl=WAL
-    I[10-04|13:54:30.388] Starting TimeoutTicker                       module=consensus impl=TimeoutTicker
+```
+I[10-04|13:54:27.374] Starting EventSwitch                         module=types impl=EventSwitch
+I[10-04|13:54:27.375] This node is a validator                     module=consensus
+I[10-04|13:54:27.379] Starting Node                                module=main impl=Node
+I[10-04|13:54:27.381] Local listener                               module=p2p ip=:: port=26656
+I[10-04|13:54:27.382] Getting UPNP external address                module=p2p
+I[10-04|13:54:30.386] Could not perform UPNP discover              module=p2p err="write udp4 0.0.0.0:38238->239.255.255.250:1900: i/o timeout"
+I[10-04|13:54:30.386] Starting DefaultListener                     module=p2p impl=Listener(@10.0.2.15:26656)
+I[10-04|13:54:30.387] Starting P2P Switch                          module=p2p impl="P2P Switch"
+I[10-04|13:54:30.387] Starting MempoolReactor                      module=mempool impl=MempoolReactor
+I[10-04|13:54:30.387] Starting BlockchainReactor                   module=blockchain impl=BlockchainReactor
+I[10-04|13:54:30.387] Starting ConsensusReactor                    module=consensus impl=ConsensusReactor
+I[10-04|13:54:30.387] ConsensusReactor                             module=consensus fastSync=false
+I[10-04|13:54:30.387] Starting ConsensusState                      module=consensus impl=ConsensusState
+I[10-04|13:54:30.387] Starting WAL                                 module=consensus wal=/home/vagrant/.tendermint/data/cs.wal/wal impl=WAL
+I[10-04|13:54:30.388] Starting TimeoutTicker                       module=consensus impl=TimeoutTicker
+```
 
 Notice the second row where Tendermint Core reports that "This node is a
 validator". It also could be just an observer (regular node).
 
 Next we replay all the messages from the WAL.
 
-    I[10-04|13:54:30.390] Catchup by replaying consensus messages      module=consensus height=91
-    I[10-04|13:54:30.390] Replay: New Step                             module=consensus height=91 round=0 step=RoundStepNewHeight
-    I[10-04|13:54:30.390] Replay: Done                                 module=consensus
+```
+I[10-04|13:54:30.390] Catchup by replaying consensus messages      module=consensus height=91
+I[10-04|13:54:30.390] Replay: New Step                             module=consensus height=91 round=0 step=RoundStepNewHeight
+I[10-04|13:54:30.390] Replay: Done                                 module=consensus
+```
 
 "Started node" message signals that everything is ready for work.
 
-    I[10-04|13:54:30.391] Starting RPC HTTP server on tcp socket 0.0.0.0:26657 module=rpc-server
-    I[10-04|13:54:30.392] Started node                                 module=main nodeInfo="NodeInfo{id: DF22D7C92C91082324A1312F092AA1DA197FA598DBBFB6526E, moniker: anonymous, network: test-chain-3MNw2N [remote , listen 10.0.2.15:26656], version: 0.11.0-10f361fc ([wire_version=0.6.2 p2p_version=0.5.0 consensus_version=v1/0.2.2 rpc_version=0.7.0/3 tx_index=on rpc_addr=tcp://0.0.0.0:26657])}"
+```
+I[10-04|13:54:30.391] Starting RPC HTTP server on tcp socket 0.0.0.0:26657 module=rpc-server
+I[10-04|13:54:30.392] Started node                                 module=main nodeInfo="NodeInfo{id: DF22D7C92C91082324A1312F092AA1DA197FA598DBBFB6526E, moniker: anonymous, network: test-chain-3MNw2N [remote , listen 10.0.2.15:26656], version: 0.11.0-10f361fc ([wire_version=0.6.2 p2p_version=0.5.0 consensus_version=v1/0.2.2 rpc_version=0.7.0/3 tx_index=on rpc_addr=tcp://0.0.0.0:26657])}"
+```
 
 Next follows a standard block creation cycle, where we enter a new
 round, propose a block, receive more than 2/3 of prevotes, then
@@ -56,75 +66,77 @@ please refer to [Consensus
 Overview](./introduction.md#consensus-overview) or [Byzantine Consensus
 Algorithm](./spec/consensus).
 
-    I[10-04|13:54:30.393] enterNewRound(91/0). Current: 91/0/RoundStepNewHeight module=consensus
-    I[10-04|13:54:30.393] enterPropose(91/0). Current: 91/0/RoundStepNewRound module=consensus
-    I[10-04|13:54:30.393] enterPropose: Our turn to propose            module=consensus proposer=125B0E3C5512F5C2B0E1109E31885C4511570C42 privValidator="PrivValidator{125B0E3C5512F5C2B0E1109E31885C4511570C42 LH:90, LR:0, LS:3}"
-    I[10-04|13:54:30.394] Signed proposal                              module=consensus height=91 round=0 proposal="Proposal{91/0 1:21B79872514F (-1,:0:000000000000) {/10EDEDD7C84E.../}}"
-    I[10-04|13:54:30.397] Received complete proposal block             module=consensus height=91 hash=F671D562C7B9242900A286E1882EE64E5556FE9E
-    I[10-04|13:54:30.397] enterPrevote(91/0). Current: 91/0/RoundStepPropose module=consensus
-    I[10-04|13:54:30.397] enterPrevote: ProposalBlock is valid         module=consensus height=91 round=0
-    I[10-04|13:54:30.398] Signed and pushed vote                       module=consensus height=91 round=0 vote="Vote{0:125B0E3C5512 91/00/1(Prevote) F671D562C7B9 {/89047FFC21D8.../}}" err=null
-    I[10-04|13:54:30.401] Added to prevote                             module=consensus vote="Vote{0:125B0E3C5512 91/00/1(Prevote) F671D562C7B9 {/89047FFC21D8.../}}" prevotes="VoteSet{H:91 R:0 T:1 +2/3:F671D562C7B9242900A286E1882EE64E5556FE9E:1:21B79872514F BA{1:X} map[]}"
-    I[10-04|13:54:30.401] enterPrecommit(91/0). Current: 91/0/RoundStepPrevote module=consensus
-    I[10-04|13:54:30.401] enterPrecommit: +2/3 prevoted proposal block. Locking module=consensus hash=F671D562C7B9242900A286E1882EE64E5556FE9E
-    I[10-04|13:54:30.402] Signed and pushed vote                       module=consensus height=91 round=0 vote="Vote{0:125B0E3C5512 91/00/2(Precommit) F671D562C7B9 {/80533478E41A.../}}" err=null
-    I[10-04|13:54:30.404] Added to precommit                           module=consensus vote="Vote{0:125B0E3C5512 91/00/2(Precommit) F671D562C7B9 {/80533478E41A.../}}" precommits="VoteSet{H:91 R:0 T:2 +2/3:F671D562C7B9242900A286E1882EE64E5556FE9E:1:21B79872514F BA{1:X} map[]}"
-    I[10-04|13:54:30.404] enterCommit(91/0). Current: 91/0/RoundStepPrecommit module=consensus
-    I[10-04|13:54:30.405] Finalizing commit of block with 0 txs        module=consensus height=91 hash=F671D562C7B9242900A286E1882EE64E5556FE9E root=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
-    I[10-04|13:54:30.405] Block{
-      Header{
-        ChainID:        test-chain-3MNw2N
-        Height:         91
-        Time:           2017-10-04 13:54:30.393 +0000 UTC
-        NumTxs:         0
-        LastBlockID:    F15AB8BEF9A6AAB07E457A6E16BC410546AA4DC6:1:D505DA273544
-        LastCommit:     56FEF2EFDB8B37E9C6E6D635749DF3169D5F005D
-        Data:
-        Validators:     CE25FBFF2E10C0D51AA1A07C064A96931BC8B297
-        App:            E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
-      }#F671D562C7B9242900A286E1882EE64E5556FE9E
-      Data{
-
-      }#
-      Commit{
-        BlockID:    F15AB8BEF9A6AAB07E457A6E16BC410546AA4DC6:1:D505DA273544
-        Precommits: Vote{0:125B0E3C5512 90/00/2(Precommit) F15AB8BEF9A6 {/FE98E2B956F0.../}}
-      }#56FEF2EFDB8B37E9C6E6D635749DF3169D5F005D
-    }#F671D562C7B9242900A286E1882EE64E5556FE9E module=consensus
-    I[10-04|13:54:30.408] Executed block                               module=state height=91 validTxs=0 invalidTxs=0
-    I[10-04|13:54:30.410] Committed state                              module=state height=91 txs=0 hash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
-    I[10-04|13:54:30.410] Recheck txs                                  module=mempool numtxs=0 height=91
+```
+I[10-04|13:54:30.393] enterNewRound(91/0). Current: 91/0/RoundStepNewHeight module=consensus
+I[10-04|13:54:30.393] enterPropose(91/0). Current: 91/0/RoundStepNewRound module=consensus
+I[10-04|13:54:30.393] enterPropose: Our turn to propose            module=consensus proposer=125B0E3C5512F5C2B0E1109E31885C4511570C42 privValidator="PrivValidator{125B0E3C5512F5C2B0E1109E31885C4511570C42 LH:90, LR:0, LS:3}"
+I[10-04|13:54:30.394] Signed proposal                              module=consensus height=91 round=0 proposal="Proposal{91/0 1:21B79872514F (-1,:0:000000000000) {/10EDEDD7C84E.../}}"
+I[10-04|13:54:30.397] Received complete proposal block             module=consensus height=91 hash=F671D562C7B9242900A286E1882EE64E5556FE9E
+I[10-04|13:54:30.397] enterPrevote(91/0). Current: 91/0/RoundStepPropose module=consensus
+I[10-04|13:54:30.397] enterPrevote: ProposalBlock is valid         module=consensus height=91 round=0
+I[10-04|13:54:30.398] Signed and pushed vote                       module=consensus height=91 round=0 vote="Vote{0:125B0E3C5512 91/00/1(Prevote) F671D562C7B9 {/89047FFC21D8.../}}" err=null
+I[10-04|13:54:30.401] Added to prevote                             module=consensus vote="Vote{0:125B0E3C5512 91/00/1(Prevote) F671D562C7B9 {/89047FFC21D8.../}}" prevotes="VoteSet{H:91 R:0 T:1 +2/3:F671D562C7B9242900A286E1882EE64E5556FE9E:1:21B79872514F BA{1:X} map[]}"
+I[10-04|13:54:30.401] enterPrecommit(91/0). Current: 91/0/RoundStepPrevote module=consensus
+I[10-04|13:54:30.401] enterPrecommit: +2/3 prevoted proposal block. Locking module=consensus hash=F671D562C7B9242900A286E1882EE64E5556FE9E
+I[10-04|13:54:30.402] Signed and pushed vote                       module=consensus height=91 round=0 vote="Vote{0:125B0E3C5512 91/00/2(Precommit) F671D562C7B9 {/80533478E41A.../}}" err=null
+I[10-04|13:54:30.404] Added to precommit                           module=consensus vote="Vote{0:125B0E3C5512 91/00/2(Precommit) F671D562C7B9 {/80533478E41A.../}}" precommits="VoteSet{H:91 R:0 T:2 +2/3:F671D562C7B9242900A286E1882EE64E5556FE9E:1:21B79872514F BA{1:X} map[]}"
+I[10-04|13:54:30.404] enterCommit(91/0). Current: 91/0/RoundStepPrecommit module=consensus
+I[10-04|13:54:30.405] Finalizing commit of block with 0 txs        module=consensus height=91 hash=F671D562C7B9242900A286E1882EE64E5556FE9E root=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+I[10-04|13:54:30.405] Block{
+  Header{
+    ChainID:        test-chain-3MNw2N
+    Height:         91
+    Time:           2017-10-04 13:54:30.393 +0000 UTC
+    NumTxs:         0
+    LastBlockID:    F15AB8BEF9A6AAB07E457A6E16BC410546AA4DC6:1:D505DA273544
+    LastCommit:     56FEF2EFDB8B37E9C6E6D635749DF3169D5F005D
+    Data:
+    Validators:     CE25FBFF2E10C0D51AA1A07C064A96931BC8B297
+    App:            E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+  }#F671D562C7B9242900A286E1882EE64E5556FE9E
+  Data{
+
+  }#
+  Commit{
+    BlockID:    F15AB8BEF9A6AAB07E457A6E16BC410546AA4DC6:1:D505DA273544
+    Precommits: Vote{0:125B0E3C5512 90/00/2(Precommit) F15AB8BEF9A6 {/FE98E2B956F0.../}}
+  }#56FEF2EFDB8B37E9C6E6D635749DF3169D5F005D
+}#F671D562C7B9242900A286E1882EE64E5556FE9E module=consensus
+I[10-04|13:54:30.408] Executed block                               module=state height=91 validTxs=0 invalidTxs=0
+I[10-04|13:54:30.410] Committed state                              module=state height=91 txs=0 hash=E0FBAFBF6FCED8B9786DDFEB1A0D4FA2501BADAD
+I[10-04|13:54:30.410] Recheck txs                                  module=mempool numtxs=0 height=91
+```
 
 ## List of modules
 
 Here is the list of modules you may encounter in Tendermint's log and a
 little overview what they do.
 
--   `abci-client` As mentioned in [Application Development Guide](./app-development.md),    Tendermint acts as an ABCI
-    client with respect to the application and maintains 3 connections:
-    mempool, consensus and query. The code used by Tendermint Core can
-    be found [here](https://github.com/tendermint/tendermint/tree/develop/abci/client).
--   `blockchain` Provides storage, pool (a group of peers), and reactor
-    for both storing and exchanging blocks between peers.
--   `consensus` The heart of Tendermint core, which is the
-    implementation of the consensus algorithm. Includes two
-    "submodules": `wal` (write-ahead logging) for ensuring data
-    integrity and `replay` to replay blocks and messages on recovery
-    from a crash.
--   `events` Simple event notification system. The list of events can be
-    found
-    [here](https://github.com/tendermint/tendermint/blob/master/types/events.go).
-    You can subscribe to them by calling `subscribe` RPC method. Refer
-    to [RPC docs](./specification/rpc.md) for additional information.
--   `mempool` Mempool module handles all incoming transactions, whenever
-    they are coming from peers or the application.
--   `p2p` Provides an abstraction around peer-to-peer communication. For
-    more details, please check out the
-    [README](https://github.com/tendermint/tendermint/blob/master/p2p/README.md).
--   `rpc` [Tendermint's RPC](./specification/rpc.md).
--   `rpc-server` RPC server. For implementation details, please read the
-    [README](https://github.com/tendermint/tendermint/blob/master/rpc/lib/README.md).
--   `state` Represents the latest state and execution submodule, which
-    executes blocks against the application.
--   `types` A collection of the publicly exposed types and methods to
-    work with them.
+- `abci-client` As mentioned in [Application Development Guide](./app-development.md), Tendermint acts as an ABCI
+  client with respect to the application and maintains 3 connections:
+  mempool, consensus and query. The code used by Tendermint Core can
+  be found [here](https://github.com/tendermint/tendermint/tree/develop/abci/client).
+- `blockchain` Provides storage, pool (a group of peers), and reactor
+  for both storing and exchanging blocks between peers.
+- `consensus` The heart of Tendermint core, which is the
+  implementation of the consensus algorithm. Includes two
+  "submodules": `wal` (write-ahead logging) for ensuring data
+  integrity and `replay` to replay blocks and messages on recovery
+  from a crash.
+- `events` Simple event notification system. The list of events can be
+  found
+  [here](https://github.com/tendermint/tendermint/blob/master/types/events.go).
+  You can subscribe to them by calling `subscribe` RPC method. Refer
+  to [RPC docs](./specification/rpc.md) for additional information.
+- `mempool` Mempool module handles all incoming transactions, whenever
+  they are coming from peers or the application.
+- `p2p` Provides an abstraction around peer-to-peer communication. For
+  more details, please check out the
+  [README](https://github.com/tendermint/tendermint/blob/master/p2p/README.md).
+- `rpc` [Tendermint's RPC](./specification/rpc.md).
+- `rpc-server` RPC server. For implementation details, please read the
+  [README](https://github.com/tendermint/tendermint/blob/master/rpc/lib/README.md).
+- `state` Represents the latest state and execution submodule, which
+  executes blocks against the application.
+- `types` A collection of the publicly exposed types and methods to
+  work with them.

docs/indexing-transactions.md

@@ -5,27 +5,29 @@ to their results.
 
 Let's take a look at the `[tx_index]` config section:
 
-    ##### transactions indexer configuration options #####
-    [tx_index]
-
-    # What indexer to use for transactions
-    #
-    # Options:
-    #   1) "null" (default)
-    #   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-    indexer = "kv"
-
-    # Comma-separated list of tags to index (by default the only tag is tx hash)
-    #
-    # It's recommended to index only a subset of tags due to possible memory
-    # bloat. This is, of course, depends on the indexer's DB and the volume of
-    # transactions.
-    index_tags = ""
-
-    # When set to true, tells indexer to index all tags. Note this may be not
-    # desirable (see the comment above). IndexTags has a precedence over
-    # IndexAllTags (i.e. when given both, IndexTags will be indexed).
-    index_all_tags = false
+```
+##### transactions indexer configuration options #####
+[tx_index]
+
+# What indexer to use for transactions
+#
+# Options:
+#   1) "null" (default)
+#   2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
+indexer = "kv"
+
+# Comma-separated list of tags to index (by default the only tag is tx hash)
+#
+# It's recommended to index only a subset of tags due to possible memory
+# bloat. This is, of course, depends on the indexer's DB and the volume of
+# transactions.
+index_tags = ""
+
+# When set to true, tells indexer to index all tags. Note this may be not
+# desirable (see the comment above). IndexTags has a precedence over
+# IndexAllTags (i.e. when given both, IndexTags will be indexed).
+index_all_tags = false
+```
 
 By default, Tendermint will index all transactions by their respective
 hashes using an embedded simple indexer. Note, we are planning to add
@@ -39,15 +41,17 @@ pairs of UTF-8 encoded strings (e.g. "account.owner": "Bob", "balance":
 
 Example:
 
-    func (app *KVStoreApplication) DeliverTx(tx []byte) types.Result {
-        ...
-        tags := []cmn.KVPair{
-          {[]byte("account.name"), []byte("igor")},
-          {[]byte("account.address"), []byte("0xdeadbeef")},
-          {[]byte("tx.amount"), []byte("7")},
-        }
-        return types.ResponseDeliverTx{Code: code.CodeTypeOK, Tags: tags}
+```
+func (app *KVStoreApplication) DeliverTx(tx []byte) types.Result {
+    ...
+    tags := []cmn.KVPair{
+      {[]byte("account.name"), []byte("igor")},
+      {[]byte("account.address"), []byte("0xdeadbeef")},
+      {[]byte("tx.amount"), []byte("7")},
     }
+    return types.ResponseDeliverTx{Code: code.CodeTypeOK, Tags: tags}
+}
+```
 
 If you want Tendermint to only index transactions by "account.name" tag,
 in the config set `tx_index.index_tags="account.name"`. If you to index
@@ -55,9 +59,9 @@ all tags, set `index_all_tags=true`
 
 Note, there are a few predefined tags:
 
--   `tm.event` (event type)
--   `tx.hash` (transaction's hash)
--   `tx.height` (height of the block transaction was committed in)
+- `tm.event` (event type)
+- `tx.hash` (transaction's hash)
+- `tx.height` (height of the block transaction was committed in)
 
 Tendermint will throw a warning if you try to use any of the above keys.
 
@@ -66,7 +70,9 @@ Tendermint will throw a warning if you try to use any of the above keys.
 You can query the transaction results by calling `/tx_search` RPC
 endpoint:
 
-    curl "localhost:26657/tx_search?query=\"account.name='igor'\"&prove=true"
+```
+curl "localhost:26657/tx_search?query=\"account.name='igor'\"&prove=true"
+```
 
 Check out [API docs](https://tendermint.github.io/slate/?shell#txsearch)
 for more information on query syntax and other options.
@@ -76,14 +82,16 @@ for more information on query syntax and other options.
 Clients can subscribe to transactions with the given tags via Websocket
 by providing a query to `/subscribe` RPC endpoint.
 
-    {
-        "jsonrpc": "2.0",
-        "method": "subscribe",
-        "id": "0",
-        "params": {
-            "query": "account.name='igor'"
-        }
+```
+{
+    "jsonrpc": "2.0",
+    "method": "subscribe",
+    "id": "0",
+    "params": {
+        "query": "account.name='igor'"
     }
+}
+```
 
 Check out [API docs](https://tendermint.github.io/slate/#subscribe) for
 more information on query syntax and other options.

docs/install.md

@@ -57,7 +57,7 @@ cd $GOPATH/src/github.com/tendermint/tendermint
 make install
 ```
 
-To upgrade, run 
+To upgrade, run
 
 ```
 cd $GOPATH/src/github.com/tendermint/tendermint

docs/introduction.md

@@ -61,13 +61,14 @@ providing basic services to distributed systems, such as dynamic
 configuration, service discovery, locking, leader-election, and so on.
 
 Tendermint is in essence similar software, but with two key differences:
+
 - It is Byzantine Fault Tolerant, meaning it can only tolerate up to a
-1/3 of failures, but those failures can include arbitrary behaviour -
-including hacking and malicious attacks. - It does not specify a
-particular application, like a fancy key-value store. Instead, it
-focuses on arbitrary state machine replication, so developers can build
-the application logic that's right for them, from key-value store to
-cryptocurrency to e-voting platform and beyond.
+  1/3 of failures, but those failures can include arbitrary behaviour -
+  including hacking and malicious attacks. - It does not specify a
+  particular application, like a fancy key-value store. Instead, it
+  focuses on arbitrary state machine replication, so developers can build
+  the application logic that's right for them, from key-value store to
+  cryptocurrency to e-voting platform and beyond.
 
 The layout of this Tendermint website content is also ripped directly
 and without shame from [consul.io](https://www.consul.io/) and the other
@@ -167,16 +168,16 @@ maintains a fully audited Unspent Transaction Output (UTXO) database. If
 one wanted to create a Bitcoin-like system on top of ABCI, Tendermint
 Core would be responsible for
 
--   Sharing blocks and transactions between nodes
--   Establishing a canonical/immutable order of transactions
-    (the blockchain)
+- Sharing blocks and transactions between nodes
+- Establishing a canonical/immutable order of transactions
+  (the blockchain)
 
 The application will be responsible for
 
--   Maintaining the UTXO database
--   Validating cryptographic signatures of transactions
--   Preventing transactions from spending non-existent transactions
--   Allowing clients to query the UTXO database.
+- Maintaining the UTXO database
+- Validating cryptographic signatures of transactions
+- Preventing transactions from spending non-existent transactions
+- Allowing clients to query the UTXO database.
 
 Tendermint is able to decompose the blockchain design by offering a very
 simple API (ie. the ABCI) between the application process and consensus
@@ -242,14 +243,14 @@ Java, C++, Python, or Go. Game programmers and blockchain developers are
 already familiar with creating deterministic programs by avoiding
 sources of non-determinism such as:
 
--   random number generators (without deterministic seeding)
--   race conditions on threads (or avoiding threads altogether)
--   the system clock
--   uninitialized memory (in unsafe programming languages like C
-    or C++)
--   [floating point
-    arithmetic](http://gafferongames.com/networking-for-game-programmers/floating-point-determinism/)
--   language features that are random (e.g. map iteration in Go)
+- random number generators (without deterministic seeding)
+- race conditions on threads (or avoiding threads altogether)
+- the system clock
+- uninitialized memory (in unsafe programming languages like C
+  or C++)
+- [floating point
+  arithmetic](http://gafferongames.com/networking-for-game-programmers/floating-point-determinism/)
+- language features that are random (e.g. map iteration in Go)
 
 While programmers can avoid non-determinism by being careful, it is also
 possible to create a special linter or static analyzer for each language
@@ -298,8 +299,8 @@ introduces a few **locking** rules which modulate which paths can be
 followed in the flow diagram. Once a validator precommits a block, it is
 locked on that block. Then,
 
-1)  it must prevote for the block it is locked on
-2)  it can only unlock, and precommit for a new block, if there is a
+1.  it must prevote for the block it is locked on
+2.  it can only unlock, and precommit for a new block, if there is a
     polka for that block in a later round
 
 ## Stake

docs/package.json

@@ -0,0 +1,37 @@
+{
+  "dependencies": {
+    "prettier": "^1.13.7",
+    "remark-cli": "^5.0.0",
+    "remark-lint-no-dead-urls": "^0.3.0",
+    "textlint": "^10.2.1"
+  },
+  "name": "tendermint",
+  "description": "Tendermint Core Documentation",
+  "version": "0.0.1",
+  "main": "README.md",
+  "devDependencies": {},
+  "scripts": {
+    "lint:json": "prettier \"**/*.json\" --write",
+    "lint:md": "prettier \"**/*.md\" --write && remark . && textlint \"md/**\"",
+    "lint": "yarn lint:json && yarn lint:md"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tendermint/tendermint.git"
+  },
+  "keywords": [
+    "tendermint",
+    "blockchain"
+  ],
+  "author": "Tendermint",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/tendermint/tendermint/issues"
+  },
+  "homepage": "https://tendermint.com/docs/",
+  "remarkConfig": {
+    "plugins": [
+      "remark-lint-no-dead-urls"
+    ]
+  }
+}

docs/running-in-production.md

@@ -49,21 +49,25 @@ second TODO is to query the /status RPC endpoint. It provides the
 necessary info: whenever the node is syncing or not, what height it is
 on, etc.
 
-    $ curl http(s)://{ip}:{rpcPort}/status
+```   
+curl http(s)://{ip}:{rpcPort}/status
+```
 
 `dump_consensus_state` will give you a detailed overview of the
 consensus state (proposer, lastest validators, peers states). From it,
 you should be able to figure out why, for example, the network had
 halted.
 
-    $ curl http(s)://{ip}:{rpcPort}/dump_consensus_state
+```
+curl http(s)://{ip}:{rpcPort}/dump_consensus_state
+```
 
 There is a reduced version of this endpoint - `consensus_state`, which
 returns just the votes seen at the current height.
 
--   [Github Issues](https://github.com/tendermint/tendermint/issues)
--   [StackOverflow
-    questions](https://stackoverflow.com/questions/tagged/tendermint)
+- [Github Issues](https://github.com/tendermint/tendermint/issues)
+- [StackOverflow
+  questions](https://stackoverflow.com/questions/tagged/tendermint)
 
 ## Monitoring Tendermint
 
@@ -107,18 +111,18 @@ programs](https://golang.org/pkg/os/signal/#hdr-Default_behavior_of_signals_in_G
 While actual specs vary depending on the load and validators count,
 minimal requirements are:
 
--   1GB RAM
--   25GB of disk space
--   1.4 GHz CPU
+- 1GB RAM
+- 25GB of disk space
+- 1.4 GHz CPU
 
 SSD disks are preferable for applications with high transaction
 throughput.
 
 Recommended:
 
--   2GB RAM
--   100GB SSD
--   x64 2.0 GHz 2v CPU
+- 2GB RAM
+- 100GB SSD
+- x64 2.0 GHz 2v CPU
 
 While for now, Tendermint stores all the history and it may require
 significant disk space over time, we are planning to implement state
@@ -145,21 +149,23 @@ Cosmos network.
 
 ## Configuration parameters
 
--   `p2p.flush_throttle_timeout` `p2p.max_packet_msg_payload_size`
-    `p2p.send_rate` `p2p.recv_rate`
+- `p2p.flush_throttle_timeout` `p2p.max_packet_msg_payload_size`
+  `p2p.send_rate` `p2p.recv_rate`
 
 If you are going to use Tendermint in a private domain and you have a
 private high-speed network among your peers, it makes sense to lower
 flush throttle timeout and increase other params.
 
-    [p2p]
+```
+[p2p]
 
-    send_rate=20000000 # 2MB/s
-    recv_rate=20000000 # 2MB/s
-    flush_throttle_timeout=10
-    max_packet_msg_payload_size=10240 # 10KB
+send_rate=20000000 # 2MB/s
+recv_rate=20000000 # 2MB/s
+flush_throttle_timeout=10
+max_packet_msg_payload_size=10240 # 10KB
+```
 
--   `mempool.recheck`
+- `mempool.recheck`
 
 After every block, Tendermint rechecks every transaction left in the
 mempool to see if transactions committed in that block affected the
@@ -167,13 +173,13 @@ application state, so some of the transactions left may become invalid.
 If that does not apply to your application, you can disable it by
 setting `mempool.recheck=false`.
 
--   `mempool.broadcast`
+- `mempool.broadcast`
 
 Setting this to false will stop the mempool from relaying transactions
 to other peers until they are included in a block. It means only the
 peer you send the tx to will see it until it is included in a block.
 
--   `consensus.skip_timeout_commit`
+- `consensus.skip_timeout_commit`
 
 We want `skip_timeout_commit=false` when there is economics on the line
 because proposers should wait to hear for more votes. But if you don't
@@ -182,22 +188,22 @@ be kept false by default for public deployments (e.g. [Cosmos
 Hub](https://cosmos.network/intro/hub)) while for enterprise
 applications, setting it to true is not a problem.
 
--   `consensus.peer_gossip_sleep_duration`
+- `consensus.peer_gossip_sleep_duration`
 
 You can try to reduce the time your node sleeps before checking if
 theres something to send its peers.
 
--   `consensus.timeout_commit`
+- `consensus.timeout_commit`
 
 You can also try lowering `timeout_commit` (time we sleep before
 proposing the next block).
 
--   `consensus.max_block_size_txs`
+- `consensus.max_block_size_txs`
 
 By default, the maximum number of transactions per a block is 10_000.
 Feel free to change it to suit your needs.
 
--   `p2p.addr_book_strict`
+- `p2p.addr_book_strict`
 
 By default, Tendermint checks whenever a peer's address is routable before
 saving it to the address book. The address is considered as routable if the IP

docs/specification/configuration.md

@@ -2,8 +2,7 @@
 
 Tendermint Core can be configured via a TOML file in
 `$TMHOME/config/config.toml`. Some of these parameters can be overridden by
-command-line flags. For most users, the options in the `##### main
-base configuration options #####` are intended to be modified while
+command-line flags. For most users, the options in the `##### main base configuration options #####` are intended to be modified while
 config options further below are intended for advance power users.
 
 ## Options

docs/subscribing-to-events-via-websocket.md

@@ -9,14 +9,16 @@ for third-party applications (for analysys) or inspecting state.
 You can subscribe to any of the events above by calling `subscribe` RPC
 method via Websocket.
 
-    {
-        "jsonrpc": "2.0",
-        "method": "subscribe",
-        "id": "0",
-        "params": {
-            "query": "tm.event='NewBlock'"
-        }
+```
+{
+    "jsonrpc": "2.0",
+    "method": "subscribe",
+    "id": "0",
+    "params": {
+        "query": "tm.event='NewBlock'"
     }
+}
+```
 
 Check out [API docs](https://tendermint.github.io/slate/#subscribe) for
 more information on query syntax and other options.

docs/terraform-and-ansible.md

@@ -12,17 +12,17 @@ script](https://github.com/tendermint/tendermint/blob/develop/networks/remote/in
 that can be run on a fresh DO droplet and will automatically spin up a 4
 node testnet. The script more or less does everything described below.
 
--   Install [Terraform](https://www.terraform.io/downloads.html) and
-    [Ansible](http://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
-    on a Linux machine.
--   Create a [DigitalOcean API
-    token](https://cloud.digitalocean.com/settings/api/tokens) with read
-    and write capability.
--   Install the python dopy package (`pip install dopy`)
--   Create SSH keys (`ssh-keygen`)
--   Set environment variables:
-
-```    
+- Install [Terraform](https://www.terraform.io/downloads.html) and
+  [Ansible](http://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
+  on a Linux machine.
+- Create a [DigitalOcean API
+  token](https://cloud.digitalocean.com/settings/api/tokens) with read
+  and write capability.
+- Install the python dopy package (`pip install dopy`)
+- Create SSH keys (`ssh-keygen`)
+- Set environment variables:
+
+```
 export DO_API_TOKEN="abcdef01234567890abcdef01234567890"
 export SSH_KEY_FILE="$HOME/.ssh/id_rsa.pub"
 ```
@@ -44,6 +44,7 @@ then:
 terraform init
 terraform apply -var DO_API_TOKEN="$DO_API_TOKEN" -var SSH_KEY_FILE="$SSH_KEY_FILE"
 ```
+
 and you will get a list of IP addresses that belong to your droplets.
 
 With the droplets created and running, let's setup Ansible.
@@ -154,7 +155,7 @@ page](https://app.logz.io/#/dashboard/data-sources/Filebeat), then:
 ```
 yum install systemd-devel || echo "This will only work on RHEL-based systems."
 apt-get install libsystemd-dev || echo "This will only work on Debian-based systems."
-    
+
 go get github.com/mheese/journalbeat
 ansible-playbook -i inventory/digital_ocean.py -l sentrynet logzio.yml -e LOGZIO_TOKEN=ABCDEFGHIJKLMNOPQRSTUVWXYZ012345
 ```

docs/using-tendermint.md

@@ -16,7 +16,9 @@ this by setting the `TMHOME` environment variable.
 
 Initialize the root directory by running:
 
-    tendermint init
+```
+tendermint init
+```
 
 This will create a new private key (`priv_validator.json`), and a
 genesis file (`genesis.json`) containing the associated public key, in
@@ -25,24 +27,30 @@ with one validator.
 
 For more elaborate initialization, see the tesnet command:
 
-    tendermint testnet --help
+```
+tendermint testnet --help
+```
 
 ## Run
 
 To run a Tendermint node, use
 
-    tendermint node
+```
+tendermint node
+```
 
 By default, Tendermint will try to connect to an ABCI application on
 [127.0.0.1:26658](127.0.0.1:26658). If you have the `kvstore` ABCI app
 installed, run it in another window. If you don't, kill Tendermint and
 run an in-process version of the `kvstore` app:
 
-    tendermint node --proxy_app=kvstore
+```
+tendermint node --proxy_app=kvstore
+```
 
 After a few seconds you should see blocks start streaming in. Note that
 blocks are produced regularly, even if there are no transactions. See
-*No Empty Blocks*, below, to modify this setting.
+_No Empty Blocks_, below, to modify this setting.
 
 Tendermint supports in-process versions of the `counter`, `kvstore` and
 `nil` apps that ship as examples with `abci-cli`. It's easy to compile
@@ -51,22 +59,30 @@ app is not written in Go, simply run it in another process, and use the
 `--proxy_app` flag to specify the address of the socket it is listening
 on, for instance:
 
-    tendermint node --proxy_app=/var/run/abci.sock
+```
+tendermint node --proxy_app=/var/run/abci.sock
+```
 
 ## Transactions
 
 To send a transaction, use `curl` to make requests to the Tendermint RPC
 server, for example:
 
-    curl http://localhost:26657/broadcast_tx_commit?tx=\"abcd\"
+```
+curl http://localhost:26657/broadcast_tx_commit?tx=\"abcd\"
+```
 
 We can see the chain's status at the `/status` end-point:
 
-    curl http://localhost:26657/status | json_pp
+```
+curl http://localhost:26657/status | json_pp
+```
 
 and the `latest_app_hash` in particular:
 
-    curl http://localhost:26657/status | json_pp | grep latest_app_hash
+```
+curl http://localhost:26657/status | json_pp | grep latest_app_hash
+```
 
 Visit http://localhost:26657> in your browser to see the list of other
 endpoints. Some take no arguments (like `/status`), while others specify
@@ -81,30 +97,40 @@ With `GET`:
 
 To send a UTF8 string byte array, quote the value of the tx pramater:
 
-    curl 'http://localhost:26657/broadcast_tx_commit?tx="hello"'
+```
+curl 'http://localhost:26657/broadcast_tx_commit?tx="hello"'
+```
 
 which sends a 5 byte transaction: "h e l l o" \[68 65 6c 6c 6f\].
 
 Note the URL must be wrapped with single quoes, else bash will ignore
 the double quotes. To avoid the single quotes, escape the double quotes:
 
-    curl http://localhost:26657/broadcast_tx_commit?tx=\"hello\"
+```
+curl http://localhost:26657/broadcast_tx_commit?tx=\"hello\"
+```
 
 Using a special character:
 
-    curl 'http://localhost:26657/broadcast_tx_commit?tx="€5"'
+```
+curl 'http://localhost:26657/broadcast_tx_commit?tx="€5"'
+```
 
 sends a 4 byte transaction: "€5" (UTF8) \[e2 82 ac 35\].
 
 To send as raw hex, omit quotes AND prefix the hex string with `0x`:
 
-    curl http://localhost:26657/broadcast_tx_commit?tx=0x01020304
+```
+curl http://localhost:26657/broadcast_tx_commit?tx=0x01020304
+```
 
 which sends a 4 byte transaction: \[01 02 03 04\].
 
 With `POST` (using `json`), the raw hex must be `base64` encoded:
 
-    curl --data-binary '{"jsonrpc":"2.0","id":"anything","method":"broadcast_tx_commit","params": {"tx": "AQIDBA=="}}' -H 'content-type:text/plain;' http://localhost:26657
+```
+curl --data-binary '{"jsonrpc":"2.0","id":"anything","method":"broadcast_tx_commit","params": {"tx": "AQIDBA=="}}' -H 'content-type:text/plain;' http://localhost:26657
+```
 
 which sends the same 4 byte transaction: \[01 02 03 04\].
 
@@ -118,7 +144,9 @@ afford to lose all blockchain data!
 To reset a blockchain, stop the node, remove the `~/.tendermint/data`
 directory and run
 
-    tendermint unsafe_reset_priv_validator
+```
+tendermint unsafe_reset_priv_validator
+```
 
 This final step is necessary to reset the `priv_validator.json`, which
 otherwise prevents you from making conflicting votes in the consensus
@@ -150,21 +178,27 @@ To configure Tendermint to not produce empty blocks unless there are
 transactions or the app hash changes, run Tendermint with this
 additional flag:
 
-    tendermint node --consensus.create_empty_blocks=false
+```
+tendermint node --consensus.create_empty_blocks=false
+```
 
 or set the configuration via the `config.toml` file:
 
-    [consensus]
-    create_empty_blocks = false
+```
+[consensus]
+create_empty_blocks = false
+```
 
-Remember: because the default is to *create empty blocks*, avoiding
+Remember: because the default is to _create empty blocks_, avoiding
 empty blocks requires the config option to be set to `false`.
 
 The block interval setting allows for a delay (in seconds) between the
 creation of each new empty block. It is set via the `config.toml`:
 
-    [consensus]
-    create_empty_blocks_interval = 5
+```
+[consensus]
+create_empty_blocks_interval = 5
+```
 
 With this setting, empty blocks will be produced every 5s if no block
 has been produced otherwise, regardless of the value of
@@ -181,9 +215,11 @@ eventually included in a block.
 Since there are multiple phases to processing a transaction, we offer
 multiple endpoints to broadcast a transaction:
 
-    /broadcast_tx_async
-    /broadcast_tx_sync
-    /broadcast_tx_commit
+```
+/broadcast_tx_async
+/broadcast_tx_sync
+/broadcast_tx_commit
+```
 
 These correspond to no-processing, processing through the mempool, and
 processing through a block, respectively. That is, `broadcast_tx_async`,
@@ -208,38 +244,42 @@ When `tendermint init` is run, both a `genesis.json` and
 `priv_validator.json` are created in `~/.tendermint/config`. The
 `genesis.json` might look like:
 
+```
+{
+  "validators" : [
     {
-      "validators" : [
-        {
-          "pub_key" : {
-            "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
-            "type" : "tendermint/PubKeyEd25519"
-          },
-          "power" : 10,
-          "name" : ""
-        }
-      ],
-      "app_hash" : "",
-      "chain_id" : "test-chain-rDlYSN",
-      "genesis_time" : "0001-01-01T00:00:00Z"
-    }
-
-And the `priv_validator.json`:
-
-    {
-      "last_step" : 0,
-      "last_round" : "0",
-      "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2",
       "pub_key" : {
         "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
         "type" : "tendermint/PubKeyEd25519"
       },
-      "last_height" : "0",
-      "priv_key" : {
-        "value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==",
-        "type" : "tendermint/PrivKeyEd25519"
-      }
+      "power" : 10,
+      "name" : ""
     }
+  ],
+  "app_hash" : "",
+  "chain_id" : "test-chain-rDlYSN",
+  "genesis_time" : "0001-01-01T00:00:00Z"
+}
+```
+
+And the `priv_validator.json`:
+
+```
+{
+  "last_step" : 0,
+  "last_round" : "0",
+  "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2",
+  "pub_key" : {
+    "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
+    "type" : "tendermint/PubKeyEd25519"
+  },
+  "last_height" : "0",
+  "priv_key" : {
+    "value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==",
+    "type" : "tendermint/PrivKeyEd25519"
+  }
+}
+```
 
 The `priv_validator.json` actually contains a private key, and should
 thus be kept absolutely secret; for now we work with the plain text.
@@ -272,6 +312,7 @@ with the consensus protocol.
 ### Peers
 
 #### Seed
+
 A seed node is a node who relays the addresses of other peers which they know
 of. These nodes constantly crawl the network to try to get more peers. The
 addresses which the seed node relays get saved into a local address book. Once
@@ -282,6 +323,7 @@ only need them on the first start. The seed node will immediately disconnect
 from you after sending you some addresses.
 
 #### Persistent Peer
+
 Persistent peers are people you want to be constantly connected with. If you
 disconnect you will try to connect directly back to them as opposed to using
 another address from the address book. On restarts you will always try to
@@ -302,12 +344,16 @@ persistent connections with.
 
 For example,
 
-    tendermint node --p2p.seeds "f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@1.2.3.4:26656,0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@5.6.7.8:26656"
+```
+tendermint node --p2p.seeds "f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@1.2.3.4:26656,0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@5.6.7.8:26656"
+```
 
 Alternatively, you can use the `/dial_seeds` endpoint of the RPC to
 specify seeds for a running node to connect to:
 
-    curl 'localhost:26657/dial_seeds?seeds=\["f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@1.2.3.4:26656","0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@5.6.7.8:26656"\]'
+```
+curl 'localhost:26657/dial_seeds?seeds=\["f9baeaa15fedf5e1ef7448dd60f46c01f1a9e9c4@1.2.3.4:26656","0491d373a8e0fcf1023aaf18c51d6a1d0d4f31bd@5.6.7.8:26656"\]'
+```
 
 Note, with PeX enabled, you
 should not need seeds after the first start.
@@ -318,8 +364,11 @@ maintain a persistent connection with each, you can use the
 `config.toml` or the `/dial_peers` RPC endpoint to do it without
 stopping Tendermint core instance.
 
-    tendermint node --p2p.persistent_peers "429fcf25974313b95673f58d77eacdd434402665@10.11.12.13:26656,96663a3dd0d7b9d17d4c8211b191af259621c693@10.11.12.14:26656"
-    curl 'localhost:26657/dial_peers?persistent=true&peers=\["429fcf25974313b95673f58d77eacdd434402665@10.11.12.13:26656","96663a3dd0d7b9d17d4c8211b191af259621c693@10.11.12.14:26656"\]'
+```
+tendermint node --p2p.persistent_peers "429fcf25974313b95673f58d77eacdd434402665@10.11.12.13:26656,96663a3dd0d7b9d17d4c8211b191af259621c693@10.11.12.14:26656"
+
+curl 'localhost:26657/dial_peers?persistent=true&peers=\["429fcf25974313b95673f58d77eacdd434402665@10.11.12.13:26656","96663a3dd0d7b9d17d4c8211b191af259621c693@10.11.12.14:26656"\]'
+```
 
 ### Adding a Non-Validator
 
@@ -338,51 +387,57 @@ before starting the network. For instance, we could make a new
 
 We can generate a new `priv_validator.json` with the command:
 
-    tendermint gen_validator
+```
+tendermint gen_validator
+```
 
 Now we can update our genesis file. For instance, if the new
 `priv_validator.json` looks like:
 
+```
+{
+  "address" : "5AF49D2A2D4F5AD4C7C8C4CC2FB020131E9C4902",
+  "pub_key" : {
+    "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
+    "type" : "tendermint/PubKeyEd25519"
+  },
+  "priv_key" : {
+    "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==",
+    "type" : "tendermint/PrivKeyEd25519"
+  },
+  "last_step" : 0,
+  "last_round" : "0",
+  "last_height" : "0"
+}
+```
+
+then the new `genesis.json` will be:
+
+```
+{
+  "validators" : [
     {
-      "address" : "5AF49D2A2D4F5AD4C7C8C4CC2FB020131E9C4902",
       "pub_key" : {
-        "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
+        "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
         "type" : "tendermint/PubKeyEd25519"
       },
-      "priv_key" : {
-        "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==",
-        "type" : "tendermint/PrivKeyEd25519"
-      },
-      "last_step" : 0,
-      "last_round" : "0",
-      "last_height" : "0"
-    }
-
-then the new `genesis.json` will be:
-
+      "power" : 10,
+      "name" : ""
+    },
     {
-      "validators" : [
-        {
-          "pub_key" : {
-            "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
-            "type" : "tendermint/PubKeyEd25519"
-          },
-          "power" : 10,
-          "name" : ""
-        },
-        {
-          "pub_key" : {
-            "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
-            "type" : "tendermint/PubKeyEd25519"
-          },
-          "power" : 10,
-          "name" : ""
-        }
-      ],
-      "app_hash" : "",
-      "chain_id" : "test-chain-rDlYSN",
-      "genesis_time" : "0001-01-01T00:00:00Z"
+      "pub_key" : {
+        "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
+        "type" : "tendermint/PubKeyEd25519"
+      },
+      "power" : 10,
+      "name" : ""
     }
+  ],
+  "app_hash" : "",
+  "chain_id" : "test-chain-rDlYSN",
+  "genesis_time" : "0001-01-01T00:00:00Z"
+}
+```
 
 Update the `genesis.json` in `~/.tendermint/config`. Copy the genesis
 file and the new `priv_validator.json` to the `~/.tendermint/config` on

libs/CODEOWNERS

@@ -1,3 +0,0 @@
-*       @melekes @ebuchman
-*.md    @zramsay
-*.rst   @zramsay

libs/Gopkg.lock

@@ -1,281 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/btcsuite/btcutil"
-  packages = ["bech32"]
-  revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
-
-[[projects]]
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/fortytw2/leaktest"
-  packages = ["."]
-  revision = "3b724c3d7b8729a35bf4e577f71653aec6e53513"
-
-[[projects]]
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
-[[projects]]
-  name = "github.com/go-kit/kit"
-  packages = [
-    "log",
-    "log/level",
-    "log/term"
-  ]
-  revision = "4dc7be5d2d12881735283bcab7352178e190fc71"
-  version = "v0.6.0"
-
-[[projects]]
-  name = "github.com/go-logfmt/logfmt"
-  packages = ["."]
-  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
-  version = "v0.3.0"
-
-[[projects]]
-  name = "github.com/go-stack/stack"
-  packages = ["."]
-  revision = "817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
-  version = "v1.6.0"
-
-[[projects]]
-  name = "github.com/golang/protobuf"
-  packages = [
-    "proto",
-    "ptypes",
-    "ptypes/any",
-    "ptypes/duration",
-    "ptypes/timestamp"
-  ]
-  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/golang/snappy"
-  packages = ["."]
-  revision = "553a641470496b2327abcac10b36396bd98e45c9"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token"
-  ]
-  revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-
-[[projects]]
-  name = "github.com/inconshreveable/mousetrap"
-  packages = ["."]
-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-  version = "v1.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/jmhodges/levigo"
-  packages = ["."]
-  revision = "c42d9e0ca023e2198120196f842701bb4c55d7b9"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/kr/logfmt"
-  packages = ["."]
-  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
-
-[[projects]]
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  revision = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-
-[[projects]]
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  revision = "b4575eea38cca1123ec2dc90c26529b5c5acfcff"
-
-[[projects]]
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem"
-  ]
-  revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
-  version = "v1.0.2"
-
-[[projects]]
-  name = "github.com/spf13/cast"
-  packages = ["."]
-  revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/spf13/cobra"
-  packages = ["."]
-  revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-  version = "v0.0.1"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/spf13/jwalterweatherman"
-  packages = ["."]
-  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-
-[[projects]]
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  revision = "97afa5e7ca8a08a383cb259e06636b5e2cc7897f"
-
-[[projects]]
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/stretchr/testify"
-  packages = [
-    "assert",
-    "require"
-  ]
-  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
-  version = "v1.2.1"
-
-[[projects]]
-  name = "github.com/syndtr/goleveldb"
-  packages = [
-    "leveldb",
-    "leveldb/cache",
-    "leveldb/comparer",
-    "leveldb/errors",
-    "leveldb/filter",
-    "leveldb/iterator",
-    "leveldb/journal",
-    "leveldb/memdb",
-    "leveldb/opt",
-    "leveldb/storage",
-    "leveldb/table",
-    "leveldb/util"
-  ]
-  revision = "b89cc31ef7977104127d34c1bd31ebd1a9db2199"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "http/httpguts",
-    "http2",
-    "http2/hpack",
-    "idna",
-    "internal/timeseries",
-    "trace"
-  ]
-  revision = "d11bb6cd8e3c4e60239c9cb20ef68586d74500d0"
-
-[[projects]]
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
-
-[[projects]]
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable"
-  ]
-  revision = "c01e4764d870b77f8abe5096ee19ad20d80e8075"
-
-[[projects]]
-  branch = "master"
-  name = "google.golang.org/genproto"
-  packages = ["googleapis/rpc/status"]
-  revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2"
-
-[[projects]]
-  name = "google.golang.org/grpc"
-  packages = [
-    ".",
-    "balancer",
-    "balancer/base",
-    "balancer/roundrobin",
-    "codes",
-    "connectivity",
-    "credentials",
-    "encoding",
-    "encoding/proto",
-    "grpclb/grpc_lb_v1/messages",
-    "grpclog",
-    "internal",
-    "keepalive",
-    "metadata",
-    "naming",
-    "peer",
-    "resolver",
-    "resolver/dns",
-    "resolver/passthrough",
-    "stats",
-    "status",
-    "tap",
-    "transport"
-  ]
-  revision = "d11072e7ca9811b1100b80ca0269ac831f06d024"
-  version = "v1.11.3"
-
-[[projects]]
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "e0c0af880b57928787ea78a820abefd2759e6aee4cba18e67ab36b80e62ad581"
-  solver-name = "gps-cdcl"
-  solver-version = 1

libs/Gopkg.toml

@@ -1,69 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/fortytw2/leaktest"
-
-[[constraint]]
-  name = "github.com/go-kit/kit"
-  version = "0.6.0"
-
-[[constraint]]
-  name = "github.com/go-logfmt/logfmt"
-  version = "0.3.0"
-
-[[constraint]]
-  name = "github.com/gogo/protobuf"
-  version = "1.0.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/jmhodges/levigo"
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  version = "0.0.1"
-
-[[constraint]]
-  name = "github.com/spf13/viper"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.1"
-
-[[constraint]]
-  name = "github.com/btcsuite/btcutil"
-  branch ="master"
-[prune]
-  go-tests = true
-  unused-packages = true

libs/LICENSE

@@ -1,193 +0,0 @@
-Tendermint Libraries
-Copyright (C) 2017 Tendermint
-
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

libs/common/array.go

@@ -1,5 +0,0 @@
-package common
-
-func Arr(items ...interface{}) []interface{} {
-	return items
-}

libs/glide.lock

@@ -1,108 +0,0 @@
-hash: 98752078f39da926f655268b3b143f713d64edd379fc9fcb1210d9d8aa7ab4e0
-updated: 2018-02-03T01:28:00.221548057-05:00
-imports:
-- name: github.com/fsnotify/fsnotify
-  version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-- name: github.com/go-kit/kit
-  version: 4dc7be5d2d12881735283bcab7352178e190fc71
-  subpackages:
-  - log
-  - log/level
-  - log/term
-- name: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- name: github.com/go-stack/stack
-  version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf
-- name: github.com/gogo/protobuf
-  version: 1adfc126b41513cc696b209667c8656ea7aac67c
-  subpackages:
-  - gogoproto
-  - proto
-  - protoc-gen-gogo/descriptor
-- name: github.com/golang/snappy
-  version: 553a641470496b2327abcac10b36396bd98e45c9
-- name: github.com/hashicorp/hcl
-  version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/scanner
-  - hcl/strconv
-  - hcl/token
-  - json/parser
-  - json/scanner
-  - json/token
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jmhodges/levigo
-  version: c42d9e0ca023e2198120196f842701bb4c55d7b9
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/magiconair/properties
-  version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934
-- name: github.com/mitchellh/mapstructure
-  version: b4575eea38cca1123ec2dc90c26529b5c5acfcff
-- name: github.com/pelletier/go-toml
-  version: acdc4509485b587f5e675510c4f2c63e90ff68a8
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/spf13/afero
-  version: bb8f1927f2a9d3ab41c9340aa034f6b803f4359c
-  subpackages:
-  - mem
-- name: github.com/spf13/cast
-  version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
-- name: github.com/spf13/cobra
-  version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
-- name: github.com/spf13/jwalterweatherman
-  version: 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394
-- name: github.com/spf13/pflag
-  version: 97afa5e7ca8a08a383cb259e06636b5e2cc7897f
-- name: github.com/spf13/viper
-  version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
-- name: github.com/syndtr/goleveldb
-  version: b89cc31ef7977104127d34c1bd31ebd1a9db2199
-  subpackages:
-  - leveldb
-  - leveldb/cache
-  - leveldb/comparer
-  - leveldb/errors
-  - leveldb/filter
-  - leveldb/iterator
-  - leveldb/journal
-  - leveldb/memdb
-  - leveldb/opt
-  - leveldb/storage
-  - leveldb/table
-  - leveldb/util
-- name: golang.org/x/crypto
-  version: edd5e9b0879d13ee6970a50153d85b8fec9f7686
-  subpackages:
-  - ripemd160
-- name: golang.org/x/sys
-  version: 37707fdb30a5b38865cfb95e5aab41707daec7fd
-  subpackages:
-  - unix
-- name: golang.org/x/text
-  version: c01e4764d870b77f8abe5096ee19ad20d80e8075
-  subpackages:
-  - transform
-  - unicode/norm
-- name: gopkg.in/yaml.v2
-  version: d670f9405373e636a5a2765eea47fac0c9bc91a4
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-  subpackages:
-  - spew
-- name: github.com/fortytw2/leaktest
-  version: 3b724c3d7b8729a35bf4e577f71653aec6e53513
-- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
-- name: github.com/stretchr/testify
-  version: 12b6f73e6084dad08a7c6e575284b177ecafbc71
-  subpackages:
-  - assert
-  - require

libs/glide.yaml

@@ -1,38 +0,0 @@
-package: github.com/tendermint/tmlibs
-import:
-- package: github.com/go-kit/kit
-  version: ^0.6.0
-  subpackages:
-  - log
-  - log/level
-  - log/term
-- package: github.com/go-logfmt/logfmt
-  version: ^0.3.0
-- package: github.com/gogo/protobuf
-  version: ^1.0.0
-  subpackages:
-  - gogoproto
-  - proto
-- package: github.com/jmhodges/levigo
-- package: github.com/pkg/errors
-  version: ^0.8.0
-- package: github.com/spf13/cobra
-  version: ^0.0.1
-- package: github.com/spf13/viper
-  version: ^1.0.0
-- package: github.com/syndtr/goleveldb
-  subpackages:
-  - leveldb
-  - leveldb/errors
-  - leveldb/iterator
-  - leveldb/opt
-- package: golang.org/x/crypto
-  subpackages:
-  - ripemd160
-testImport:
-- package: github.com/stretchr/testify
-  version: ^1.2.1
-  subpackages:
-  - assert
-  - require
-- package: github.com/fortytw2/leaktest

libs/merge.sh

@@ -1,54 +0,0 @@
-#! /bin/bash
-set -e
-
-# NOTE: go-alert depends on go-common
-
-REPOS=("autofile" "clist" "db" "events" "flowrate" "logger" "process")
-
-mkdir common
-git mv *.go common
-git mv LICENSE common
-
-git commit -m "move all files to common/ to begin repo merge"
-
-for repo in "${REPOS[@]}"; do 
-	# add and fetch the repo
-	git remote add -f "$repo" "https://github.com/tendermint/go-${repo}"
-
-	# merge master and move into subdir
-	git merge "$repo/master" --no-edit
-
-	if [[ "$repo" != "flowrate" ]]; then
-		mkdir "$repo"
-		git mv *.go "$repo/"
-	fi
-
-	set +e # these might not exist
-        git mv *.md "$repo/"
-	git mv README "$repo/README.md"
-	git mv Makefile "$repo/Makefile"
-        git rm LICENSE
-	set -e
-        
-	# commit
-	git commit -m "merge go-${repo}"
-
-	git remote rm "$repo"
-done
-
-go get github.com/ebuchman/got
-got replace "tendermint/go-common" "tendermint/go-common/common"
-for repo in "${REPOS[@]}"; do 
-
-	if [[ "$repo" != "flowrate" ]]; then
-		got replace "tendermint/go-${repo}" "tendermint/go-common/${repo}"
-	else
-		got replace "tendermint/go-${repo}/flowrate" "tendermint/go-common/flowrate"
-	fi
-done
-
-git add -u 
-git commit -m "update import paths"
-
-# TODO: change any paths in non-Go files
-# TODO: add license

privval/priv_validator.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
+	"github.com/tendermint/tendermint/types"
 )
 
 // TODO: type ?
@@ -91,6 +91,10 @@ func LoadFilePV(filePath string) *FilePV {
 		cmn.Exit(cmn.Fmt("Error reading PrivValidator from %v: %v\n", filePath, err))
 	}
 
+	// overwrite pubkey and address for convenience
+	pv.PubKey = pv.PrivKey.PubKey()
+	pv.Address = pv.PubKey.Address()
+
 	pv.filePath = filePath
 	return pv
 }

state/execution.go

@@ -5,10 +5,10 @@ import (
 
 	fail "github.com/ebuchman/fail-test"
 	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/proxy"
-	"github.com/tendermint/tendermint/types"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
+	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/types"
 )
 
 //-----------------------------------------------------------------------------
@@ -278,20 +278,24 @@ func updateValidators(currentSet *types.ValidatorSet, abciUpdates []abci.Validat
 
 	// these are tendermint types now
 	for _, valUpdate := range updates {
+		if valUpdate.VotingPower < 0 {
+			return fmt.Errorf("Voting power can't be negative %v", valUpdate)
+		}
+
 		address := valUpdate.Address
 		_, val := currentSet.GetByAddress(address)
-		if val == nil {
-			// add val
-			added := currentSet.Add(valUpdate)
-			if !added {
-				return fmt.Errorf("Failed to add new validator %v", valUpdate)
-			}
-		} else if valUpdate.VotingPower == 0 {
+		if valUpdate.VotingPower == 0 {
 			// remove val
 			_, removed := currentSet.Remove(address)
 			if !removed {
 				return fmt.Errorf("Failed to remove validator %X", address)
 			}
+		} else if val == nil {
+			// add val
+			added := currentSet.Add(valUpdate)
+			if !added {
+				return fmt.Errorf("Failed to add new validator %v", valUpdate)
+			}
 		} else {
 			// update val
 			updated := currentSet.Update(valUpdate)

state/execution_test.go

@@ -149,6 +149,89 @@ func TestBeginBlockByzantineValidators(t *testing.T) {
 	}
 }
 
+func TestUpdateValidators(t *testing.T) {
+	pubkey1 := crypto.GenPrivKeyEd25519().PubKey()
+	val1 := types.NewValidator(pubkey1, 10)
+	pubkey2 := crypto.GenPrivKeyEd25519().PubKey()
+	val2 := types.NewValidator(pubkey2, 20)
+
+	testCases := []struct {
+		name string
+
+		currentSet  *types.ValidatorSet
+		abciUpdates []abci.Validator
+
+		resultingSet *types.ValidatorSet
+		shouldErr    bool
+	}{
+		{
+			"adding a validator is OK",
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			[]abci.Validator{{[]byte{}, types.TM2PB.PubKey(pubkey2), 20}},
+
+			types.NewValidatorSet([]*types.Validator{val1, val2}),
+			false,
+		},
+		{
+			"updating a validator is OK",
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			[]abci.Validator{{[]byte{}, types.TM2PB.PubKey(pubkey1), 20}},
+
+			types.NewValidatorSet([]*types.Validator{types.NewValidator(pubkey1, 20)}),
+			false,
+		},
+		{
+			"removing a validator is OK",
+
+			types.NewValidatorSet([]*types.Validator{val1, val2}),
+			[]abci.Validator{{[]byte{}, types.TM2PB.PubKey(pubkey2), 0}},
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			false,
+		},
+
+		{
+			"removing a non-existing validator results in error",
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			[]abci.Validator{{[]byte{}, types.TM2PB.PubKey(pubkey2), 0}},
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			true,
+		},
+
+		{
+			"adding a validator with negative power results in error",
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			[]abci.Validator{{[]byte{}, types.TM2PB.PubKey(pubkey2), -100}},
+
+			types.NewValidatorSet([]*types.Validator{val1}),
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := updateValidators(tc.currentSet, tc.abciUpdates)
+			if tc.shouldErr {
+				assert.Error(t, err)
+			} else {
+				require.Equal(t, tc.resultingSet.Size(), tc.currentSet.Size())
+
+				assert.Equal(t, tc.resultingSet.TotalVotingPower(), tc.currentSet.TotalVotingPower())
+
+				assert.Equal(t, tc.resultingSet.Validators[0].Address, tc.currentSet.Validators[0].Address)
+				if tc.resultingSet.Size() > 1 {
+					assert.Equal(t, tc.resultingSet.Validators[1].Address, tc.currentSet.Validators[1].Address)
+				}
+			}
+		})
+	}
+}
+
 //----------------------------------------------------------------------------
 
 // make some bogus txs

state/store.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	dbm "github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tendermint/types"
 )
 
 //------------------------------------------------------------------------
@@ -175,8 +175,13 @@ func LoadValidators(db dbm.DB, height int64) (*types.ValidatorSet, error) {
 	if valInfo.ValidatorSet == nil {
 		valInfo2 := loadValidatorsInfo(db, valInfo.LastHeightChanged)
 		if valInfo2 == nil {
-			cmn.PanicSanity(fmt.Sprintf(`Couldn't find validators at height %d as
-                        last changed from height %d`, valInfo.LastHeightChanged, height))
+			panic(
+				fmt.Sprintf(
+					"Couldn't find validators at height %d as last changed from height %d",
+					valInfo.LastHeightChanged,
+					height,
+				),
+			)
 		}
 		valInfo = valInfo2
 	}
@@ -239,11 +244,17 @@ func LoadConsensusParams(db dbm.DB, height int64) (types.ConsensusParams, error)
 	}
 
 	if paramsInfo.ConsensusParams == empty {
-		paramsInfo = loadConsensusParamsInfo(db, paramsInfo.LastHeightChanged)
-		if paramsInfo == nil {
-			cmn.PanicSanity(fmt.Sprintf(`Couldn't find consensus params at height %d as
-                        last changed from height %d`, paramsInfo.LastHeightChanged, height))
+		paramsInfo2 := loadConsensusParamsInfo(db, paramsInfo.LastHeightChanged)
+		if paramsInfo2 == nil {
+			panic(
+				fmt.Sprintf(
+					"Couldn't find consensus params at height %d as last changed from height %d",
+					paramsInfo.LastHeightChanged,
+					height,
+				),
+			)
 		}
+		paramsInfo = paramsInfo2
 	}
 
 	return paramsInfo.ConsensusParams, nil

version/version.go

@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "22"
-	Fix = "0"
+	Fix = "1"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.22.0"
+	Version = "0.22.1"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string