Merge pull request #1790 from tendermint/xla/merge-abci-tmlibs

Merge abci
2025-06-28 20:21:47 +00:00 · 2018-06-23 00:55:31 +02:00
parent e9e00c4db7 867550dd8b
commit e39e43f86f
125 changed files with 9470 additions and 147 deletions
--- a/docs/abci-cli.md
+++ b/docs/abci-cli.md
@ -10,15 +10,14 @@ Make sure you [have Go installed](https://golang.org/doc/install).

 Next, install the `abci-cli` tool and example applications:

-    go get -u github.com/tendermint/abci/cmd/abci-cli
+    go get github.com/tendermint/tendermint

-If this fails, you may need to use [dep](https://github.com/golang/dep)
 to get vendored dependencies:

-    cd $GOPATH/src/github.com/tendermint/abci
+    cd $GOPATH/src/github.com/tendermint/tendermint
    make get_tools
    make get_vendor_deps
-    make install
+    make install_abci

 Now run `abci-cli` to see the list of commands:

@ -61,7 +60,7 @@ as `abci-cli` above. The kvstore just stores transactions in a merkle
 tree.

 Its code can be found
-[here](https://github.com/tendermint/abci/blob/master/cmd/abci-cli/abci-cli.go)
+[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 {
@ -124,7 +123,7 @@ response.

 The server may be generic for a particular language, and we provide a
 [reference implementation in
-Golang](https://github.com/tendermint/abci/tree/master/server). See the
+Golang](https://github.com/tendermint/tendermint/tree/develop/abci/server). See the
 [list of other ABCI implementations](./ecosystem.html) for servers in
 other languages.

@ -204,7 +203,7 @@ Now that we've got the hang of it, let's try another application, the
 "counter" app.

 Like the kvstore app, its code can be found
-[here](https://github.com/tendermint/abci/blob/master/cmd/abci-cli/abci-cli.go)
+[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 {
@ -301,7 +300,7 @@ But the ultimate flexibility comes from being able to write the
 application easily in any language.

 We have implemented the counter in a number of languages [see the
-example directory](https://github.com/tendermint/abci/tree/master/example).
+example directory](https://github.com/tendermint/tendermint/tree/develop/abci/example).

 To run the Node JS version, `cd` to `example/js` and run

--- a/docs/abci-spec.md
+++ b/docs/abci-spec.md
@ -0,0 +1,324 @@
+# ABCI Specification
+
+## 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).
+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.
+
+## Request/Response Messages
+
+### 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
+
+### 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
+
+-   **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).
+
+### 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.
+
+### 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.
+
+### 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.
+
+### 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")
+
+### 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")
+
+### 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.
+
+### 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!
+
+## 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
+- **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.
+
+### 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
+- **Usage**:
+    - 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
+- **Usage**:
+    - 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.
+- **Usage**:
+    - 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`
--- a/docs/app-architecture.md
+++ b/docs/app-architecture.md
@ -47,4 +47,4 @@ See the following for more extensive documentation:
 - [Tendermint RPC Docs](https://tendermint.github.io/slate/)
 - [Tendermint in Production](https://github.com/tendermint/tendermint/pull/1618)
 - [Tendermint Basics](https://tendermint.readthedocs.io/en/master/using-tendermint.html)
- [ABCI spec](https://github.com/tendermint/abci/blob/develop/specification.md)
+- [ABCI spec](https://github.com/tendermint/tendermint/blob/develop/abci/docs/abci-spec.md)
--- a/docs/app-development.md
+++ b/docs/app-development.md
@ -49,7 +49,7 @@ The message protocol consists of pairs of requests and responses. Some
 messages have no fields, while others may include byte-arrays, strings,
 or integers. See the `message Request` and `message Response`
 definitions in [the protobuf definition
-file](https://github.com/tendermint/abci/blob/master/types/types.proto),
+file](https://github.com/tendermint/tendermint/blob/develop/abci/types/types.proto),
 and the [protobuf
 documentation](https://developers.google.com/protocol-buffers/docs/overview)
 for more details.
@ -72,9 +72,9 @@ Both can be tested using the `abci-cli` by setting the `--abci` flag
 appropriately (ie. to `socket` or `grpc`).

 See examples, in various stages of maintenance, in
-[Go](https://github.com/tendermint/abci/tree/master/server),
+[Go](https://github.com/tendermint/tendermint/tree/develop/abci/server),
 [JavaScript](https://github.com/tendermint/js-abci),
-[Python](https://github.com/tendermint/abci/tree/master/example/python3/abci),
+[Python](https://github.com/tendermint/tendermint/tree/develop/abci/example/python3/abci),
 [C++](https://github.com/mdyring/cpp-tmsp), and
 [Java](https://github.com/jTendermint/jabci).

@ -84,7 +84,7 @@ If GRPC is available in your language, this is the easiest approach,
 though it will have significant performance overhead.

 To get started with GRPC, copy in the [protobuf
-file](https://github.com/tendermint/abci/blob/master/types/types.proto)
+file](https://github.com/tendermint/tendermint/blob/develop/abci/types/types.proto)
 and compile it using the GRPC plugin for your language. For instance,
 for golang, the command is `protoc --go_out=plugins=grpc:. types.proto`.
 See the [grpc documentation for more details](http://www.grpc.io/docs/).
@ -125,12 +125,12 @@ received or a block is committed.

 It is unlikely that you will need to implement a client. For details of
 our client, see
-[here](https://github.com/tendermint/abci/tree/master/client).
+[here](https://github.com/tendermint/tendermint/tree/develop/abci/client).

 Most of the examples below are from [kvstore
-application](https://github.com/tendermint/abci/blob/master/example/kvstore/kvstore.go),
+application](https://github.com/tendermint/tendermint/blob/develop/abci/example/kvstore/kvstore.go),
 which is a part of the abci repo. [persistent_kvstore
-application](https://github.com/tendermint/abci/blob/master/example/kvstore/persistent_kvstore.go)
+application](https://github.com/tendermint/tendermint/blob/develop/abci/example/kvstore/persistent_kvstore.go)
 is used to show `BeginBlock`, `EndBlock` and `InitChain` example
 implementations.

--- a/docs/conf.py
+++ b/docs/conf.py
@ -197,10 +197,3 @@ copyfile('../DOCKER/README.md', tools_dir+'/docker.md')

 urllib.urlretrieve(tools_repo+tools_branch+'/tm-bench/README.md', filename=tools_dir+'/benchmarking.md')
 urllib.urlretrieve(tools_repo+tools_branch+'/tm-monitor/README.md', filename=tools_dir+'/monitoring.md')
-
-#### abci spec #################################
-
-abci_repo = "https://raw.githubusercontent.com/tendermint/abci/"
-abci_branch = "develop"
-
-urllib.urlretrieve(abci_repo+abci_branch+'/specification.md', filename='abci-spec.md')
--- a/docs/determinism.md
+++ b/docs/determinism.md
@ -1,5 +1,3 @@
 # On Determinism

 Arguably, the most difficult part of blockchain programming is determinism - that is, ensuring that sources of indeterminism do not creep into the design of such systems.
-
-See [this issue](https://github.com/tendermint/abci/issues/56) for more information on the potential sources of indeterminism.
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@ -25,15 +25,11 @@ more info.

 Then run

-    go get -u github.com/tendermint/abci/cmd/abci-cli
-
-If there is an error, install and run the
-[dep](https://github.com/golang/dep) tool to pin the dependencies:
-
-    cd $GOPATH/src/github.com/tendermint/abci
+    go get github.com/tendermint/tendermint
+    cd $GOPATH/src/github.com/tendermint/tendermint
    make get_tools
    make get_vendor_deps
-    make install
+    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
@ -132,7 +128,7 @@ of the ASCII of `abcd`. You can verify this in a python 2 shell by
 running `"61626364".decode('base64')` or in python 3 shell by running
 `import codecs; codecs.decode("61626364", 'base64').decode('ascii')`.
 Stay tuned for a future release that [makes this output more
-human-readable](https://github.com/tendermint/abci/issues/32).
+human-readable](https://github.com/tendermint/tendermint/issues/1794).

 Now let's try setting a different key and value:

--- a/docs/how-to-read-logs.md
+++ b/docs/how-to-read-logs.md
@ -103,7 +103,7 @@ little overview what they do.
 -   `abci-client` As mentioned in [Application Development Guide](app-development.md#abci-design),    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/abci/tree/master/client).
+    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
--- a/docs/introduction.md
+++ b/docs/introduction.md
@ -119,9 +119,9 @@ consensus engine, and provides a particular application state.
 ## ABCI Overview

 The [Application BlockChain Interface
-(ABCI)](https://github.com/tendermint/abci) allows for Byzantine Fault
-Tolerant replication of applications written in any programming
-language.
+(ABCI)](https://github.com/tendermint/tendermint/tree/develop/abci)
+allows for Byzantine Fault Tolerant replication of applications
+written in any programming language.

 ### Motivation

@ -159,7 +159,7 @@ Teaspoon).

 [Tendermint Core](https://github.com/tendermint/tendermint) (the
 "consensus engine") communicates with the application via a socket
-protocol that satisfies the [ABCI](https://github.com/tendermint/abci).
+protocol that satisfies the ABCI.

 To draw an analogy, lets talk about a well-known cryptocurrency,
 Bitcoin. Bitcoin is a cryptocurrency blockchain where each node
@ -187,7 +187,7 @@ core to the application. The application replies with corresponding
 response messages.

 The messages are specified here: [ABCI Message
-Types](https://github.com/tendermint/abci#message-types).
+Types](https://github.com/tendermint/tendermint/blob/develop/abci/README.md#message-types).

 The **DeliverTx** message is the work horse of the application. Each
 transaction in the blockchain is delivered with this message. The
--- a/docs/spec/software/abci.md
+++ b/docs/spec/software/abci.md
@ -4,14 +4,14 @@ ABCI is the interface between Tendermint (a state-machine replication engine)
 and an application (the actual state machine).

 The ABCI message types are defined in a [protobuf
-file](https://github.com/tendermint/abci/blob/master/types/types.proto).
+file](https://github.com/tendermint/tendermint/blob/develop/abci/types/types.proto).

 For full details on the ABCI message types and protocol, see the [ABCI
-specificaiton](https://github.com/tendermint/abci/blob/master/specification.rst).
+specification](https://github.com/tendermint/tendermint/blob/develop/docs/abci-spec.md).
 Be sure to read the specification if you're trying to build an ABCI app!

 For additional details on server implementation, see the [ABCI
-readme](https://github.com/tendermint/abci#implementation).
+readme](https://github.com/tendermint/tendermint/blob/develop/abci/README.md).

 Here we provide some more details around the use of ABCI by Tendermint and
 clarify common "gotchas".
--- a/docs/specification/block-structure.rst
+++ b/docs/specification/block-structure.rst
@ -58,8 +58,7 @@ validators <https://godoc.org/github.com/tendermint/tendermint/types#ValidatorSe
 to see if there have been changes.

 The ``AppHash`` serves as the basis for validating any merkle proofs
-that come from the `ABCI
-application <https://github.com/tendermint/abci>`__. It represents the
+that come from the ABCI application. It represents the
 state of the actual application, rather that the state of the blockchain
 itself. This means it's necessary in order to perform any business
 logic, such as verifying an account balance.
@ -144,8 +143,7 @@ Transaction
 ~~~~~~~~~~~

 A transaction is any sequence of bytes. It is up to your
-`ABCI <https://github.com/tendermint/abci>`__ application to accept or
-reject transactions.
+ABCI application to accept or reject transactions.

 BlockID
 ~~~~~~~
--- a/docs/specification/validators.rst
+++ b/docs/specification/validators.rst
@ -26,8 +26,7 @@ There are two ways to become validator.

 1. They can be pre-established in the `genesis
   state <./genesis.html>`__
-2. The `ABCI app responds to the EndBlock
-   message <https://github.com/tendermint/abci>`__ with changes to the
+2. The ABCI app responds to the EndBlock message with changes to the
   existing validator set.

 Committing a Block
--- a/docs/using-tendermint.md
+++ b/docs/using-tendermint.md
@ -45,8 +45,7 @@ blocks are produced regularly, even if there are no transactions. See
 *No Empty Blocks*, below, to modify this setting.

 Tendermint supports in-process versions of the `counter`, `kvstore` and
-`nil` apps that ship as examples in the [ABCI
-repository](https://github.com/tendermint/abci). It's easy to compile
+`nil` apps that ship as examples with `abci-cli`. It's easy to compile
 your own app in-process with Tendermint if it's written in Go. If your
 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