Validator by pubkey, tests work-in-progress

x/stake/keeper.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	abci "github.com/tendermint/abci/types"
+	crypto "github.com/tendermint/go-crypto"
 )
 
 // keeper of the staking store
@@ -38,6 +39,18 @@ func (k Keeper) GetValidator(ctx sdk.Context, addr sdk.Address) (validator Valid
 	return k.getValidator(store, addr)
 }
 
+// get a single validator by pubkey
+func (k Keeper) GetValidatorByPubKey(ctx sdk.Context, pubkey crypto.PubKey) (validator Validator, found bool) {
+	store := ctx.KVStore(k.storeKey)
+	b := store.Get(GetValidatorByPubKeyKey(pubkey))
+	if b == nil {
+		return validator, false
+	}
+	var addr sdk.Address
+	k.cdc.MustUnmarshalBinary(b, &addr)
+	return k.getValidator(store, addr)
+}
+
 // get a single validator (reuse store)
 func (k Keeper) getValidator(store sdk.KVStore, addr sdk.Address) (validator Validator, found bool) {
 	b := store.Get(GetValidatorKey(addr))
@@ -710,6 +723,15 @@ func (k Keeper) Validator(ctx sdk.Context, addr sdk.Address) sdk.Validator {
 	return val
 }
 
+// get the sdk.validator for a particular pubkey
+func (k Keeper) ValidatorByPubKey(ctx sdk.Context, pubkey crypto.PubKey) sdk.Validator {
+	val, found := k.GetValidatorByPubKey(ctx, pubkey)
+	if !found {
+		return nil
+	}
+	return val
+}
+
 // total power from the bond
 func (k Keeper) TotalPower(ctx sdk.Context) sdk.Rat {
 	pool := k.GetPool(ctx)

x/stake/keeper_keys.go

@@ -16,13 +16,14 @@ var (
 	ParamKey               = []byte{0x00} // key for parameters relating to staking
 	PoolKey                = []byte{0x01} // key for the staking pools
 	ValidatorsKey          = []byte{0x02} // prefix for each key to a validator
-	ValidatorsBondedKey    = []byte{0x03} // prefix for each key to bonded/actively validating validators
-	ValidatorsByPowerKey   = []byte{0x04} // prefix for each key to a validator sorted by power
-	ValidatorCliffKey      = []byte{0x05} // key for block-local tx index
-	ValidatorPowerCliffKey = []byte{0x06} // key for block-local tx index
-	TendermintUpdatesKey   = []byte{0x07} // prefix for each key to a validator which is being updated
-	DelegationKey          = []byte{0x08} // prefix for each key to a delegator's bond
-	IntraTxCounterKey      = []byte{0x09} // key for block-local tx index
+	ValidatorsByPubKeyKey  = []byte{0x03} // prefix for each key to a validator by pubkey
+	ValidatorsBondedKey    = []byte{0x04} // prefix for each key to bonded/actively validating validators
+	ValidatorsByPowerKey   = []byte{0x05} // prefix for each key to a validator sorted by power
+	ValidatorCliffKey      = []byte{0x06} // key for block-local tx index
+	ValidatorPowerCliffKey = []byte{0x07} // key for block-local tx index
+	TendermintUpdatesKey   = []byte{0x08} // prefix for each key to a validator which is being updated
+	DelegationKey          = []byte{0x09} // prefix for each key to a delegator's bond
+	IntraTxCounterKey      = []byte{0x10} // key for block-local tx index
 )
 
 const maxDigitsForAccount = 12 // ~220,000,000 atoms created at launch
@@ -32,6 +33,11 @@ func GetValidatorKey(ownerAddr sdk.Address) []byte {
 	return append(ValidatorsKey, ownerAddr.Bytes()...)
 }
 
+// get the key for the validator with pubkey
+func GetValidatorByPubKeyKey(pubkey crypto.PubKey) []byte {
+	return append(ValidatorsByPubKeyKey, pubkey.Bytes()...)
+}
+
 // get the key for the current validator group, ordered like tendermint
 func GetValidatorsBondedKey(pk crypto.PubKey) []byte {
 	addr := pk.Address()