certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

intra counter cleanup

This commit is contained in:
rigelrozanski 2018-05-04 19:15:24 -04:00
parent df2c0c795d
commit 5567bdfaaf
2 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
x/stake/keeper.go
View File

@ -109,56 +109,47 @@ func (k Keeper) setCandidate(ctx sdk.Context, candidate Candidate) {
return
}
updateHeight := false
// update the list ordered by voting power
if oldFound {
if !k.isNewValidator(ctx, store, address) {
updateHeight = true
// if this candidate wasn't just bonded then update the height and counter
if oldCandidate.Status != CandidateStatus.Bonded {
candidate.ValidatorBondHeight = ctx.BlockHeight()
counter := k.getIntraTxCounter(ctx)
candidate.ValidatorBondCounter = counter
k.setIntraTxCounter(ctx, counter+1)
}
// else already in the validator set - retain the old validator height and counter
store.Delete(GetValidatorKey(address, oldCandidate.BondedShares, oldCandidate.ValidatorBondHeight, oldCandidate.ValidatorBondCounter, k.cdc))
} else {
updateHeight = true
// delete the old record in the power ordered list
store.Delete(GetValidatorKey(oldCandidate.validator()))
}
if updateHeight {
// wasn't a candidate or wasn't in the validator set, update the validator block height and counter
candidate.ValidatorBondHeight = ctx.BlockHeight()
counter := k.getIntraTxCounter(ctx)
candidate.ValidatorBondCounter = counter
k.setIntraTxCounter(ctx, counter+1)
}
// update the candidate record
// set the new candidate record
bz = k.cdc.MustMarshalBinary(candidate)
store.Set(GetCandidateKey(address), bz)
// marshal the new validator record
validator := candidate.validator()
bz = k.cdc.MustMarshalBinary(validator)
store.Set(GetValidatorKey(address, validator.Power, validator.Height, validator.Counter, k.cdc), bz)
store.Set(GetValidatorKey(validator), bz)
// add to the validators to update list if is already a validator
// or is a new validator
//setAcc := false
setAcc := false
if store.Get(GetRecentValidatorKey(candidate.PubKey)) != nil {
//setAcc = true
setAcc = true
bz = k.cdc.MustMarshalBinary(validator.abciValidator(k.cdc))
store.Set(GetAccUpdateValidatorKey(address), bz)
// want to check in the else statement because inefficient
} else if k.isNewValidator(ctx, store, address) {
//setAcc = true
setAcc = true
// need to calculate the whole validator set because somebody's gettin' kicked
k.GetValidators(ctx)
// XXX determine if somebody needs to be kicked off simultaniously
}
//if setAcc {
//bz = k.cdc.MustMarshalBinary(validator.abciValidator(k.cdc))
//store.Set(GetAccUpdateValidatorKey(address), bz)
//}
if setAcc {
bz = k.cdc.MustMarshalBinary(validator.abciValidator(k.cdc))
store.Set(GetAccUpdateValidatorKey(address), bz)
}
return
}
@ -174,7 +165,7 @@ func (k Keeper) removeCandidate(ctx sdk.Context, address sdk.Address) {
// delete the old candidate record
store := ctx.KVStore(k.storeKey)
store.Delete(GetCandidateKey(address))
store.Delete(GetValidatorKey(address, candidate.BondedShares, candidate.ValidatorBondHeight, candidate.ValidatorBondCounter, k.cdc))
store.Delete(GetValidatorKey(candidate.validator()))
// delete from recent and power weighted validator groups if the validator
// exists and add validator with zero power to the validator updates

16
x/stake/keeper_keys.go
View File

@ -33,13 +33,19 @@ func GetCandidateKey(addr sdk.Address) []byte {
}
// get the key for the validator used in the power-store
func GetValidatorKey(addr sdk.Address, power sdk.Rat, height int64, counter int16, cdc *wire.Codec) []byte {
powerBytes := []byte(power.ToLeftPadded(maxDigitsForAccount)) // power big-endian (more powerful validators first)
func GetValidatorKey(validator Validator) []byte {
powerBytes := []byte(validator.Power.ToLeftPadded(maxDigitsForAccount)) // power big-endian (more powerful validators first)
// TODO ensure that the key will be a readable string.. probably should add seperators and have
// heightBytes and counterBytes represent strings like powerBytes does
heightBytes := make([]byte, binary.MaxVarintLen64)
binary.BigEndian.PutUint64(heightBytes, ^uint64(height)) // invert height (older validators first)
binary.BigEndian.PutUint64(heightBytes, ^uint64(validator.Height)) // invert height (older validators first)
counterBytes := make([]byte, 2)
binary.BigEndian.PutUint16(counterBytes, ^uint16(counter)) // invert counter (first txns have priority)
return append(ValidatorsKey, append(powerBytes, append(heightBytes, append(counterBytes, addr.Bytes()...)...)...)...)
binary.BigEndian.PutUint16(counterBytes, ^uint16(validator.Counter)) // invert counter (first txns have priority)
return append(ValidatorsKey,
append(powerBytes,
append(heightBytes,
append(counterBytes, validator.Address.Bytes()...)...)...)...)
}
// get the key for the accumulated update validators