fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 06:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3191 from tendermint/master

Browse Source 
Merge master to develop
This commit is contained in:
Ethan Buchman 2019-01-22 13:19:58 -05:00 committed by GitHub
commit 3362da0a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -37,15 +37,15 @@ program](https://hackerone.com/tendermint).
* CLI/RPC/Config * CLI/RPC/Config
* Apps * Apps
- [state] [\#3049](https://github.com/tendermint/tendermint/issues/3049) Total voting power of the validator set is upper bounded by - [state] [\#3049](https://github.com/tendermint/tendermint/issues/3049) Total voting power of the validator set is upper bounded by
`MaxInt64 / 8`. Apps must ensure they do not return changes to the validator `MaxInt64 / 8`. Apps must ensure they do not return changes to the validator
set that cause this maximum to be exceeded. set that cause this maximum to be exceeded.
* Go API * Go API
- [node] [\#3082](https://github.com/tendermint/tendermint/issues/3082) MetricsProvider now requires you to pass a chain ID - [node] [\#3082](https://github.com/tendermint/tendermint/issues/3082) MetricsProvider now requires you to pass a chain ID
- [types] [\#2713](https://github.com/tendermint/tendermint/issues/2713) Rename `TxProof.LeafHash` to `TxProof.Leaf` - [types] [\#2713](https://github.com/tendermint/tendermint/issues/2713) Rename `TxProof.LeafHash` to `TxProof.Leaf`
- [crypto/merkle] [\#2713](https://github.com/tendermint/tendermint/issues/2713) `SimpleProof.Verify` takes a `leaf` instead of a - [crypto/merkle] [\#2713](https://github.com/tendermint/tendermint/issues/2713) `SimpleProof.Verify` takes a `leaf` instead of a
`leafHash` and performs the hashing itself `leafHash` and performs the hashing itself
* Blockchain Protocol * Blockchain Protocol
* [crypto/merkle] [\#2713](https://github.com/tendermint/tendermint/issues/2713) Merkle trees now match the RFC 6962 specification * [crypto/merkle] [\#2713](https://github.com/tendermint/tendermint/issues/2713) Merkle trees now match the RFC 6962 specification

2
types/validator_set.go
View File

@ -98,7 +98,7 @@ func (vals *ValidatorSet) RescalePriorities(diffMax int64) {
// NOTE: This check is merely a sanity check which could be // NOTE: This check is merely a sanity check which could be
// removed if all tests would init. voting power appropriately; // removed if all tests would init. voting power appropriately;
// i.e. diffMax should always be > 0 // i.e. diffMax should always be > 0
if diffMax == 0 { if diffMax <= 0 {
return return
} }