Merge branch 'release/v0.22.0' into 1762-tm-stops-producing-blocks

docs/app-development.md

@@ -394,13 +394,13 @@ serialize each query as a single byte array. Additionally, certain
 instance about which peers to connect to.
 
 Tendermint Core currently uses the Query connection to filter peers upon
-connecting, according to IP address or public key. For instance,
+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/<addr>`, where `<addr>` is an IP address.
--   `p2p/filter/pubkey/<pubkey>`, where `<pubkey>` is the hex-encoded
-    ED25519 key of the node (not it's validator key)
+-   `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!
 

docs/getting-started.md

@@ -125,8 +125,8 @@ The result should look like:
 
 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
-running `"61626364".decode('base64')` or in python 3 shell by running
-`import codecs; codecs.decode("61626364", 'base64').decode('ascii')`.
+running `"YWJjZA==".decode('base64')` or in python 3 shell by running
+`import codecs; codecs.decode("YWJjZA==", 'base64').decode('ascii')`.
 Stay tuned for a future release that [makes this output more
 human-readable](https://github.com/tendermint/tendermint/issues/1794).
 

docs/spec/blockchain/encoding.md

@@ -84,14 +84,13 @@ Addresses for each public key types are computed as follows:
 
 #### Ed25519
 
-RIPEMD160 hash of the Amino encoded public key:
+First 20-bytes of the SHA256 hash of the raw 32-byte public key:
 
 ```
-address = RIPEMD160(AMINO(pubkey))
+address = SHA256(pubkey)[:20]
 ```
 
-NOTE: this will soon change to the truncated 20-bytes of the SHA256 of the raw
-public key
+NOTE: before v0.22.0, this was the RIPEMD160 of the Amino encoded public key.
 
 #### Secp256k1