Merge master into develop on staging branch #1985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This subverts the really hard to decipher ABCI error message, with a nice user friendly error message.
* Update to tendermint v0.22.6 - This was cherry-picked and fixed from develop - Updates all crypto imports for changes from v0.22.5
slashing for downtime is 10%
* Avoid slashing & revoking no longer stored or already revoked validators for downtime * Add testcase * Update PENDING.md
* add revoked to human-readable validator * changelog * added failing test * add intra-tx counter to the genesis validators * changelog
* fixed proposaltype string bug
Release v0.23.0
* deprecate gaia testnets dir for testnets repo * update docs for gaia-7002
* Tendermint 0.22.7; bump patch version * 0.23.0 -> 0.23.1; update CHANGELOG.md
* docs: updates for 7002 * docs: use master instead of versions * Update validator-setup.md * 7002 -> 7005
cwgoes
requested review from
ebuchman,
rigelrozanski and
zramsay
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #1985 +/- ##
========================================
Coverage 64.86% 64.86%
========================================
Files 114 114
Lines 6837 6837
========================================
Hits 4435 4435
Misses 2120 2120
Partials 282 282 |
|
Thanks Chris. There's a few commits here that aren't on develop. Of those that aren't just administrative: A few are for params:
And one is a bug fix:
I've cherry-picked a86fcdc and a393f80 onto this branch and will push. Should then be good for merge. I'll leave the params as whatever they are on develop. |
ebuchman
approved these changes
Aug 12, 2018
* fixed proposaltype string bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #1830.
For Admin Use: