Commit Graph

3041 Commits

Author SHA1 Message Date
Jeremiah Andrews
41dd01906a Merge PR #1654: Wait for 2 blocks attempt 2018-07-12 22:03:18 +02:00
Christopher Goes
b3e45413ed
Merge PR #1651: Fabo/fix account creation lcd 2018-07-12 20:01:46 +02:00
Christopher Goes
8b9f5396de Move changelog entry 2018-07-12 19:45:09 +02:00
Fabian Weber
c3bbb37df3 changelog 2018-07-12 19:44:31 +02:00
Fabian Weber
f8f46b2b8c added test for account importing 2018-07-12 19:44:31 +02:00
Fabian Weber
e400e83c43 fix key import creating random account 2018-07-12 19:44:31 +02:00
Christopher Goes
a6cc85ae87
Merge PR #1619: R4R: Clearer staking logic 2018-07-12 19:39:51 +02:00
Christopher Goes
432c109f06
Merge PR #1627: ready-for-review: Gov modules enums marshalJSON to String 2018-07-12 19:39:15 +02:00
Christopher Goes
e9db4a82ff
Merge PR #1631: keys: Keybase.Update no longer asks for newpass if oldpass is incorrect 2018-07-12 19:38:47 +02:00
Dev Ojha
c57c6c43ce
Merge branch 'master' into dev/fix_key_update_bug 2018-07-11 15:01:30 -07:00
Ethan Buchman
3f15ae7b15
Merge pull request #1633 from cosmos/bucky/fix-democoin
democoin: fix genesis for amino
2018-07-11 10:45:01 -04:00
Ethan Buchman
e56379821c update changelog 2018-07-10 23:57:48 -04:00
Ethan Buchman
dd429fd5d0 democoin: fix genesis for amino 2018-07-10 23:27:47 -04:00
ValarDragon
fc4c563e29 keys: Keybase.Update no longer asks for newpass if oldpass is incorrect
Achieved by refactoring the parameter newpass as follows:

* (newpass string) -> (getNewpass func() (string, error))

Closes #1629
2018-07-10 20:00:22 -07:00
Ethan Buchman
c6827dfb43 fix post merge 2018-07-10 21:40:24 -04:00
Sunny Aggarwal
cba7fd7ee8 gov enums marshal to String 2018-07-10 17:59:07 -07:00
Ethan Buchman
e984b73b96 update readme 2018-07-10 20:34:39 -04:00
Ethan Buchman
3f44589861 Merge branch 'develop' 2018-07-10 20:31:05 -04:00
Aditya
b195c556e2 Merge pull request #1600: Friend can create validator and delegate on behalf of genesis validator
* Added msg and handling for surrogate create validator

* changelog and error fix

* fix changelog

* Remove unnecessary msg by combining into CreateValidator

* Refactor

* Appease linter

* Added onbehalfof functionality in client

* fmt

* Added gaia onbehalfof test

* Update test for onbehalfof validator creation

* fix test

* Fix flag error

* Add app test

* fmt

* Fixed signer for onbehalfof createvalidator

* Fix error msg

* Simplify test

* fmt
2018-07-10 20:16:37 -04:00
Ethan Buchman
9afb89491c
Merge pull request #1618 from cosmos/release/v0.20.0
Release/v0.20.0
2018-07-10 20:15:58 -04:00
Christopher Goes
0a8c9f10b6
Merge PR #1379: Account constructor in AccountMapper 2018-07-11 01:28:12 +02:00
rigelrozanski
9eeb47517d cwgoes comments 2018-07-10 19:27:39 -04:00
Christopher Goes
75b4f4104a Merge branch 'develop' into joon/673-am-constructor 2018-07-11 00:57:46 +02:00
rigelrozanski
561eda3fc3 typo 2018-07-10 18:39:52 -04:00
rigelrozanski
e8e5e8c600 bez updates 2018-07-10 18:36:57 -04:00
Jeremiah Andrews
338c7b5e4c Merge pull request #1603: Adding option functions to NewBaseApp
* adding option functions to baseapp constructor

* Added simple test and changed godoc

* remove unrelated changelog updates
2018-07-10 15:10:59 -04:00
Ethan Buchman
080dd5b97a update protobuf to 1.1.0 2018-07-10 15:00:00 -04:00
rigelrozanski
c21e6a0642 Merge remote-tracking branch 'origin/develop' into rigel/clearer-staking-logic 2018-07-10 14:52:49 -04:00
rigelrozanski
053f4e955b changelog 2018-07-10 14:25:56 -04:00
Ethan Buchman
d226f1d62e changelog, version 2018-07-10 12:20:29 -04:00
Ethan Buchman
aed1ca89aa update dep 2018-07-10 12:20:22 -04:00
rigelrozanski
12932de40f further cleanup, also reorg updateBondedValidators 2018-07-10 10:23:31 -04:00
rigelrozanski
61cbd12976 cleanup logic in updateValidator 2018-07-10 02:38:09 -04:00
Christopher Goes
efa003db9a
Merge PR #1612: prevent zero power validators at genesis 2018-07-10 07:43:59 +02:00
Christopher Goes
d217954ccb
Merge pull request #1615: Fix unformatted files 2018-07-10 07:29:07 +02:00
Christopher Goes
0ce2732660
Merge branch 'develop' into rigel/genesis-no-zero-power 2018-07-10 07:25:13 +02:00
Christopher Goes
06be53a983
Merge PR #1614: fix cli delegations unmarshalling 2018-07-10 07:23:56 +02:00
ValarDragon
985037d2bd Fix unformatted files 2018-07-09 22:08:01 -07:00
Ethan Buchman
35e24fc340
Merge pull request #1595 from cosmos/fedekunze/gov_module_docs
Add Gov cmds for Gaia-7000
2018-07-10 00:30:21 -04:00
Ethan Buchman
af478a94bd
Merge branch 'develop' into fedekunze/gov_module_docs 2018-07-10 00:29:39 -04:00
Ethan Buchman
4ef83bfb5d
Merge pull request #1611 from cosmos/dev/update_changelog
changelog: Reorder items in the changelog
2018-07-10 00:18:36 -04:00
rigelrozanski
a31404c628 more detailed comments 2018-07-10 00:18:25 -04:00
Ethan Buchman
7ba37a7ce5
Merge branch 'develop' into dev/update_changelog 2018-07-10 00:17:26 -04:00
Rigel
b60fcb68d6
Merge branch 'develop' into rigel/genesis-no-zero-power 2018-07-10 00:15:10 -04:00
Rigel
f0a6ade1a6
Merge branch 'develop' into rigel/fix-unbond-percent 2018-07-10 00:13:39 -04:00
Ethan Buchman
95314665dc
Merge pull request #1400 from cosmos/joon/1329-cleanup-baseapp
Cleanup Baseapp
2018-07-10 00:13:04 -04:00
rigelrozanski
ce3fd47f9d changelog 2018-07-10 00:12:50 -04:00
rigelrozanski
96d660593a fix cli delegations unmarshalling 2018-07-10 00:07:01 -04:00
mossid
4761612288 Merge pull request #1400: Cleanup Baseapp
fix lint

apply requests

revert removing newCtx

refactor

fix errors
2018-07-09 23:59:30 -04:00
mossid
bc12880394 Merge pull request #1379: Account constructor in AccountMaper
fix

fix democoin

fix tests

pass lint

last fix

apply requests

fix build failing

fix docs
2018-07-09 20:29:14 -07:00