From dd429fd5d0ddd789de1f79620bba920a6ab0e8fd Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 10 Jul 2018 23:27:47 -0400
Subject: [PATCH 1/2] democoin: fix genesis for amino

---
 examples/democoin/cmd/democoind/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/democoin/cmd/democoind/main.go b/examples/democoin/cmd/democoind/main.go
index e74b3b700b..0b6a9b8b10 100644
--- a/examples/democoin/cmd/democoind/main.go
+++ b/examples/democoin/cmd/democoind/main.go
@@ -42,8 +42,8 @@ func CoolAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (appState jso
 
 	key = "pow"
 	value = json.RawMessage(`{
-        "difficulty": 1,
-        "count": 0
+        "difficulty": "1",
+        "count": "0"
       }`)
 
 	appState, err = server.InsertKeyJSON(cdc, appState, key, value)

From e56379821c2c8a46c9dc396defde5a569e5ed0ee Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 10 Jul 2018 23:57:48 -0400
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44fa7290ef..f4ad1c0d98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.21.0
+
+*TBD*
+
+BREAKING CHANGES
+* [x/stake] Specify DelegatorAddress in MsgCreateValidator
+* [x/auth] NewAccountMapper takes a constructor instead of a prototype
+
+FEATURES
+* [baseapp] NewBaseApp now takes option functions as parameters
+
 ## 0.20.0
 
 *July 10th, 2018*
@@ -21,7 +32,6 @@ BREAKING CHANGES
 * [auth] Removed MsgChangePubKey
 * [auth] Removed SetPubKey from account mapper
 * [auth] AltBytes renamed to Memo, now a string, max 100 characters, costs a bit of gas
-* [baseapp] NewBaseApp now takes option functions as parameters
 * [types] `GetMsg()` -> `GetMsgs()` as txs wrap many messages
 * [types] Removed GetMemo from Tx (it is still on StdTx)
 * [types] renamed rational.Evaluate to rational.Round{Int64, Int}
@@ -89,7 +99,6 @@ FEATURES
 * [tests] created a randomized testing framework. 
   - Currently bank has limited functionality in the framework
   - Auth has its invariants checked within the framework
-* [x/stake] Allow validator to be created with starting delegation by a third-party delegator on behalf of validator.
 * [tests] Add WaitForNextNBlocksTM helper method
 * [keys] New keys now have 24 word recovery keys, for heightened security