Merge branch 'master' into dev/fix_key_update_bug

CHANGELOG.md

@@ -1,12 +1,20 @@
 # Changelog
 
-## Pending
+## 0.21.0
+
+*TBD*
 
 BREAKING CHANGES
-- [keys] Keybase.Update function now takes in a function to get the newpass, rather than the password itself
+* [x/stake] Specify DelegatorAddress in MsgCreateValidator
+* [x/auth] NewAccountMapper takes a constructor instead of a prototype
+* [keys] Keybase.Update function now takes in a function to get the newpass, rather than the password itself
+
+FEATURES
+* [baseapp] NewBaseApp now takes option functions as parameters
+
 
 BUG FIXES
-- [keys] \#1629 - updating password no longer asks for a new password when the first entered password was incorrect
+* [keys] \#1629 - updating password no longer asks for a new password when the first entered password was incorrect
 
 ## 0.20.0
 
@@ -29,7 +37,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}
@@ -97,7 +104,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
 

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)