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

check addrs match pubkeys in abci Validator. version bump

Browse Source
This commit is contained in:
Ethan Buchman
2018-06-06 16:32:31 -07:00
parent 46fb179605
commit fcf61b8088
5 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
state/execution.go
View File

@ -1,7 +1,6 @@
package state
import (
"bytes"
"fmt"
fail "github.com/ebuchman/fail-test"
@ -271,38 +270,23 @@ func getBeginBlockValidatorInfo(block *types.Block, lastValSet *types.ValidatorS
// If more or equal than 1/3 of total voting power changed in one block, then
// a light client could never prove the transition externally. See
// ./lite/doc.go for details on how a light client tracks validators.
func updateValidators(currentSet *types.ValidatorSet, updates []abci.Validator) error {
for _, v := range updates {
pubkey, err := types.PB2TM.PubKey(v.PubKey)
if err != nil {
return err
}
address := pubkey.Address()
// If the app provided an address too, it must match.
// This is just a sanity check.
if len(v.Address) > 0 {
if !bytes.Equal(address, v.Address) {
return fmt.Errorf("Validator.Address (%X) does not match PubKey.Address (%X)",
v.Address, address)
}
}
power := int64(v.Power)
// mind the overflow from int64
if power < 0 {
return fmt.Errorf("Power (%d) overflows int64", v.Power)
}
func updateValidators(currentSet *types.ValidatorSet, abciUpdates []abci.Validator) error {
updates, err := types.PB2TM.Validators(abciUpdates)
if err != nil {
return err
}
// these are tendermint types now
for _, valUpdate := range updates {
address := valUpdate.Address
_, val := currentSet.GetByAddress(address)
if val == nil {
// add val
added := currentSet.Add(types.NewValidator(pubkey, power))
added := currentSet.Add(valUpdate)
if !added {
return fmt.Errorf("Failed to add new validator %X with voting power %d", address, power)
return fmt.Errorf("Failed to add new validator %v", valUpdate)
}
} else if v.Power == 0 {
} else if valUpdate.VotingPower == 0 {
// remove val
_, removed := currentSet.Remove(address)
if !removed {
@ -310,10 +294,9 @@ func updateValidators(currentSet *types.ValidatorSet, updates []abci.Validator)
}
} else {
// update val
val.VotingPower = power
updated := currentSet.Update(val)
updated := currentSet.Update(valUpdate)
if !updated {
return fmt.Errorf("Failed to update validator %X with voting power %d", address, power)
return fmt.Errorf("Failed to update validator %X to %v", address, valUpdate)
}
}
}